From 580bc85e22e9f20709ff2772f253b85b27ab8bac Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Tue, 6 Jun 2023 22:35:08 -0700
Subject: [PATCH] Bump Scala to 2.13.11 and use pre-published bridges (#2575)

---
 build.sc                                    | 10 ++++++----
 example/basic/1-simple-scala/build.sc       |  2 +-
 example/basic/2-custom-build-logic/build.sc |  2 +-
 example/basic/3-multi-module/build.sc       |  2 +-
 example/basic/4-builtin-commands/build.sc   | 10 +++++-----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/build.sc b/build.sc
index 8a61eaa0891..24bcae26b6d 100644
--- a/build.sc
+++ b/build.sc
@@ -47,7 +47,7 @@ object Settings {
 object Deps {
 
   // The Scala version to use
-  val scalaVersion = "2.13.10"
+  val scalaVersion = "2.13.11"
   // Scoverage 1.x will not get releases for newer Scala versions
   val scalaVersionForScoverageWorker1 = "2.13.8"
   // The Scala 2.12.x version to use for some workers
@@ -98,7 +98,7 @@ object Deps {
   }
   val play = Seq(Play_2_8, Play_2_7, Play_2_6).map(p => (p.playBinVersion, p)).toMap
 
-  val acyclic = ivy"com.lihaoyi:::acyclic:0.3.6"
+  val acyclic = ivy"com.lihaoyi:::acyclic:0.3.8"
   val ammoniteVersion = "3.0.0-M0-6-34034262"
   val scalaparse = ivy"com.lihaoyi::scalaparse:3.0.1"
   val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.5.5"
@@ -136,7 +136,7 @@ object Deps {
   val scalametaTrees = ivy"org.scalameta::trees:${scalametaVersion}"
   def scalaReflect(scalaVersion: String) = ivy"org.scala-lang:scala-reflect:${scalaVersion}"
   val scalacScoveragePlugin = ivy"org.scoverage:::scalac-scoverage-plugin:1.4.11"
-  val scoverage2Version = "2.0.8"
+  val scoverage2Version = "2.0.10"
   val scalacScoverage2Plugin = ivy"org.scoverage:::scalac-scoverage-plugin:${scoverage2Version}"
   val scalacScoverage2Reporter = ivy"org.scoverage::scalac-scoverage-reporter:${scoverage2Version}"
   val scalacScoverage2Domain = ivy"org.scoverage::scalac-scoverage-domain:${scoverage2Version}"
@@ -202,6 +202,7 @@ val bridgeScalaVersions = Seq(
   "2.12.15",
   "2.12.16",
   "2.12.17",
+  "2.12.18",
   /*"2.13.0", "2.13.1", "2.13.2",*/ "2.13.3",
   "2.13.4",
   "2.13.5",
@@ -209,7 +210,8 @@ val bridgeScalaVersions = Seq(
   "2.13.7",
   "2.13.8",
   "2.13.9",
-  "2.13.10"
+  "2.13.10",
+  "2.13.11",
 )
 
 val buildBridgeScalaVersions = if (!buildAllCompilerBridges) Seq() else bridgeScalaVersions
diff --git a/example/basic/1-simple-scala/build.sc b/example/basic/1-simple-scala/build.sc
index 3bcf6df960c..e2b35765e94 100644
--- a/example/basic/1-simple-scala/build.sc
+++ b/example/basic/1-simple-scala/build.sc
@@ -2,7 +2,7 @@
 import mill._, scalalib._
 
 object foo extends RootModule with ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.11"
   def ivyDeps = Agg(
     ivy"com.lihaoyi::scalatags:0.8.2",
     ivy"com.lihaoyi::mainargs:0.4.0"
diff --git a/example/basic/2-custom-build-logic/build.sc b/example/basic/2-custom-build-logic/build.sc
index 97195bfb06f..595a232eb7a 100644
--- a/example/basic/2-custom-build-logic/build.sc
+++ b/example/basic/2-custom-build-logic/build.sc
@@ -6,7 +6,7 @@
 import mill._, scalalib._
 
 object foo extends RootModule with ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.11"
 
   /** Total number of lines in module's source files */
   def lineCount = T{
diff --git a/example/basic/3-multi-module/build.sc b/example/basic/3-multi-module/build.sc
index 43faf48d5b5..53198966d85 100644
--- a/example/basic/3-multi-module/build.sc
+++ b/example/basic/3-multi-module/build.sc
@@ -1,7 +1,7 @@
 import mill._, scalalib._
 
 trait MyModule extends ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.11"
 }
 
 object foo extends MyModule {
diff --git a/example/basic/4-builtin-commands/build.sc b/example/basic/4-builtin-commands/build.sc
index af7c1319cd9..379727e3e0e 100644
--- a/example/basic/4-builtin-commands/build.sc
+++ b/example/basic/4-builtin-commands/build.sc
@@ -3,7 +3,7 @@
 import mill._, scalalib._
 
 trait MyModule extends ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.11"
 }
 
 object foo extends MyModule {
@@ -95,7 +95,7 @@ Inputs:
 /** Usage
 
 > ./mill show foo.scalaVersion
-"2.13.8"
+"2.13.11"
 
 */
 
@@ -130,7 +130,7 @@ Inputs:
 > ./mill show foo.compileClasspath
 [
   ".../foo/compile-resources",
-  ".../org/scala-lang/scala-library/2.13.8/scala-library-2.13.8.jar",
+  ".../org/scala-lang/scala-library/2.13.11/scala-library-2.13.11.jar",
   ...
 ]
 
@@ -151,7 +151,7 @@ Inputs:
   ],
   "foo.compileClasspath": [
     ".../foo/compile-resources",
-    ".../org/scala-lang/scala-library/2.13.8/scala-library-2.13.8.jar",
+    ".../org/scala-lang/scala-library/2.13.11/scala-library-2.13.11.jar",
     ...
   ]
 }
@@ -172,7 +172,7 @@ Inputs:
   ],
   "foo.compileClasspath": [
     ".../foo/compile-resources",
-    ".../org/scala-lang/scala-library/2.13.8/scala-library-2.13.8.jar",
+    ".../org/scala-lang/scala-library/2.13.11/scala-library-2.13.11.jar",
     ...
   ]
 }