Skip to content

Commit 692b18b

Browse files
committed
Bump Scala 2.12 in various tests
1 parent 5ca4eac commit 692b18b

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

example/scalalib/module/14-cross-scala-version/build.mill

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package build
22
import mill.*, scalalib.*
33

4-
val scalaVersions = Seq("2.12.20", "2.13.16")
4+
val scalaVersions = Seq("2.12.21", "2.13.16")
55

66
object foo extends Cross[FooModule](scalaVersions)
77
trait FooModule extends CrossScalaModule {
@@ -27,11 +27,11 @@ trait BarModule extends CrossScalaModule
2727
> ./mill resolve __.run
2828
foo.2_12_20.run
2929
foo.2_13_16.run
30-
bar.2_12_20.run
30+
bar.2_12_21.run
3131
bar.2_13_16.run
3232

33-
> ./mill foo.2_12_20.run
34-
Foo.value: Hello World Scala library version 2.12.20...
33+
> ./mill foo.2_12_21.run
34+
Foo.value: Hello World Scala library version 2.12.21...
3535
Bar.value: bar-value
3636
Specific code for Scala 2.x
3737
Specific code for Scala 2.12.x

example/scalalib/spark/1-hello-spark/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object foo extends ScalaModule {
77
// refuses to start with `-Djava.security.manager=allow`. Pin this example
88
// to JDK 21 until Spark/Hadoop catch up.
99
def jvmId = "zulu:21"
10-
def scalaVersion = "2.12.20"
10+
def scalaVersion = "2.12.21"
1111
def mvnDeps = Seq(
1212
mvn"org.apache.spark::spark-core:3.5.4",
1313
mvn"org.apache.spark::spark-sql:3.5.4"

example/scalalib/spark/3-semi-realistic/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object `package` extends ScalaModule { outer =>
77
// refuses to start with `-Djava.security.manager=allow`. Pin this example
88
// to JDK 21 until Spark/Hadoop catch up.
99
def jvmId = "zulu:21"
10-
def scalaVersion = "2.12.20"
10+
def scalaVersion = "2.12.21"
1111
def mvnDeps = Seq(
1212
mvn"org.apache.spark::spark-core:3.5.6",
1313
mvn"org.apache.spark::spark-sql:3.5.6"

example/thirdparty/fansi/build.mill

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mill.javalib.api.JvmWorkerUtil.isScala3
55

66
val dottyCommunityBuildVersion = sys.props.get("dottyVersion")
77

8-
val scalaVersions = Seq("2.12.20", "2.13.16", "3.3.6") ++ dottyCommunityBuildVersion
8+
val scalaVersions = Seq("2.12.21", "2.13.16", "3.3.6") ++ dottyCommunityBuildVersion
99

1010
trait FansiModule extends PublishModule with CrossScalaModule with PlatformScalaModule {
1111
def artifactName = "fansi"
@@ -60,26 +60,26 @@ object fansi extends Module {
6060
/** Usage
6161

6262
> ./mill resolve __.compile
63-
fansi.js.2_12_20.compile
64-
fansi.js.2_12_20.test.compile
63+
fansi.js.2_12_21.compile
64+
fansi.js.2_12_21.test.compile
6565
fansi.js.2_13_16.compile
6666
fansi.js.2_13_16.test.compile
6767
fansi.js.3_3_6.compile
6868
fansi.js.3_3_6.test.compile
69-
fansi.jvm.2_12_20.compile
70-
fansi.jvm.2_12_20.test.compile
69+
fansi.jvm.2_12_21.compile
70+
fansi.jvm.2_12_21.test.compile
7171
fansi.jvm.2_13_16.compile
7272
fansi.jvm.2_13_16.test.compile
7373
fansi.jvm.3_3_6.compile
7474
fansi.jvm.3_3_6.test.compile
75-
fansi.native.2_12_20.compile
76-
fansi.native.2_12_20.test.compile
75+
fansi.native.2_12_21.compile
76+
fansi.native.2_12_21.test.compile
7777
fansi.native.2_13_16.compile
7878
fansi.native.2_13_16.test.compile
7979
fansi.native.3_3_6.compile
8080
fansi.native.3_3_6.test.compile
8181

82-
> ./mill fansi.jvm.2_12_20.compile
82+
> ./mill fansi.jvm.2_12_21.compile
8383
compiling 1 Scala source...
8484
...
8585

0 commit comments

Comments
 (0)