update scala3-migrate to 2.13.7 and 3.1.0

scalacenter · Jan 4, 2022 · 4ef676b · 4ef676b
1 parent 4881a0c
commit 4ef676b
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 27 deletions.
diff --git a/build.sbt b/build.sbt
@@ -161,7 +161,7 @@ lazy val `scalafix-output` = project
     crossScalaVersions := List(V.scala213, V.scala3),
     scalacOptions ++= (if (scalaVersion.value.startsWith("3")) Seq("-Ykind-projector") else Seq()),
     libraryDependencies ++= {
-      Seq("org.typelevel" % "cats-core_2.13" % V.catsCore, "dev.zio" %% "zio" % V.zio) ++
+      Seq("org.typelevel" %% "cats-core" % V.catsCore, "dev.zio" %% "zio" % V.zio) ++
         (CrossVersion.partialVersion(scalaVersion.value) match {
           case Some((2, 13)) =>
             Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % V.kindProjector).cross(CrossVersion.full)))
@@ -204,19 +204,19 @@ addCommandAlias("compileScalafixOutputinScala3", s"""set `scalafix-output`/scala
 def isCI = System.getenv("CI") != null
 
 lazy val V = new {
-  val scala213              = "2.13.6"
+  val scala213              = "2.13.7"
   val scala213BinaryVersion = "2.13"
   val scala212              = "2.12.14"
   val scalatest             = "3.2.10"
-  val scala3                = "3.0.2"
-  val scalafix              = "0.9.31"
+  val scala3                = "3.1.0"
+  val scalafix              = "0.9.33"
   val scribe                = "3.6.7"
   val organizeImports       = "0.4.3"
   val catsCore              = "2.7.0"
   val kindProjector         = "0.13.2"
   val coursierApi           = "2.0.16"
   val coursierInterface     = "1.0.4"
-  val scalameta             = "4.4.21"
-  val localSnapshotVersion  = "0.4.0-SNAPSHOT"
+  val scalameta             = "4.4.31"
+  val localSnapshotVersion  = "0.5.0-SNAPSHOT"
   val zio                   = "1.0.12"
 }
diff --git a/interfaces/compiler/src/main/java/compiler/interfaces/MigrateReporter.java b/interfaces/compiler/src/main/java/compiler/interfaces/MigrateReporter.java
@@ -20,7 +20,7 @@ public void doReport(dotty.tools.dotc.reporting.Diagnostic dia, Context ctx) {
         if (dia.level() == Diagnostic.ERROR) {
             Message message = dia.msg();
             StringBuilder rendered = new StringBuilder();
-            rendered.append(messageAndPos(message, dia.pos(), diagnosticLevel(dia), ctx));
+            rendered.append(messageAndPos(dia, ctx));
 
             boolean shouldExplain = dotty.tools.dotc.reporting.Diagnostic.shouldExplain(dia, ctx);
             if (shouldExplain && !message.explanation().isEmpty()) {

diff --git a/plugin/src/main/scala/migrate/Messages.scala b/plugin/src/main/scala/migrate/Messages.scala
@@ -8,7 +8,7 @@ private[migrate] object Messages {
        |
        |Your project must be in 2.13 and not in $scalaVersion
        |Please change the scalaVersion following this command
-       |set LocalProject("$projectId") / scalaVersion := "2.13.5"
+       |set LocalProject("$projectId") / scalaVersion := "2.13.7"
        |
        |
        |""".stripMargin

diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/build.sbt
@@ -1,15 +1,15 @@
-ThisBuild / scalaVersion := "2.13.5"
+ThisBuild / scalaVersion := "2.13.7"
 
 lazy val subproject = project
   .in(file("subproject"))
   .settings(TaskKey[Unit]("checkNotMigrated") := {
-    assert(scalaVersion.value == "2.13.5")
+    assert(scalaVersion.value == "2.13.7")
   })
 
 lazy val `aggregate-project` = project
   .in(file("."))
   .settings(TaskKey[Unit]("checkMigration") := {
-    assert(scalaVersion.value == "3.0.2", s"Wrong scala version ${scalaVersion.value}. Expected 3.0.2")
+    assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
     (Compile / compile).value
   })
   .aggregate(subproject)
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/project/build.properties b/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.3
+sbt.version=1.6.1
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/integration-test/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/integration-test/build.sbt
@@ -2,11 +2,11 @@ lazy val `integration-test` = project
   .in(file("integration-test"))
   .configs(IntegrationTest)
   .settings(
-    scalaVersion := "2.13.5",
+    scalaVersion := "2.13.7",
     // Enable migration on IntegrationTest config
     inConfig(IntegrationTest)(Defaults.itSettings ++ ScalaMigratePlugin.configSettings),
     TaskKey[Unit]("checkMigration") := {
-      assert(scalaVersion.value == "3.0.2")
+      assert(scalaVersion.value == "3.1.0")
       (IntegrationTest / compile).value
     }
   )
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/build.sbt
@@ -13,13 +13,13 @@ lazy val `library-dependencies` = project
       else Seq(compilerPlugin("org.typelevel" % "kind-projector" % V.kindProjector cross CrossVersion.full))
     },
     TaskKey[Unit]("checkMigration") := {
-      assert(scalaVersion.value == "3.0.2", s"Wrong scala version ${scalaVersion.value}. Expected 3.0.2")
+      assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
       (Compile / compile).value
     }
   )
 
 lazy val V = new {
-  val scala213      = "2.13.5"
+  val scala213      = "2.13.7"
   val catsCore      = "2.7.0"
   val kindProjector = "0.13.2"
 }
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/build.sbt
@@ -1,7 +1,7 @@
 lazy val `managed-sources` = project
   .in(file("."))
   .settings(
-    scalaVersion := "2.13.5",
+    scalaVersion := "2.13.7",
     Compile / sourceGenerators += Def.task {
       val file = (Compile / sourceManaged).value / "buildinfo" / "BuildInfo.scala"
       val buildInfo = s"""|
@@ -15,7 +15,7 @@ lazy val `managed-sources` = project
       Seq(file)
     },
     TaskKey[Unit]("checkMigration") := {
-      assert(scalaVersion.value == "3.0.2", s"Wrong scala version ${scalaVersion.value}. Expected 3.0.2")
+      assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
       (Compile / compile).value
     }
   )
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/scalac-options-migration/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/scalac-options-migration/build.sbt
@@ -3,7 +3,7 @@ import migrate.ScalaMigratePlugin
 lazy val `scalac-options-migration` = project
   .in(file("."))
   .settings(
-    scalaVersion := "2.13.5",
+    scalaVersion := "2.13.7",
     scalacOptions ++= Seq(
       "-encoding",
       "UTF-8",

diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/syntax-migration/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/syntax-migration/build.sbt
@@ -1,3 +1,3 @@
 lazy val `syntax-migration` = project
   .in(file("."))
-  .settings(scalaVersion := "2.13.5")
+  .settings(scalaVersion := "2.13.7")
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/type-inference-migration/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/type-inference-migration/build.sbt
@@ -1,9 +1,9 @@
 lazy val `type-inference-migration` = project
   .in(file("."))
   .settings(
-    scalaVersion := "2.13.5",
+    scalaVersion := "2.13.7",
     TaskKey[Unit]("checkMigration") := {
-      assert(scalaVersion.value == "3.0.2", s"Wrong scala version ${scalaVersion.value}. Expected 3.0.2")
+      assert(scalaVersion.value == "3.1.0", s"Wrong scala version ${scalaVersion.value}. Expected 3.1.0")
       (Test / compile).value
     }
   )
diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/unresolved-dependencies/build.sbt b/plugin/src/sbt-test/sbt-scala3-migrate/unresolved-dependencies/build.sbt
@@ -12,7 +12,7 @@ lazy val `unresolved-dependencies` = project
   )
 
 lazy val V = new {
-  val scala213      = "2.13.5"
+  val scala213      = "2.13.7"
   val catsCore      = "2.7.0"
   val kindProjector = "0.13.2"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.7
+sbt.version=1.6.1
diff --git a/scalafix/output/src/main/scala/incompat/Cats5.scala b/scalafix/output/src/main/scala/incompat/Cats5.scala
@@ -59,8 +59,8 @@ trait MapInstances extends cats.kernel.instances.MapInstances {
       def flatMap[A, B](fa: Map[K, A])(f: (A) => Map[K, B]): Map[K, B] =
         fa.flatMap[K, B] { case (k, a) => f(a).get(k).map[(K, B)]((k, _)) }
 
-      def unorderedFoldMap[A, B: CommutativeMonoid](fa: Map[K, A])(f: (A) => B): B =
-        fa.foldLeft[B](Monoid[B].empty) { case (b, (k, a)) => Monoid[B].combine(b, f(a)) }
+      def unorderedFoldMap[A, B: CommutativeMonoid](fa: Map[K, A])(f: (A) => B) =
+        fa.foldLeft(Monoid[B].empty) { case (b, (k, a)) => Monoid[B].combine(b, f(a)) }
 
       def tailRecM[A, B](a: A)(f: A => Map[K, Either[A, B]]): Map[K, B] = {
         val bldr: collection.mutable.Builder[(K, B),Map[K,B]] = Map.newBuilder[K, B]

diff --git a/scalafix/tests/src/test/scala/migrate/RuleSuite.scala b/scalafix/tests/src/test/scala/migrate/RuleSuite.scala
@@ -14,7 +14,7 @@ import scalafix.testkit._
 class RuleSuite extends AbstractSemanticRuleSuite with FunSuiteLike {
   val (passing, failing) = testsToRun.partition(!_.path.testName.contains("_fails"))
   passing.foreach(runOn)
-//  runSpecificTests("Polytypes2")
+//  runSpecificTests("Cats5")
 //  writeTestResult("TypeApply2")
 
 //  writeTestResult("implicits/")