Revert "Add Scala3 Version to scala3Settings (#141)" (#142)

This reverts commit 2f80a47.
zio · Feb 22, 2023 · 88df4a1 · 88df4a1
1 parent 2f80a47
commit 88df4a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala
@@ -54,7 +54,6 @@ trait ScalaCompilerSettings {
     else Nil
 
   lazy val scala3Settings: Seq[Setting[_]] = Seq(
-    crossScalaVersions += ZioSbtEcosystemPlugin.autoImport.scala3.value,
     scalacOptions ++= {
       if (Keys.scalaBinaryVersion.value == "3")
         Seq("-noindent")
@@ -198,11 +197,6 @@ trait ScalaCompilerSettings {
   ): Seq[Setting[_]] =
     Seq(
       Keys.name := name,
-      Keys.crossScalaVersions := Seq(
-        ZioSbtEcosystemPlugin.autoImport.scala211.value,
-        ZioSbtEcosystemPlugin.autoImport.scala212.value,
-        ZioSbtEcosystemPlugin.autoImport.scala213.value
-      ),
       scalacOptions ++= stdOptions ++ extraOptions(
         Keys.scalaVersion.value,
         javaPlatform,

diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala
@@ -106,7 +106,7 @@ object ZioSbtEcosystemPlugin extends AutoPlugin {
     scala212           := Versions.scala212,
     scala213           := Versions.scala213,
     scalaVersion       := scala213.value,
-    crossScalaVersions := Seq(scalaVersion.value)
+    crossScalaVersions := Seq(scala211.value, scala212.value, scala213.value, scala3.value)
   )
 
   override def globalSettings: Seq[Def.Setting[_]] =