Skip to content

Commit

Permalink
Bump Scala to 2.13.11 and use pre-published bridges (#2575)
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi authored Jun 7, 2023
1 parent 05fb5e0 commit 580bc85
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
10 changes: 6 additions & 4 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -202,14 +202,16 @@ 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",
"2.13.6",
"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
Expand Down
2 changes: 1 addition & 1 deletion example/basic/1-simple-scala/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/basic/2-custom-build-logic/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion example/basic/3-multi-module/build.sc
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions example/basic/4-builtin-commands/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -95,7 +95,7 @@ Inputs:
/** Usage
> ./mill show foo.scalaVersion
"2.13.8"
"2.13.11"
*/

Expand Down Expand Up @@ -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",
...
]
Expand All @@ -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",
...
]
}
Expand All @@ -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",
...
]
}
Expand Down

0 comments on commit 580bc85

Please sign in to comment.