From 4a074b144626a39477ef81aae65e8c0e304145ad Mon Sep 17 00:00:00 2001
From: Tobias Roeser <le.petit.fou@web.de>
Date: Mon, 21 Oct 2024 09:56:39 +0200
Subject: [PATCH] Update Scala version to 2.13.15 (#3788)

Pull request: https://github.com/com-lihaoyi/mill/pull/3788
---
 build.mill                                           |  9 +++++----
 .../idea/libraries/scala_SDK_2_13_15.xml}            |  8 ++++----
 .../hello-idea/idea/libraries/scala_SDK_2_13_15.xml  | 12 ++++++++++++
 ...2_13_14_jar.xml => scala_library_2_13_15_jar.xml} |  6 +++---
 4 files changed, 24 insertions(+), 11 deletions(-)
 rename integration/ide/gen-idea/resources/{hello-idea/idea/libraries/scala_SDK_2_13_14.xml => extended/idea/libraries/scala_SDK_2_13_15.xml} (80%)
 create mode 100644 integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_15.xml
 rename integration/ide/gen-idea/resources/hello-idea/idea/libraries/{scala_library_2_13_14_jar.xml => scala_library_2_13_15_jar.xml} (52%)

diff --git a/build.mill b/build.mill
index ccc84458aec..0c810434dc7 100644
--- a/build.mill
+++ b/build.mill
@@ -55,12 +55,12 @@ object Deps {
   // The Scala version to use
   // When updating, run "Publish Bridges" Github Actions for the new version
   // and then add to it `bridgeScalaVersions`
-  val scalaVersion = "2.13.14"
-  val scala2Version = "2.13.14"
+  val scalaVersion = "2.13.15"
+  val scala2Version = "2.13.15"
   // The Scala 2.12.x version to use for some workers
   val workerScalaVersion212 = "2.12.19"
 
-  val testScala213Version = "2.13.14"
+  val testScala213Version = "2.13.15"
   // Scala Native 4.2 will not get releases for new Scala version
   val testScala213VersionForScalaNative42 = "2.13.8"
   val testScala212Version = "2.12.6"
@@ -305,7 +305,8 @@ val bridgeScalaVersions = Seq(
   "2.13.11",
   "2.13.12",
   "2.13.13",
-  "2.13.14"
+  "2.13.14",
+  "2.13.15"
 )
 
 // We limit the number of compiler bridges to compile and publish for local
diff --git a/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_14.xml b/integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_2_13_15.xml
similarity index 80%
rename from integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_14.xml
rename to integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_2_13_15.xml
index 39cfc936520..1a0bd486330 100644
--- a/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_14.xml
+++ b/integration/ide/gen-idea/resources/extended/idea/libraries/scala_SDK_2_13_15.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
-    <library name="scala-SDK-2.13.14" type="Scala">
+    <library name="scala-SDK-2.13.15" type="Scala">
         <properties>
             <language-level>Scala_2_13</language-level>
             <compiler-classpath>
-                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14.jar"/>
-                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.14/scala-library-2.13.14.jar"/>
-                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.13.14/scala-reflect-2.13.14.jar"/>
+                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15.jar"/>
+                <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"/>
+                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.13.15/scala-reflect-2.13.15.jar"/>
             </compiler-classpath>
         </properties>
     </library>
diff --git a/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_15.xml b/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_15.xml
new file mode 100644
index 00000000000..1a0bd486330
--- /dev/null
+++ b/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_SDK_2_13_15.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+    <library name="scala-SDK-2.13.15" type="Scala">
+        <properties>
+            <language-level>Scala_2_13</language-level>
+            <compiler-classpath>
+                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15.jar"/>
+                <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"/>
+                <root url="file://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.13.15/scala-reflect-2.13.15.jar"/>
+            </compiler-classpath>
+        </properties>
+    </library>
+</component>
diff --git a/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_library_2_13_14_jar.xml b/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_library_2_13_15_jar.xml
similarity index 52%
rename from integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_library_2_13_14_jar.xml
rename to integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_library_2_13_15_jar.xml
index cca8f20a966..4e5a2cb8995 100644
--- a/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_library_2_13_14_jar.xml
+++ b/integration/ide/gen-idea/resources/hello-idea/idea/libraries/scala_library_2_13_15_jar.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
-    <library name="scala-library-2.13.14.jar">
+    <library name="scala-library-2.13.15.jar">
         <CLASSES>
-            <root url="jar://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.14/scala-library-2.13.14.jar!/"/>
+            <root url="jar://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15.jar!/"/>
         </CLASSES>
         <SOURCES>
-            <root url="jar://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.14/scala-library-2.13.14-sources.jar!/"/>
+            <root url="jar://$USER_HOME$/COURSIER_CACHE/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15-sources.jar!/"/>
         </SOURCES>
     </library>
 </component>