Skip to content

Commit

Permalink
Merge pull request #52 from tomnis/scala-2.12.12
Browse files Browse the repository at this point in the history
Scala 2.12.12
  • Loading branch information
rooeque authored Sep 9, 2020
2 parents 0af79d2 + a8e756c commit 3581e25
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dist: bionic
env:
# matrix expansion for scala versions. change in sync with gradle.properties
- ORG_GRADLE_PROJECT_scalaVersion=2.11.11
- ORG_GRADLE_PROJECT_scalaVersion=2.12.10
- ORG_GRADLE_PROJECT_scalaVersion=2.12.12

jdk:
- openjdk8
Expand Down
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ allprojects {
api ("org.scala-lang:scala-library:%scala-version%") {
force = true
}
api ("org.scala-lang:scala-compiler:%scala-version%") {
force = true
}
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${versions.junit5}"
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${versions.junit5}") {
because 'allows JUnit 3 and JUnit 4 tests to run'
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# scala cross compilation
# by default, gradle invocations will use only this version. useful for ide invocations.
defaultScalaVersions=2.12.10
defaultScalaVersions=2.12.12
# if we need to cross-compile and rerun the entire task graph (like in a ci build or publish), run with -PallScalaVersions
# see https://github.com/ADTRAN/gradle-scala-multiversion-plugin#examples

# we are stuck on 2.12.10. see https://github.com/scalacenter/scalafix/issues/998
# scalafix rule ExplicitResultTypes only works with 2.12.10 due to compiler interface
# other versions for cross compilation defined in publish.sh
# change in sync with .travis.yml
scalaVersions=2.11.11,2.12.10
scalaVersions=2.11.11,2.12.12

# during releases, we only want to create 1 repo tag.
# note that devSnapshot and snapshot tasks won't create repo tags
Expand Down
2 changes: 0 additions & 2 deletions warp-core-gatling/locking/warp-core-gatling_2.11.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,9 @@ org.opentest4j:opentest4j:1.2.0=compileClasspath,testCompileClasspath
org.reactivestreams:reactive-streams:1.0.2=compileClasspath,testCompileClasspath
org.scala-lang.modules:scala-collection-compat_2.11:2.0.0=compileClasspath,testCompileClasspath
org.scala-lang.modules:scala-java8-compat_2.12:0.9.0=compileClasspath,testCompileClasspath
org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4=compileClasspath,testCompileClasspath
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=compileClasspath,testCompileClasspath
org.scala-lang.modules:scala-xml_2.11:1.2.0=compileClasspath,scoverage,testCompileClasspath
org.scala-lang.modules:scala-xml_2.12:1.2.0=compileClasspath,testCompileClasspath
org.scala-lang:scala-compiler:2.11.11=compileClasspath,testCompileClasspath
org.scala-lang:scala-library:2.11.11=compileClasspath,testCompileClasspath
org.scala-lang:scala-library:2.11.12=scoverage
org.scala-lang:scala-reflect:2.12.9=compileClasspath,testCompileClasspath
Expand Down
5 changes: 3 additions & 2 deletions warp-core-gatling/locking/warp-core-gatling_2.12.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ org.scala-lang.modules:scala-java8-compat_2.12:0.9.1=default,runtimeClasspath,te
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,zinc
org.scala-lang.modules:scala-xml_2.12:1.0.6=zinc
org.scala-lang.modules:scala-xml_2.12:1.2.0=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-compiler:2.12.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,zinc
org.scala-lang:scala-library:2.12.10=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath,zinc
org.scala-lang:scala-compiler:2.12.10=zinc
org.scala-lang:scala-library:2.12.10=scoverage,zinc
org.scala-lang:scala-library:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-reflect:2.12.10=zinc
org.scala-lang:scala-reflect:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-sbt:compiler-bridge_2.12:1.3.5=zinc
Expand Down
2 changes: 0 additions & 2 deletions warp-core/locking/warp-core_2.11.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,9 @@ org.opentest4j:opentest4j:1.2.0=compileClasspath,default,runtimeClasspath,testCo
org.reactivestreams:reactive-streams:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang.modules:scala-collection-compat_2.11:2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang.modules:scala-java8-compat_2.11:0.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=zinc
org.scala-lang.modules:scala-xml_2.11:1.2.0=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang.modules:scala-xml_2.12:1.0.6=zinc
org.scala-lang:scala-compiler:2.11.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-compiler:2.12.10=zinc
org.scala-lang:scala-library:2.11.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-library:2.11.12=scoverage
Expand Down
5 changes: 3 additions & 2 deletions warp-core/locking/warp-core_2.12.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ org.scala-lang.modules:scala-java8-compat_2.12:0.9.1=compileClasspath,default,ru
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=zinc
org.scala-lang.modules:scala-xml_2.12:1.0.6=zinc
org.scala-lang.modules:scala-xml_2.12:1.2.0=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-compiler:2.12.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,zinc
org.scala-lang:scala-library:2.12.10=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath,zinc
org.scala-lang:scala-compiler:2.12.10=zinc
org.scala-lang:scala-library:2.12.10=scoverage,zinc
org.scala-lang:scala-library:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-reflect:2.12.10=zinc
org.scala-lang:scala-reflect:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-sbt:compiler-bridge_2.12:1.3.5=zinc
Expand Down

0 comments on commit 3581e25

Please sign in to comment.