Skip to content

Commit 17fa7bb

Browse files
authored
Upgrade to Scala 3.7.0 (#5075)
Follow up to #4745, but with Scala 3.7.0-final and without using experimental language features such as referenceable package objects Fixes #4733
1 parent 7b62c39 commit 17fa7bb

File tree

11 files changed

+43
-44
lines changed

11 files changed

+43
-44
lines changed

build.mill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ object Deps {
5050
// The Scala version to use
5151
// When updating, run "Publish Bridges" Github Actions for the new version
5252
// and then add to it `bridgeScalaVersions`
53-
val scalaVersion = "3.6.4"
53+
val scalaVersion = "3.7.0"
5454
val scala2Version = "2.13.15"
5555
// The Scala 2.12.x version to use for some workers
5656
val workerScalaVersion212 = "2.12.20"
5757
val sbtScalaVersion212 = workerScalaVersion212
5858

59-
val testScala213Version = "2.13.15"
59+
val testScala213Version = "2.13.16"
6060
// Scala Native 4.2 will not get releases for new Scala version
6161
val testScala213VersionForScalaNative42 = "2.13.8"
6262
val testScala212Version = "2.12.6"
@@ -162,7 +162,7 @@ object Deps {
162162
val osLib = mvn"com.lihaoyi::os-lib:0.11.5-M2"
163163
val pprint = mvn"com.lihaoyi::pprint:0.9.0"
164164
val mainargs = mvn"com.lihaoyi::mainargs:0.7.6"
165-
val millModuledefsVersion = "0.11.3-M5"
165+
val millModuledefsVersion = "0.11.4"
166166
val millModuledefsString = s"com.lihaoyi::mill-moduledefs:${millModuledefsVersion}"
167167
val millModuledefs = mvn"${millModuledefsString}"
168168
val millModuledefsPlugin =

example/extending/plugins/7-writing-mill-plugins/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import mill._, scalalib._, publish._
88
import mill.util.BuildInfo.{millVersion, millBinPlatform}
99

1010
object myplugin extends ScalaModule with PublishModule {
11-
def scalaVersion = "3.6.2"
11+
def scalaVersion = "3.7.0"
1212

1313
// Set the `platformSuffix` so the name indicates what Mill version it is compiled for
1414
def platformSuffix = s"_mill$millBinPlatform"

integration/ide/bsp-server/resources/snapshots/workspace-build-targets.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@
115115
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/<scala-version>/scala-reflect-<scala-version>.jar",
116116
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-library/<scala-version>/scala-library-<scala-version>.jar",
117117
"file:///coursier-cache/https/repo1.maven.org/maven2/io/github/java-diff-utils/java-diff-utils/<java-diff-utils-version>/java-diff-utils-<java-diff-utils-version>.jar",
118-
"file:///coursier-cache/https/repo1.maven.org/maven2/org/jline/jline/<jline-version>/jline-<jline-version>.jar",
119-
"file:///coursier-cache/https/repo1.maven.org/maven2/net/java/dev/jna/jna/<jna-version>/jna-<jna-version>.jar"
118+
"file:///coursier-cache/https/repo1.maven.org/maven2/org/jline/jline/<jline-version>/jline-<jline-version>-jdk8.jar"
120119
],
121120
"jvmBuildTarget": {
122121
"javaHome": "java-home",

integration/ide/build-classpath-contents/src/BuildClasspathContentsTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object BuildClasspathContentsTests extends UtestIntegrationTestSuite {
4343
"mill-libs-testrunner-entrypoint.jar",
4444
"mill-libs-testrunner_3.jar",
4545
"mill-libs_3.jar",
46-
"mill-moduledefs_3-0.11.3-M5.jar"
46+
"mill-moduledefs_3-0.11.4.jar"
4747
)
4848

4949
assert(millPublishedJars == expected)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="libraryTable">
2-
<library name="SBT: junit:junit_3.6:4.13.2:jar">
2+
<library name="SBT: junit:junit_3.7:4.13.2:jar">
33
<CLASSES>
44
<root url="jar://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar!/"/>
55
</CLASSES>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="libraryTable">
2-
<library name="SBT: org.scalameta:munit_3_3.6:0.7.29:jar">
2+
<library name="SBT: org.scalameta:munit_3_3.7:0.7.29:jar">
33
<CLASSES>
44
<root url="jar://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scalameta/munit_3/0.7.29/munit_3-0.7.29.jar!/"/>
55
</CLASSES>

integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_3_6_4.xml renamed to integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_3_7_0.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<component name="libraryTable">
2-
<library name="scala-SDK-3.6.4" type="Scala">
2+
<library name="scala-SDK-3.7.0" type="Scala">
33
<properties>
4-
<language-level>Scala_3_6</language-level>
4+
<language-level>Scala_3_7</language-level>
55
<compiler-classpath>
6-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-native/3.27.1/jline-native-3.27.1.jar"/>
7-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.27.1/jline-reader-3.27.1.jar"/>
8-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jni/3.27.1/jline-terminal-jni-3.27.1.jar"/>
9-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.27.1/jline-terminal-3.27.1.jar"/>
6+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-native/3.29.0/jline-native-3.29.0.jar"/>
7+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.29.0/jline-reader-3.29.0.jar"/>
8+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jni/3.29.0/jline-terminal-jni-3.29.0.jar"/>
9+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.29.0/jline-terminal-3.29.0.jar"/>
1010
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.7.1-scala-1/scala-asm-9.7.1-scala-1.jar"/>
11-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15.jar"/>
12-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.4/scala3-compiler_3-3.6.4.jar"/>
13-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.6.4/scala3-interfaces-3.6.4.jar"/>
14-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.6.4/scala3-library_3-3.6.4.jar"/>
15-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.6.4/tasty-core_3-3.6.4.jar"/>
16-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.10.4/compiler-interface-1.10.4.jar"/>
17-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.10.4/util-interface-1.10.4.jar"/>
11+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.16/scala-library-2.13.16.jar"/>
12+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.0/scala3-compiler_3-3.7.0.jar"/>
13+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.0/scala3-interfaces-3.7.0.jar"/>
14+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.0/scala3-library_3-3.7.0.jar"/>
15+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.0/tasty-core_3-3.7.0.jar"/>
16+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.10.7/compiler-interface-1.10.7.jar"/>
17+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.10.7/util-interface-1.10.7.jar"/>
1818
</compiler-classpath>
1919
</properties>
2020
</library>

integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</content>
1111
<orderEntry type="inheritedJdk"/>
1212
<orderEntry type="sourceFolder" forTests="false"/>
13-
<orderEntry type="library" name="scala-SDK-3.6.4" level="project"/>
13+
<orderEntry type="library" name="scala-SDK-3.7.0" level="project"/>
1414
<orderEntry type="library" name="aircompressor-0.27.jar" level="project"/>
1515
<orderEntry type="library" name="cache-util-2.1.25-M11.jar" level="project"/>
1616
<orderEntry type="library" name="commons-codec-1.17.0.jar" level="project"/>
@@ -76,7 +76,7 @@
7676
<orderEntry type="library" name="mill-libs-testrunner-entrypoint.jar" level="project"/>
7777
<orderEntry type="library" name="mill-libs-testrunner_3.jar" level="project"/>
7878
<orderEntry type="library" name="mill-libs_3.jar" level="project"/>
79-
<orderEntry type="library" name="mill-moduledefs_3-0.11.3-M5.jar" level="project"/>
79+
<orderEntry type="library" name="mill-moduledefs_3-0.11.4.jar" level="project"/>
8080
<orderEntry type="library" name="munit_3-0.7.29.jar" level="project"/>
8181
<orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
8282
<orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
@@ -95,7 +95,7 @@
9595
<orderEntry type="library" name="scala-xml_2.13-2.3.0.jar" level="project"/>
9696
<orderEntry type="library" name="scala-xml_3-2.3.0.jar" level="project"/>
9797
<orderEntry type="library" scope="PROVIDED" name="scala3-library_3-3.3.3.jar" level="project"/>
98-
<orderEntry type="library" name="scala3-library_3-3.6.4.jar" level="project"/>
98+
<orderEntry type="library" name="scala3-library_3-3.7.0.jar" level="project"/>
9999
<orderEntry type="library" name="slf4j-api-2.0.17.jar" level="project"/>
100100
<orderEntry type="library" scope="RUNTIME" name="snakeyaml-engine-2.9.jar" level="project"/>
101101
<orderEntry type="library" name="sonatype-central-client-core_3-0.3.0.jar" level="project"/>

integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</content>
1313
<orderEntry type="inheritedJdk"/>
1414
<orderEntry type="sourceFolder" forTests="false"/>
15-
<orderEntry type="library" name="scala-SDK-3.6.4" level="project"/>
15+
<orderEntry type="library" name="scala-SDK-3.7.0" level="project"/>
1616
<orderEntry type="library" name="aircompressor-0.27.jar" level="project"/>
1717
<orderEntry type="library" name="asm-9.8.jar" level="project"/>
1818
<orderEntry type="library" name="asm-tree-9.8.jar" level="project"/>
@@ -77,7 +77,7 @@
7777
<orderEntry type="library" name="mill-libs-testrunner-entrypoint.jar" level="project"/>
7878
<orderEntry type="library" name="mill-libs-testrunner_3.jar" level="project"/>
7979
<orderEntry type="library" name="mill-libs_3.jar" level="project"/>
80-
<orderEntry type="library" name="mill-moduledefs_3-0.11.3-M5.jar" level="project"/>
80+
<orderEntry type="library" name="mill-moduledefs_3-0.11.4.jar" level="project"/>
8181
<orderEntry type="library" name="mill-runner-codesig_3.jar" level="project"/>
8282
<orderEntry type="library" name="mill-runner-compilerworker-api_3.jar" level="project"/>
8383
<orderEntry type="library" name="mill-runner-meta_3.jar" level="project"/>
@@ -98,7 +98,7 @@
9898
<orderEntry type="library" name="scala-xml_2.13-2.3.0.jar" level="project"/>
9999
<orderEntry type="library" name="scala-xml_3-2.3.0.jar" level="project"/>
100100
<orderEntry type="library" scope="PROVIDED" name="scala3-library_3-3.3.3.jar" level="project"/>
101-
<orderEntry type="library" name="scala3-library_3-3.6.4.jar" level="project"/>
101+
<orderEntry type="library" name="scala3-library_3-3.7.0.jar" level="project"/>
102102
<orderEntry type="library" name="slf4j-api-2.0.17.jar" level="project"/>
103103
<orderEntry type="library" name="snakeyaml-engine-2.9.jar" level="project"/>
104104
<orderEntry type="library" name="sonatype-central-client-core_3-0.3.0.jar" level="project"/>

integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_3_6_4.xml renamed to integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_3_7_0.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<component name="libraryTable">
2-
<library name="scala-SDK-3.6.4" type="Scala">
2+
<library name="scala-SDK-3.7.0" type="Scala">
33
<properties>
4-
<language-level>Scala_3_6</language-level>
4+
<language-level>Scala_3_7</language-level>
55
<compiler-classpath>
6-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-native/3.27.1/jline-native-3.27.1.jar"/>
7-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.27.1/jline-reader-3.27.1.jar"/>
8-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jni/3.27.1/jline-terminal-jni-3.27.1.jar"/>
9-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.27.1/jline-terminal-3.27.1.jar"/>
6+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-native/3.29.0/jline-native-3.29.0.jar"/>
7+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.29.0/jline-reader-3.29.0.jar"/>
8+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jni/3.29.0/jline-terminal-jni-3.29.0.jar"/>
9+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.29.0/jline-terminal-3.29.0.jar"/>
1010
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.7.1-scala-1/scala-asm-9.7.1-scala-1.jar"/>
11-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15.jar"/>
12-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.4/scala3-compiler_3-3.6.4.jar"/>
13-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.6.4/scala3-interfaces-3.6.4.jar"/>
14-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.6.4/scala3-library_3-3.6.4.jar"/>
15-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.6.4/tasty-core_3-3.6.4.jar"/>
16-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.10.4/compiler-interface-1.10.4.jar"/>
17-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.10.4/util-interface-1.10.4.jar"/>
11+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.16/scala-library-2.13.16.jar"/>
12+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.0/scala3-compiler_3-3.7.0.jar"/>
13+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.0/scala3-interfaces-3.7.0.jar"/>
14+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.0/scala3-library_3-3.7.0.jar"/>
15+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.0/tasty-core_3-3.7.0.jar"/>
16+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.10.7/compiler-interface-1.10.7.jar"/>
17+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.10.7/util-interface-1.10.7.jar"/>
1818
</compiler-classpath>
1919
</properties>
2020
</library>

0 commit comments

Comments
 (0)