From d1a1bf37284b77c2de85d701f8d5a433b43004ea Mon Sep 17 00:00:00 2001 From: "tomas.mccandless" Date: Tue, 8 Sep 2020 17:36:00 -0700 Subject: [PATCH 1/2] use scala 2.12.12 --- build.gradle | 3 --- gradle.properties | 4 ++-- warp-core-gatling/locking/warp-core-gatling_2.11.lockfile | 2 -- warp-core-gatling/locking/warp-core-gatling_2.12.lockfile | 5 +++-- warp-core/locking/warp-core_2.11.lockfile | 2 -- warp-core/locking/warp-core_2.12.lockfile | 5 +++-- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index e501f4ca..143eb253 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/gradle.properties b/gradle.properties index fd5c107f..b3e4fa4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # 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 @@ -8,7 +8,7 @@ defaultScalaVersions=2.12.10 # 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 diff --git a/warp-core-gatling/locking/warp-core-gatling_2.11.lockfile b/warp-core-gatling/locking/warp-core-gatling_2.11.lockfile index 8752a3cc..4fb38438 100644 --- a/warp-core-gatling/locking/warp-core-gatling_2.11.lockfile +++ b/warp-core-gatling/locking/warp-core-gatling_2.11.lockfile @@ -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 diff --git a/warp-core-gatling/locking/warp-core-gatling_2.12.lockfile b/warp-core-gatling/locking/warp-core-gatling_2.12.lockfile index 2ff1ef1e..30fdc945 100644 --- a/warp-core-gatling/locking/warp-core-gatling_2.12.lockfile +++ b/warp-core-gatling/locking/warp-core-gatling_2.12.lockfile @@ -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 diff --git a/warp-core/locking/warp-core_2.11.lockfile b/warp-core/locking/warp-core_2.11.lockfile index d58a5eee..8b91b5ad 100644 --- a/warp-core/locking/warp-core_2.11.lockfile +++ b/warp-core/locking/warp-core_2.11.lockfile @@ -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 diff --git a/warp-core/locking/warp-core_2.12.lockfile b/warp-core/locking/warp-core_2.12.lockfile index 0a9aa2b3..a2df94f6 100644 --- a/warp-core/locking/warp-core_2.12.lockfile +++ b/warp-core/locking/warp-core_2.12.lockfile @@ -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 From a8e756cb5db8ae461d7bdaa6d228cdec8fb4f06a Mon Sep 17 00:00:00 2001 From: "tomas.mccandless" Date: Tue, 8 Sep 2020 17:37:08 -0700 Subject: [PATCH 2/2] use scala 2.12.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2cb0bec..1e2606e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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