diff --git a/build.sbt b/build.sbt index 36e27bbc..c028956d 100644 --- a/build.sbt +++ b/build.sbt @@ -211,7 +211,7 @@ lazy val V = new { val scala213BinaryVersion = "2.13" val scala212 = "2.12.15" val scalatest = "3.2.13" - val scala3 = "3.3.0" + val scala3 = "3.3.1" val scalafix = "0.11.0" val organizeImports = "0.4.3" val catsCore = "2.7.0" diff --git a/plugin/src/main/scala/migrate/CommandStrings.scala b/plugin/src/main/scala/migrate/CommandStrings.scala index 024d574c..87e59556 100644 --- a/plugin/src/main/scala/migrate/CommandStrings.scala +++ b/plugin/src/main/scala/migrate/CommandStrings.scala @@ -53,6 +53,4 @@ object CommandStrings { |- Incompatible: it is incompatible with Scala 3 because it is a macro library or a compiler plugin |- Unclassified: sbt-scala3-migrate does not know how to migrate this dependency |""".stripMargin - - val migrateFallback = "internalMigrateFallback" } diff --git a/plugin/src/main/scala/migrate/ScalaMigratePlugin.scala b/plugin/src/main/scala/migrate/ScalaMigratePlugin.scala index 84260ff8..93813bc7 100644 --- a/plugin/src/main/scala/migrate/ScalaMigratePlugin.scala +++ b/plugin/src/main/scala/migrate/ScalaMigratePlugin.scala @@ -98,9 +98,9 @@ object ScalaMigratePlugin extends AutoPlugin { migrateScalacOptions, migrateLibDependencies, migrateTypes, - fallback, - fallbackAndFail, - migrateFail + internalMigrateFallback, + internalMigrateFallbackAndFail, + internalMigrateFail ) ) @@ -134,9 +134,9 @@ object ScalaMigratePlugin extends AutoPlugin { migrateScalacOptions, migrateLibDependencies, migrateTypes, - fallback, - fallbackAndFail, - migrateFail), + internalMigrateFallback, + internalMigrateFallbackAndFail, + internalMigrateFail), inConfig(Compile)(configSettings), inConfig(Test)(configSettings) ) @@ -249,30 +249,30 @@ object ScalaMigratePlugin extends AutoPlugin { val preparedState = state.copy(attributes = state.attributes.remove(Keys.scala2Version)) val commands = List( StashOnFailure, // stash shell from onFailure - s"$OnFailure migrateFallbackAndFail $projectId", + s"$OnFailure internalMigrateFallbackAndFail $projectId", s"$projectId / storeScala2Inputs", setScalaVersion(projectId, BuildInfo.scala3Version), // set Scala 3 s"$projectId / internalMigrateTypes", - PopOnFailure, // pop shell to onFailure in case the fallback fails - s"$migrateFallback $projectId" // set Scala 2.13 + PopOnFailure, // pop shell to onFailure in case the fallback fails + s"internalMigrateFallback $projectId" // set Scala 2.13 ) commands ::: preparedState } - lazy val fallback: Command = - Command(migrateFallback)(idParser) { (state, projectId) => + lazy val internalMigrateFallback: Command = + Command("internalMigrateFallback")(idParser) { (state, projectId) => state.attributes.get(Keys.scala2Version) match { case Some(scala2Version) => setScalaVersion(projectId, scala2Version) :: state case None => state } } - lazy val fallbackAndFail: Command = + lazy val internalMigrateFallbackAndFail: Command = Command("internalMigrateFallbackAndFail")(idParser) { (state, projectId) => - PopOnFailure :: s"migrateFallback $projectId" :: s"migrateFail $projectId" :: Nil ::: state + PopOnFailure :: s"internalMigrateFallback $projectId" :: s"internalMigrateFail $projectId" :: Nil ::: state } - lazy val migrateFail: Command = + lazy val internalMigrateFail: Command = Command("internalMigrateFail")(idParser) { (state, projectId) => state.log.error(s"Migration of $projectId failed.") state.fail diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/test b/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/test index b2b473b3..9bfb659c 100644 --- a/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/test +++ b/plugin/src/sbt-test/sbt-scala3-migrate/aggregate-project/test @@ -4,5 +4,5 @@ > migrateTypes aggregate-project # check aggregate-project is migrated -> ++3.3.0! +> ++3.3.1! > aggregate-project / compile diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/integration-test/test b/plugin/src/sbt-test/sbt-scala3-migrate/integration-test/test index 72cd34c1..9d2cc9c2 100644 --- a/plugin/src/sbt-test/sbt-scala3-migrate/integration-test/test +++ b/plugin/src/sbt-test/sbt-scala3-migrate/integration-test/test @@ -3,5 +3,5 @@ > migrateSyntax integration-test > migrateTypes integration-test -> ++3.3.0! +> ++3.3.1! > integration-test / IntegrationTest / compile diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/test b/plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/test index 91a4cf64..d92a0c27 100644 --- a/plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/test +++ b/plugin/src/sbt-test/sbt-scala3-migrate/library-dependencies/test @@ -3,5 +3,5 @@ > migrateSyntax library-dependencies > migrateTypes library-dependencies -> ++3.3.0! +> ++3.3.1! > library-dependencies / compile diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/test b/plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/test index e0cbf765..b57485ba 100644 --- a/plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/test +++ b/plugin/src/sbt-test/sbt-scala3-migrate/managed-sources/test @@ -3,5 +3,5 @@ > migrateSyntax managed-sources > migrateTypes managed-sources -> ++3.3.0! +> ++3.3.1! > managed-sources / compile diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/syntax-migration/test b/plugin/src/sbt-test/sbt-scala3-migrate/syntax-migration/test index c98372c3..67fd33c9 100644 --- a/plugin/src/sbt-test/sbt-scala3-migrate/syntax-migration/test +++ b/plugin/src/sbt-test/sbt-scala3-migrate/syntax-migration/test @@ -1,4 +1,4 @@ > migrateSyntax syntax-migration -> ++3.3.0! +> ++3.3.1! > syntax-migration / Test / compile diff --git a/plugin/src/sbt-test/sbt-scala3-migrate/type-inference-migration/test b/plugin/src/sbt-test/sbt-scala3-migrate/type-inference-migration/test index 2dc6d6d3..2e2dd78e 100644 --- a/plugin/src/sbt-test/sbt-scala3-migrate/type-inference-migration/test +++ b/plugin/src/sbt-test/sbt-scala3-migrate/type-inference-migration/test @@ -1,4 +1,4 @@ > migrateTypes type-inference-migration -> ++3.3.0! +> ++3.3.1! > type-inference-migration / Test / compile