Skip to content

Commit 0d47911

Browse files
Support Scala 2.13.8 (#320)
* Support Scala 2.13.8 * Bump scala versions in subprojects
1 parent 8f195b2 commit 0d47911

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,19 @@ addCommandAlias("compileScalafixOutputinScala3", s"""set `scalafix-output`/scala
204204
def isCI = System.getenv("CI") != null
205205

206206
lazy val V = new {
207-
val scala213 = "2.13.7"
207+
val scala213 = "2.13.8"
208208
val scala213BinaryVersion = "2.13"
209-
val scala212 = "2.12.14"
210-
val scalatest = "3.2.10"
211-
val scala3 = "3.1.0"
212-
val scalafix = "0.9.33"
209+
val scala212 = "2.12.15"
210+
val scalatest = "3.2.11"
211+
val scala3 = "3.1.1"
212+
val scalafix = "0.9.34"
213213
val scribe = "3.6.9"
214214
val organizeImports = "0.4.3"
215215
val catsCore = "2.7.0"
216216
val kindProjector = "0.13.2"
217217
val coursierApi = "2.0.16"
218218
val coursierInterface = "1.0.6"
219-
val scalameta = "4.4.31"
219+
val scalameta = "4.4.32"
220220
val localSnapshotVersion = "0.5.0-SNAPSHOT"
221221
val zio = "1.0.13"
222222
}

plugin/src/main/scala/migrate/Messages.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ private[migrate] object Messages {
88
|
99
|Your project must be in 2.13 and not in $scalaVersion
1010
|Please change the scalaVersion following this command
11-
|set LocalProject("$projectId") / scalaVersion := "2.13.7"
11+
|set LocalProject("$projectId") / scalaVersion := "2.13.8"
1212
|
1313
|
1414
|""".stripMargin
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
ThisBuild / scalaVersion := "2.13.7"
1+
ThisBuild / scalaVersion := "2.13.8"
22

33
lazy val subproject = project
44
.in(file("subproject"))
55
.settings(TaskKey[Unit]("checkNotMigrated") := {
6-
assert(scalaVersion.value == "2.13.7")
6+
assert(scalaVersion.value == "2.13.8")
77
})
88

99
lazy val `aggregate-project` = project
1010
.in(file("."))
1111
.settings(TaskKey[Unit]("checkMigration") := {
12-
assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
12+
assert(scalaVersion.value == "3.1.1", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.1")
1313
(Compile / compile).value
1414
})
1515
.aggregate(subproject)

plugin/src/sbt-test/sbt-scala3-migrate/integration-test/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ lazy val `integration-test` = project
22
.in(file("integration-test"))
33
.configs(IntegrationTest)
44
.settings(
5-
scalaVersion := "2.13.7",
5+
scalaVersion := "2.13.8",
66
// Enable migration on IntegrationTest config
77
inConfig(IntegrationTest)(Defaults.itSettings ++ ScalaMigratePlugin.configSettings),
88
TaskKey[Unit]("checkMigration") := {
9-
assert(scalaVersion.value == "3.1.0")
9+
assert(scalaVersion.value == "3.1.1")
1010
(IntegrationTest / compile).value
1111
}
1212
)

plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ lazy val `library-dependencies` = project
1313
else Seq(compilerPlugin("org.typelevel" % "kind-projector" % V.kindProjector cross CrossVersion.full))
1414
},
1515
TaskKey[Unit]("checkMigration") := {
16-
assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
16+
assert(scalaVersion.value == "3.1.1", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.1")
1717
(Compile / compile).value
1818
}
1919
)
2020

2121
lazy val V = new {
22-
val scala213 = "2.13.7"
22+
val scala213 = "2.13.8"
2323
val catsCore = "2.7.0"
2424
val kindProjector = "0.13.2"
2525
}

plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
lazy val `managed-sources` = project
22
.in(file("."))
33
.settings(
4-
scalaVersion := "2.13.7",
4+
scalaVersion := "2.13.8",
55
Compile / sourceGenerators += Def.task {
66
val file = (Compile / sourceManaged).value / "buildinfo" / "BuildInfo.scala"
77
val buildInfo = s"""|
@@ -15,7 +15,7 @@ lazy val `managed-sources` = project
1515
Seq(file)
1616
},
1717
TaskKey[Unit]("checkMigration") := {
18-
assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
18+
assert(scalaVersion.value == "3.1.1", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.1")
1919
(Compile / compile).value
2020
}
2121
)

plugin/src/sbt-test/sbt-scala3-migrate/scalac-options-migration/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import migrate.ScalaMigratePlugin
33
lazy val `scalac-options-migration` = project
44
.in(file("."))
55
.settings(
6-
scalaVersion := "2.13.7",
6+
scalaVersion := "2.13.8",
77
scalacOptions ++= Seq(
88
"-encoding",
99
"UTF-8",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
lazy val `syntax-migration` = project
22
.in(file("."))
3-
.settings(scalaVersion := "2.13.7")
3+
.settings(scalaVersion := "2.13.8")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
lazy val `type-inference-migration` = project
22
.in(file("."))
33
.settings(
4-
scalaVersion := "2.13.7",
4+
scalaVersion := "2.13.8",
55
TaskKey[Unit]("checkMigration") := {
6-
assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
6+
assert(scalaVersion.value == "3.1.1", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.1")
77
(Test / compile).value
88
}
99
)

plugin/src/sbt-test/sbt-scala3-migrate/unresolved-dependencies/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ lazy val `unresolved-dependencies` = project
1212
)
1313

1414
lazy val V = new {
15-
val scala213 = "2.13.7"
15+
val scala213 = "2.13.8"
1616
val catsCore = "2.7.0"
1717
val kindProjector = "0.13.2"
1818
}

0 commit comments

Comments
 (0)