Merge remote-tracking branch 'etspaceman/patch-1' into pr/settings-re…

…fresh
typelevel · Jun 18, 2023 · 1e274ad · 1e274ad
2 parents a69b473 + 0fa4c37
commit 1e274ad
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala
@@ -167,12 +167,18 @@ object TypelevelSettingsPlugin extends AutoPlugin {
       }
     },
     scalacOptions ++= {
-      if (tlIsScala3.value && crossScalaVersions.value.forall(_.startsWith("3.")))
-        Seq("-Ykind-projector:underscores")
-      else if (tlIsScala3.value)
-        Seq("-language:implicitConversions", "-Ykind-projector", "-source:3.0-migration")
-      else
-        Seq("-language:_")
+      scalaVersion.value match {
+        case V(V(3, _, _, _)) if crossScalaVersions.value.forall(_.startsWith("3.")) =>
+          Seq("-Ykind-projector:underscores")
+
+        case V(V(3, _, _, _)) =>
+          Seq("-language:implicitConversions", "-Ykind-projector", "-source:3.0-migration")
+
+        case V(V(2, minor, _, _)) if minor >= 12 =>
+          Seq("-language:_", "-Xsource:3")
+
+        case _ => Seq("-language:_")
+      }
     },
     Test / scalacOptions ++= {
       if (tlIsScala3.value)