Merge pull request #1314 from tgodzik/update-scala-versions

Update Scala version to 2.12.13 & bump scalameta
scalacenter · Jan 15, 2021 · 6156633 · 6156633
2 parents bfaf275 + 80ba5fc
commit 6156633
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -9,12 +9,12 @@ cs resolve \
   ch.epfl.scala:scalafix-core_2.12:$version  \
   ch.epfl.scala:scalafix-core_2.13:$version  \
   ch.epfl.scala:scalafix-reflect_2.11.12:$version  \
-  ch.epfl.scala:scalafix-reflect_2.12.12:$version  \
-  ch.epfl.scala:scalafix-reflect_2.13.3:$version  \
+  ch.epfl.scala:scalafix-reflect_2.12.13:$version  \
+  ch.epfl.scala:scalafix-reflect_2.13.4:$version  \
   ch.epfl.scala:scalafix-cli_2.11.12:$version  \
-  ch.epfl.scala:scalafix-cli_2.12.12:$version  \
-  ch.epfl.scala:scalafix-cli_2.13.3:$version  \
+  ch.epfl.scala:scalafix-cli_2.12.13:$version  \
+  ch.epfl.scala:scalafix-cli_2.13.4:$version  \
   ch.epfl.scala:scalafix-testkit_2.11.12:$version  \
-  ch.epfl.scala:scalafix-testkit_2.12.12:$version \
-  ch.epfl.scala:scalafix-testkit_2.13.3:$version \
+  ch.epfl.scala:scalafix-testkit_2.12.13:$version \
+  ch.epfl.scala:scalafix-testkit_2.13.4:$version \
   -r sonatype:public
diff --git a/build.sbt b/build.sbt
@@ -242,6 +242,7 @@ lazy val unit = project
       List(out)
     },
     buildInfoKeys := Seq[BuildInfoKey](
+      "scalametaVersion" -> scalametaV,
       "baseDirectory" ->
         baseDirectory.in(ThisBuild).value,
       "inputSourceroot" ->

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,11 +4,11 @@ import scala.util.{Properties, Try}
 /* scalafmt: { maxColumn = 120 }*/
 
 object Dependencies {
-  val scalametaV = "4.4.4"
+  val scalametaV = "4.4.6"
   val metaconfigV = "0.9.10"
   def scala210 = "2.10.7"
   def scala211 = "2.11.12"
-  def scala212 = "2.12.12"
+  def scala212 = "2.12.13"
   def scala213 = "2.13.4"
   def coursierV = "2.0.0-RC5-6"
   def coursierInterfaceV = "1.0.2"

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -266,7 +266,9 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
     )
   )
 
-  private val PreviousScalaVersion = Map[String, String]()
+  private val PreviousScalaVersion = Map(
+    "2.12.13" -> "2.12.12"
+  )
 
   override def projectSettings: Seq[Def.Setting[_]] = List(
     scalacOptions ++= compilerOptions.value,

diff --git a/scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala b/scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala
@@ -8,6 +8,7 @@ import coursier.Fetch
 import coursier.Module
 import coursier.ModuleName
 import coursier.Organization
+import scalafix.tests.BuildInfo
 
 object SemanticdbPlugin {
   def semanticdbPluginPath(): String = {
@@ -16,7 +17,7 @@ object SemanticdbPlugin {
         Organization("org.scalameta"),
         ModuleName(s"semanticdb-scalac_$scalaVersion")
       ),
-      "4.4.0"
+      BuildInfo.scalametaVersion
     )
     val paths = Fetch()
       .addDependencies(dep)