Scala Native Scala 3

zio · Jan 25, 2022 · a51c8b9 · a51c8b9
1 parent 9bbca6c
commit a51c8b9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/build.sbt b/build.sbt
@@ -75,7 +75,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
       }
     },
     Compile / doc / sources := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.0") => Seq(
+      case (_, "3.1.1") => Seq(
 
       )
       case (_, _) => (Compile / doc / sources).value
@@ -125,7 +125,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
         "-Ycache-macro-class-loader:last-modified",
         "-Wconf:msg=nowarn:silent"
       )
-      case (_, "2.13.7") => Seq(
+      case (_, "2.13.8") => Seq(
         "-target:jvm-1.8",
         "-explaintypes",
         if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning",
@@ -153,11 +153,11 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
     } },
     scalacOptions -= "-Wconf:any:error",
     mimaPreviousArtifacts := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.0") => Set.empty
+      case (_, "3.1.1") => Set.empty
       case (_, _) => Set(organization.value %% name.value % "1.0.0")
     } },
     scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "2.13.7") => Seq(
+      case (_, "2.13.8") => Seq(
         "-Xlint:-implicit-recursion"
       )
       case (_, _) => Seq.empty
@@ -167,7 +167,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
         "-opt:l:inline",
         "-opt-inline-from:izumi.reflect.**"
       )
-      case (false, "2.13.7") => Seq(
+      case (false, "2.13.8") => Seq(
         "-opt:l:inline",
         "-opt-inline-from:izumi.reflect.**"
       )
@@ -177,17 +177,17 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
   )
   .jvmSettings(
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
     scalaVersion := crossScalaVersions.value.head
   )
   .jsSettings(
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -197,7 +197,8 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
   )
   .nativeSettings(
     crossScalaVersions := Seq(
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -285,7 +286,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       }
     },
     Compile / doc / sources := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.0") => Seq(
+      case (_, "3.1.1") => Seq(
 
       )
       case (_, _) => (Compile / doc / sources).value
@@ -335,7 +336,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
         "-Ycache-macro-class-loader:last-modified",
         "-Wconf:msg=nowarn:silent"
       )
-      case (_, "2.13.7") => Seq(
+      case (_, "2.13.8") => Seq(
         "-target:jvm-1.8",
         "-explaintypes",
         if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning",
@@ -363,11 +364,11 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     } },
     scalacOptions -= "-Wconf:any:error",
     mimaPreviousArtifacts := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.0") => Set.empty
+      case (_, "3.1.1") => Set.empty
       case (_, _) => Set(organization.value %% name.value % "1.0.0")
     } },
     scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "2.13.7") => Seq(
+      case (_, "2.13.8") => Seq(
         "-Xlint:-implicit-recursion"
       )
       case (_, _) => Seq.empty
@@ -377,7 +378,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
         "-opt:l:inline",
         "-opt-inline-from:izumi.reflect.**"
       )
-      case (false, "2.13.7") => Seq(
+      case (false, "2.13.8") => Seq(
         "-opt:l:inline",
         "-opt-inline-from:izumi.reflect.**"
       )
@@ -386,17 +387,17 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .jvmSettings(
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
     scalaVersion := crossScalaVersions.value.head
   )
   .jsSettings(
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -406,7 +407,8 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .nativeSettings(
     crossScalaVersions := Seq(
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -467,8 +469,8 @@ lazy val `izumi-reflect-root-jvm` = (project in file(".agg/.agg-jvm"))
   .settings(
     publish / skip := true,
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -482,8 +484,8 @@ lazy val `izumi-reflect-root-js` = (project in file(".agg/.agg-js"))
   .settings(
     publish / skip := true,
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -497,8 +499,8 @@ lazy val `izumi-reflect-root-native` = (project in file(".agg/.agg-native"))
   .settings(
     publish / skip := true,
     crossScalaVersions := Seq(
-      "3.1.0",
-      "2.13.7",
+      "3.1.1",
+      "2.13.8",
       "2.12.15",
       "2.11.12"
     ),
@@ -534,7 +536,7 @@ lazy val `izumi-reflect-root` = (project in file("."))
       "-XDignore.symbol.file"
     ),
     crossScalaVersions := Nil,
-    scalaVersion := "3.1.0",
+    scalaVersion := "3.1.1",
     ThisBuild / organization := "dev.zio",
     sonatypeProfileName := "dev.zio",
     sonatypeSessionName := s"[sbt-sonatype] ${name.value} ${version.value} ${java.util.UUID.randomUUID}",

diff --git a/project/Deps.sc b/project/Deps.sc
@@ -26,7 +26,7 @@ object Izumi {
   final val scala211 = ScalaVersion("2.11.12")
   final val scala212 = ScalaVersion("2.12.15")
   final val scala213 = ScalaVersion("2.13.8")
-  final val scala300 = ScalaVersion("3.1.0")
+  final val scala300 = ScalaVersion("3.1.1")
 
   // launch with `./sbtgen.sc 2` to use 2.13 in Intellij
   var targetScala = Seq(scala300, scala213, scala212, scala211)
@@ -92,7 +92,7 @@ object Izumi {
     )
     private val nativePlatform = PlatformEnv(
       platform = Platform.Native,
-      language = targetScala.filterNot(_.isDotty),
+      language = targetScala,
       settings = Seq(
         "coverageEnabled" := false
       )