Merge pull request #300 from bjaglin/reset

scalafixEnable: preserve versions set by ++
scalacenter · Apr 15, 2022 · 787958b · 787958b
2 parents eaacbba + 2f01689
commit 787958b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/main/scala/scalafix/sbt/ScalafixEnable.scala b/src/main/scala/scalafix/sbt/ScalafixEnable.scala
@@ -184,6 +184,6 @@ object ScalafixEnable {
           scalacOptionsSettings ++ enableSemanticdbPlugin
         )
     } yield settings
-    extracted.appendWithoutSession(settings, s)
+    extracted.appendWithSession(settings, s)
   }
 }
diff --git a/src/sbt-test/sbt-scalafix/scalafixEnable/build.sbt b/src/sbt-test/sbt-scalafix/scalafixEnable/build.sbt
@@ -28,7 +28,8 @@ lazy val scala212 = project.settings(
 // 2.13.x is supported
 lazy val scala213 = project.settings(
   // semanticdb-scalac_2.13.4 available in 4.4.10, became available as of 4.4.0
-  scalaVersion := "2.13.4"
+  scalaVersion := "2.13.4",
+  crossScalaVersions := Seq("2.12.15")
 )
 
 TaskKey[Unit]("check") := {
@@ -68,3 +69,7 @@ TaskKey[Unit]("check") := {
       .count(_ == "-Yrangepos") == 1
   )
 }
+
+TaskKey[Unit]("checkVersion") := {
+  assert((scala213 / scalaVersion).value == "2.12.15")
+}
diff --git a/src/sbt-test/sbt-scalafix/scalafixEnable/test b/src/sbt-test/sbt-scalafix/scalafixEnable/test
@@ -4,4 +4,10 @@
 
 -> scala212/test:compile
 > scala212/scalafixAll RemoveUnused
-> scala212/test:compile
+> scala212/test:compile
+
+-> checkVersion
+> ++2.12.15 -v
+> checkVersion
+> scalafixEnable
+> checkVersion