on JS and Native, drop Scala 2.11

scala · Feb 16, 2023 · 61ff159 · 61ff159
1 parent d631ea0
commit 61ff159
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,10 @@ jobs:
         platform: [JVM, JS, Native]
         mode: [normal]
         exclude:
+          - scala: 2.11.x
+            platform: JS
+          - scala: 2.11.x
+            platform: Native
           - java: 11
             platform: JS
           - java: 11

diff --git a/build.sbt b/build.sbt
@@ -22,8 +22,6 @@ lazy val root = project
   )
   .aggregate(
     compat211JVM,
-    compat211JS,
-    compat211Native,
     compat212JVM,
     compat212JS,
     compat212Native,
@@ -126,7 +124,7 @@ lazy val compat = new MultiScalaCrossProject(
         case Some((3, _) | (2, 13)) =>
           jsAndNativeSourcesParent / "scala-2.13"
         case _ =>
-          jsAndNativeSourcesParent / "scala-2.11_2.12"
+          jsAndNativeSourcesParent / "scala-2.12"
       }
     },
     Test / fork := false // Scala.js cannot run forked tests
@@ -143,22 +141,20 @@ lazy val compat = new MultiScalaCrossProject(
         case Some((3, _) | (2, 13)) =>
           jsAndNativeSourcesParent / "scala-2.13"
         case _ =>
-          jsAndNativeSourcesParent / "scala-2.11_2.12"
+          jsAndNativeSourcesParent / "scala-2.12"
       }
     },
     versionPolicyIntention := Compatibility.None,
     Test / fork := false // Scala Native cannot run forked tests
   ).nativeEnablePlugins(ScalaNativeJUnitPlugin)
 )
 
-val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
+val compat211 = compat(Seq(            JVMPlatform                ), scala211)
 val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
 val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
 val compat3   = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
 
 lazy val compat211JVM    = compat211.jvm
-lazy val compat211JS     = compat211.js
-lazy val compat211Native = compat211.native
 lazy val compat212JVM    = compat212.jvm
 lazy val compat212JS     = compat212.js
 lazy val compat212Native = compat212.native

diff --git a/....11_2.12/scala/jdk/OptionConverters.scala → ...ala-2.12/scala/jdk/OptionConverters.scala b/....11_2.12/scala/jdk/OptionConverters.scala → ...ala-2.12/scala/jdk/OptionConverters.scala