Merge pull request #593 from gemini-hlsw/update/sbt-scalafix-0.12.1

Update sbt-scalafix, scalafix-core to 0.12.1
gemini-hlsw · Jun 26, 2024 · b69980e · b69980e
2 parents 9db0a27 + d032523
commit b69980e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -166,7 +166,7 @@ lazy val sbtPlugin = project
     moduleName         := "sbt-clue",
     crossScalaVersions := List("2.12.19"),
     scalacOptions      := Nil,
-    addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"      % "0.12.0"),
+    addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"      % "0.12.1"),
     addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.2"),
     addSbtPlugin("org.portable-scala" % "sbt-crossproject"  % "1.3.2"),
     buildInfoPackage   := "clue.sbt",

diff --git a/gen/output/src/main/scala/test/StarWarsQuery2.scala b/gen/output/src/main/scala/test/StarWarsQuery2.scala
@@ -55,7 +55,6 @@ object Wrapper extends Something {
           implicit val eqFriends: cats.Eq[Data.Character.Friends] = cats.Eq.fromUniversalEquals
           implicit val showFriends: cats.Show[Data.Character.Friends] = cats.Show.fromToString
           implicit val reuseFriends: japgolly.scalajs.react.Reusability[Data.Character.Friends] = {
-            import japgolly.scalajs.react.Reusability
             japgolly.scalajs.react.Reusability.derive
           }
           implicit val jsonDecoderFriends: io.circe.Decoder[Data.Character.Friends] = io.circe.generic.semiauto.deriveDecoder[Data.Character.Friends]
@@ -69,7 +68,6 @@ object Wrapper extends Something {
           implicit val eqHuman: cats.Eq[Data.Character.Human] = cats.Eq.fromUniversalEquals
           implicit val showHuman: cats.Show[Data.Character.Human] = cats.Show.fromToString
           implicit val reuseHuman: japgolly.scalajs.react.Reusability[Data.Character.Human] = {
-            import japgolly.scalajs.react.Reusability
             japgolly.scalajs.react.Reusability.derive
           }
           implicit val jsonDecoderHuman: io.circe.Decoder[Data.Character.Human] = io.circe.generic.semiauto.deriveDecoder[Data.Character.Human]
@@ -83,7 +81,6 @@ object Wrapper extends Something {
           implicit val eqDroid: cats.Eq[Data.Character.Droid] = cats.Eq.fromUniversalEquals
           implicit val showDroid: cats.Show[Data.Character.Droid] = cats.Show.fromToString
           implicit val reuseDroid: japgolly.scalajs.react.Reusability[Data.Character.Droid] = {
-            import japgolly.scalajs.react.Reusability
             japgolly.scalajs.react.Reusability.derive
           }
           implicit val jsonDecoderDroid: io.circe.Decoder[Data.Character.Droid] = io.circe.generic.semiauto.deriveDecoder[Data.Character.Droid]
@@ -115,7 +112,6 @@ object Wrapper extends Something {
         implicit val eqCharacter: cats.Eq[Data.Character] = cats.Eq.fromUniversalEquals
         implicit val showCharacter: cats.Show[Data.Character] = cats.Show.fromToString
         implicit val reuseCharacter: japgolly.scalajs.react.Reusability[Data.Character] = {
-          import japgolly.scalajs.react.Reusability
           japgolly.scalajs.react.Reusability.derive
         }
         implicit val jsonDecoderCharacter: io.circe.Decoder[Data.Character] = List[io.circe.Decoder[Data.Character]](io.circe.Decoder[Data.Character.Human].asInstanceOf[io.circe.Decoder[Data.Character]], io.circe.Decoder[Data.Character.Droid].asInstanceOf[io.circe.Decoder[Data.Character]]).reduceLeft(_ or _)
@@ -124,7 +120,6 @@ object Wrapper extends Something {
       implicit val eqData: cats.Eq[Data] = cats.Eq.fromUniversalEquals
       implicit val showData: cats.Show[Data] = cats.Show.fromToString
       implicit val reuseData: japgolly.scalajs.react.Reusability[Data] = {
-        import japgolly.scalajs.react.Reusability
         japgolly.scalajs.react.Reusability.derive
       }
       implicit val jsonDecoderData: io.circe.Decoder[Data] = io.circe.generic.semiauto.deriveDecoder[Data]

diff --git a/gen/rules/src/main/scala/clue/gen/Generator.scala b/gen/rules/src/main/scala/clue/gen/Generator.scala
@@ -508,7 +508,6 @@ trait Generator {
 
     val reuseDef = Option.when(scalaJSReactReuse)(
       q"""implicit val ${valName("reuse")}: japgolly.scalajs.react.Reusability[$n] = {
-              import japgolly.scalajs.react.Reusability
               japgolly.scalajs.react.Reusability.derive
             }
           """

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("edu.gemini"    % "sbt-lucuma-lib" % "0.11.15")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix"   % "0.12.0")
+addSbtPlugin("edu.gemini"    % "sbt-lucuma-lib" % "0.11.16")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix"   % "0.12.1")
 addSbtPlugin("com.eed3si9n"  % "sbt-buildinfo"  % "0.12.0")
diff --git a/sbt-plugin/src/main/scala/clue/sbt/CluePlugin.scala b/sbt-plugin/src/main/scala/clue/sbt/CluePlugin.scala
@@ -22,7 +22,6 @@ object CluePlugin extends AutoPlugin {
   import autoImport._
 
   override def buildSettings: Seq[Setting[_]] = Seq(
-    scalafixScalaBinaryVersion                     := "2.13",
     scalafixDependencies += BuildInfo.organization %% BuildInfo.rulesModule % BuildInfo.version,
     Compile / clueSourceGenerators                 := Seq.empty,
     clueClean                                      := {}