Skip to content

Commit 3581e25

Browse files
authored
Merge pull request #52 from tomnis/scala-2.12.12
Scala 2.12.12
2 parents 0af79d2 + a8e756c commit 3581e25

File tree

7 files changed

+9
-14
lines changed

7 files changed

+9
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dist: bionic
44
env:
55
# matrix expansion for scala versions. change in sync with gradle.properties
66
- ORG_GRADLE_PROJECT_scalaVersion=2.11.11
7-
- ORG_GRADLE_PROJECT_scalaVersion=2.12.10
7+
- ORG_GRADLE_PROJECT_scalaVersion=2.12.12
88

99
jdk:
1010
- openjdk8

build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ allprojects {
6363
api ("org.scala-lang:scala-library:%scala-version%") {
6464
force = true
6565
}
66-
api ("org.scala-lang:scala-compiler:%scala-version%") {
67-
force = true
68-
}
6966
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${versions.junit5}"
7067
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${versions.junit5}") {
7168
because 'allows JUnit 3 and JUnit 4 tests to run'

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# scala cross compilation
22
# by default, gradle invocations will use only this version. useful for ide invocations.
3-
defaultScalaVersions=2.12.10
3+
defaultScalaVersions=2.12.12
44
# if we need to cross-compile and rerun the entire task graph (like in a ci build or publish), run with -PallScalaVersions
55
# see https://github.com/ADTRAN/gradle-scala-multiversion-plugin#examples
66

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

1313
# during releases, we only want to create 1 repo tag.
1414
# note that devSnapshot and snapshot tasks won't create repo tags

warp-core-gatling/locking/warp-core-gatling_2.11.lockfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,9 @@ org.opentest4j:opentest4j:1.2.0=compileClasspath,testCompileClasspath
9494
org.reactivestreams:reactive-streams:1.0.2=compileClasspath,testCompileClasspath
9595
org.scala-lang.modules:scala-collection-compat_2.11:2.0.0=compileClasspath,testCompileClasspath
9696
org.scala-lang.modules:scala-java8-compat_2.12:0.9.0=compileClasspath,testCompileClasspath
97-
org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4=compileClasspath,testCompileClasspath
9897
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=compileClasspath,testCompileClasspath
9998
org.scala-lang.modules:scala-xml_2.11:1.2.0=compileClasspath,scoverage,testCompileClasspath
10099
org.scala-lang.modules:scala-xml_2.12:1.2.0=compileClasspath,testCompileClasspath
101-
org.scala-lang:scala-compiler:2.11.11=compileClasspath,testCompileClasspath
102100
org.scala-lang:scala-library:2.11.11=compileClasspath,testCompileClasspath
103101
org.scala-lang:scala-library:2.11.12=scoverage
104102
org.scala-lang:scala-reflect:2.12.9=compileClasspath,testCompileClasspath

warp-core-gatling/locking/warp-core-gatling_2.12.lockfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ org.scala-lang.modules:scala-java8-compat_2.12:0.9.1=default,runtimeClasspath,te
142142
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,zinc
143143
org.scala-lang.modules:scala-xml_2.12:1.0.6=zinc
144144
org.scala-lang.modules:scala-xml_2.12:1.2.0=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
145-
org.scala-lang:scala-compiler:2.12.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,zinc
146-
org.scala-lang:scala-library:2.12.10=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath,zinc
145+
org.scala-lang:scala-compiler:2.12.10=zinc
146+
org.scala-lang:scala-library:2.12.10=scoverage,zinc
147+
org.scala-lang:scala-library:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
147148
org.scala-lang:scala-reflect:2.12.10=zinc
148149
org.scala-lang:scala-reflect:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
149150
org.scala-sbt:compiler-bridge_2.12:1.3.5=zinc

warp-core/locking/warp-core_2.11.lockfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,9 @@ org.opentest4j:opentest4j:1.2.0=compileClasspath,default,runtimeClasspath,testCo
8080
org.reactivestreams:reactive-streams:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8181
org.scala-lang.modules:scala-collection-compat_2.11:2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8282
org.scala-lang.modules:scala-java8-compat_2.11:0.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
83-
org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8483
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=zinc
8584
org.scala-lang.modules:scala-xml_2.11:1.2.0=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
8685
org.scala-lang.modules:scala-xml_2.12:1.0.6=zinc
87-
org.scala-lang:scala-compiler:2.11.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8886
org.scala-lang:scala-compiler:2.12.10=zinc
8987
org.scala-lang:scala-library:2.11.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9088
org.scala-lang:scala-library:2.11.12=scoverage

warp-core/locking/warp-core_2.12.lockfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ org.scala-lang.modules:scala-java8-compat_2.12:0.9.1=compileClasspath,default,ru
8383
org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=zinc
8484
org.scala-lang.modules:scala-xml_2.12:1.0.6=zinc
8585
org.scala-lang.modules:scala-xml_2.12:1.2.0=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
86-
org.scala-lang:scala-compiler:2.12.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,zinc
87-
org.scala-lang:scala-library:2.12.10=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath,zinc
86+
org.scala-lang:scala-compiler:2.12.10=zinc
87+
org.scala-lang:scala-library:2.12.10=scoverage,zinc
88+
org.scala-lang:scala-library:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8889
org.scala-lang:scala-reflect:2.12.10=zinc
8990
org.scala-lang:scala-reflect:2.12.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9091
org.scala-sbt:compiler-bridge_2.12:1.3.5=zinc

0 commit comments

Comments
 (0)