Skip to content

Commit 2cc69d6

Browse files
lihaoyilihaoyi
authored
Bump Scala to 3.7.3 (#5897)
1 parent c38fe80 commit 2cc69d6

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_3_7_1.xml‎ renamed to ‎integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_3_7_3.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="libraryTable">
2-
<library name="scala-SDK-3.7.1" type="Scala">
2+
<library name="scala-SDK-3.7.3" type="Scala">
33
<properties>
44
<language-level>Scala_3_7</language-level>
55
<compiler-classpath>
@@ -9,10 +9,10 @@
99
<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.8.0-scala-1/scala-asm-9.8.0-scala-1.jar"/>
1111
<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.1/scala3-compiler_3-3.7.1.jar"/>
13-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.1/scala3-interfaces-3.7.1.jar"/>
14-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.1/scala3-library_3-3.7.1.jar"/>
15-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.1/tasty-core_3-3.7.1.jar"/>
12+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.3/scala3-compiler_3-3.7.3.jar"/>
13+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.3/scala3-interfaces-3.7.3.jar"/>
14+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.3/scala3-library_3-3.7.3.jar"/>
15+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.3/tasty-core_3-3.7.3.jar"/>
1616
<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"/>
1717
<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>

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

Lines changed: 2 additions & 2 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.7.1" level="project"/>
13+
<orderEntry type="library" name="scala-SDK-3.7.3" level="project"/>
1414
<orderEntry type="library" scope="RUNTIME" name="aircompressor-0.27.jar" level="project"/>
1515
<orderEntry type="library" scope="RUNTIME" name="cache-util-COURSIER_VERSION.jar" level="project"/>
1616
<orderEntry type="library" scope="RUNTIME" name="commons-codec-1.17.0.jar" level="project"/>
@@ -103,7 +103,7 @@
103103
<orderEntry type="library" scope="RUNTIME" name="scala-xml_2.13-2.4.0.jar" level="project"/>
104104
<orderEntry type="library" name="scala-xml_3-2.4.0.jar" level="project"/>
105105
<orderEntry type="library" scope="PROVIDED" name="scala3-library_3-3.3.3.jar" level="project"/>
106-
<orderEntry type="library" name="scala3-library_3-3.7.1.jar" level="project"/>
106+
<orderEntry type="library" name="scala3-library_3-3.7.3.jar" level="project"/>
107107
<orderEntry type="library" scope="RUNTIME" name="slf4j-api-2.0.17.jar" level="project"/>
108108
<orderEntry type="library" scope="RUNTIME" name="snakeyaml-engine-2.10.jar" level="project"/>
109109
<orderEntry type="library" scope="RUNTIME" name="sonatype-central-client-core_3-0.5.0.jar" level="project"/>

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

Lines changed: 2 additions & 2 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.7.1" level="project"/>
15+
<orderEntry type="library" name="scala-SDK-3.7.3" level="project"/>
1616
<orderEntry type="library" scope="RUNTIME" 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"/>
@@ -105,7 +105,7 @@
105105
<orderEntry type="library" scope="RUNTIME" name="scala-xml_2.13-2.4.0.jar" level="project"/>
106106
<orderEntry type="library" name="scala-xml_3-2.4.0.jar" level="project"/>
107107
<orderEntry type="library" scope="PROVIDED" name="scala3-library_3-3.3.3.jar" level="project"/>
108-
<orderEntry type="library" name="scala3-library_3-3.7.1.jar" level="project"/>
108+
<orderEntry type="library" name="scala3-library_3-3.7.3.jar" level="project"/>
109109
<orderEntry type="library" scope="RUNTIME" name="slf4j-api-2.0.17.jar" level="project"/>
110110
<orderEntry type="library" name="snakeyaml-engine-2.10.jar" level="project"/>
111111
<orderEntry type="library" scope="RUNTIME" name="sonatype-central-client-core_3-0.5.0.jar" level="project"/>

‎integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_3_7_1.xml‎ renamed to ‎integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_3_7_3.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="libraryTable">
2-
<library name="scala-SDK-3.7.1" type="Scala">
2+
<library name="scala-SDK-3.7.3" type="Scala">
33
<properties>
44
<language-level>Scala_3_7</language-level>
55
<compiler-classpath>
@@ -9,10 +9,10 @@
99
<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.8.0-scala-1/scala-asm-9.8.0-scala-1.jar"/>
1111
<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.1/scala3-compiler_3-3.7.1.jar"/>
13-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.1/scala3-interfaces-3.7.1.jar"/>
14-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.1/scala3-library_3-3.7.1.jar"/>
15-
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.1/tasty-core_3-3.7.1.jar"/>
12+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.3/scala3-compiler_3-3.7.3.jar"/>
13+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.3/scala3-interfaces-3.7.3.jar"/>
14+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.3/scala3-library_3-3.7.3.jar"/>
15+
<root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.3/tasty-core_3-3.7.3.jar"/>
1616
<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"/>
1717
<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>

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

Lines changed: 2 additions & 2 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.7.1" level="project"/>
13+
<orderEntry type="library" name="scala-SDK-3.7.3" level="project"/>
1414
<orderEntry type="library" scope="RUNTIME" name="aircompressor-0.27.jar" level="project"/>
1515
<orderEntry type="library" scope="RUNTIME" name="cache-util-COURSIER_VERSION.jar" level="project"/>
1616
<orderEntry type="library" scope="RUNTIME" name="commons-codec-1.17.0.jar" level="project"/>
@@ -99,7 +99,7 @@
9999
<orderEntry type="library" scope="RUNTIME" name="scala-xml_2.13-2.4.0.jar" level="project"/>
100100
<orderEntry type="library" name="scala-xml_3-2.4.0.jar" level="project"/>
101101
<orderEntry type="library" scope="PROVIDED" name="scala3-library_3-3.3.3.jar" level="project"/>
102-
<orderEntry type="library" name="scala3-library_3-3.7.1.jar" level="project"/>
102+
<orderEntry type="library" name="scala3-library_3-3.7.3.jar" level="project"/>
103103
<orderEntry type="library" scope="RUNTIME" name="slf4j-api-2.0.17.jar" level="project"/>
104104
<orderEntry type="library" scope="RUNTIME" name="snakeyaml-engine-2.10.jar" level="project"/>
105105
<orderEntry type="library" scope="RUNTIME" name="sonatype-central-client-core_3-0.5.0.jar" level="project"/>

‎integration/ide/gen-idea/resources/hello-idea/idea/scala_compiler.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<component name="ScalaCompilerConfiguration">
33
<profile name="mill 1" modules="">
44
<parameters>
5-
<parameter value="-Xplugin:.../com/lihaoyi/scalac-mill-moduledefs-plugin_3.7.1/0.11.10/scalac-mill-moduledefs-plugin_3.7.1-0.11.10.jar"/>
5+
<parameter value="-Xplugin:.../com/lihaoyi/scalac-mill-moduledefs-plugin_3.7.3/0.11.10/scalac-mill-moduledefs-plugin_3.7.3-0.11.10.jar"/>
66
<parameter value="-deprecation"/>
77
<parameter value="-Wconf:msg=will be encoded on the classpath:silent"/>
88
</parameters>
99
<plugins>
10-
<plugin path=".../com/lihaoyi/scalac-mill-moduledefs-plugin_3.7.1/0.11.10/scalac-mill-moduledefs-plugin_3.7.1-0.11.10.jar"/>
11-
<plugin path=".../org/scala-lang/scala3-compiler_3/3.7.1/scala3-compiler_3-3.7.1.jar"/>
12-
<plugin path=".../org/scala-lang/scala3-library_3/3.7.1/scala3-library_3-3.7.1.jar"/>
10+
<plugin path=".../com/lihaoyi/scalac-mill-moduledefs-plugin_3.7.3/0.11.10/scalac-mill-moduledefs-plugin_3.7.3-0.11.10.jar"/>
11+
<plugin path=".../org/scala-lang/scala3-compiler_3/3.7.3/scala3-compiler_3-3.7.3.jar"/>
12+
<plugin path=".../org/scala-lang/scala3-library_3/3.7.3/scala3-library_3-3.7.3.jar"/>
1313
<plugin path=".../com/lihaoyi/mill-moduledefs_3/0.11.10/mill-moduledefs_3-0.11.10.jar"/>
14-
<plugin path=".../org/scala-lang/scala3-interfaces/3.7.1/scala3-interfaces-3.7.1.jar"/>
15-
<plugin path=".../org/scala-lang/tasty-core_3/3.7.1/tasty-core_3-3.7.1.jar"/>
14+
<plugin path=".../org/scala-lang/scala3-interfaces/3.7.3/scala3-interfaces-3.7.3.jar"/>
15+
<plugin path=".../org/scala-lang/tasty-core_3/3.7.3/tasty-core_3-3.7.3.jar"/>
1616
<plugin path=".../org/scala-lang/modules/scala-asm/9.8.0-scala-1/scala-asm-9.8.0-scala-1.jar"/>
1717
<plugin path=".../org/scala-sbt/compiler-interface/1.10.7/compiler-interface-1.10.7.jar"/>
1818
<plugin path=".../org/jline/jline-reader/3.29.0/jline-reader-3.29.0.jar"/>

‎libs/kotlinlib/worker/src/mill/kotlinlib/worker/impl/JvmCompileBtApiImpl.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class JvmCompileBtApiImpl() extends Compiler {
4242
compilationConfig,
4343
// KotlinInterop.toKotlinList(sources.map(_.toIO).toArray),
4444
// KotlinInterop.toKotlinList(args.toArray)
45-
KotlinInterop.toKotlinList(Array()),
45+
KotlinInterop.toKotlinList(Array[java.io.File]()),
4646
KotlinInterop.toKotlinList(allArgsWithSources.toArray)
4747
)
4848

‎mill-build/src/millbuild/Deps.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Deps {
88
// The Scala version to use
99
// When updating, run "Publish Bridges" Github Actions for the new version
1010
// and then add to it `bridgeScalaVersions`
11-
val scalaVersion = "3.7.1"
11+
val scalaVersion = "3.7.3"
1212
val scala2Version = "2.13.15"
1313
// The Scala 2.12.x version to use for some workers
1414
val workerScalaVersion212 = "2.12.20"

0 commit comments

Comments
 (0)