Avoid scala-2.11 for all projects (#1066)

zio · Feb 23, 2023 · 9cf1dba · 9cf1dba
1 parent 636a617
commit 9cf1dba
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 28 deletions.
diff --git a/build.sbt b/build.sbt
@@ -80,19 +80,15 @@ lazy val pureconfigDependencies =
     else Seq("com.github.pureconfig" %% "pureconfig" % pureconfigVersion)
   }
 
-lazy val scala211projects =
-  Seq[ProjectReference](
-    zioConfigJS,
-    zioConfigJVM,
-    zioConfigAwsJVM,
-    zioConfigNative,
-    zioConfigTypesafeJVM,
-    zioConfigDerivationJVM,
-    zioConfigYamlJVM,
-    docs
-  )
-
 lazy val scala212projects = Seq[ProjectReference](
+  zioConfigJS,
+  zioConfigJVM,
+  zioConfigAwsJVM,
+  zioConfigNative,
+  zioConfigTypesafeJVM,
+  zioConfigDerivationJVM,
+  zioConfigYamlJVM,
+  docs,
   zioConfigEnumeratumJVM,
   zioConfigCatsJVM,
   zioConfigRefinedJVM,
@@ -127,12 +123,6 @@ lazy val root =
     .settings(publish / skip := true)
     .aggregate(scala213projects: _*)
 
-lazy val `root2-11` =
-  project
-    .in(file("2-11"))
-    .settings(publish / skip := true)
-    .aggregate(scala211projects: _*)
-
 lazy val `root2-12` =
   project
     .in(file("2-12"))
@@ -159,6 +149,7 @@ lazy val zioConfig = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(buildInfoSettings("zio.config"))
   .settings(macroDefinitionSettings)
   .settings(
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "dev.zio"                %% "zio"                     % zioVersion,
       "org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1",
@@ -181,6 +172,7 @@ lazy val zioConfigAws    = crossProject(JVMPlatform)
   .settings(crossProjectSettings)
   .settings(dottySettings)
   .settings(
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "com.amazonaws" % "aws-java-sdk-ssm" % awsVersion,
       "dev.zio"      %% "zio-streams"      % zioVersion,
@@ -200,7 +192,7 @@ lazy val zioConfigZioAws    = crossProject(JVMPlatform)
   .settings(crossProjectSettings)
   .settings(dottySettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "dev.zio" %% "zio-aws-ssm"  % zioAwsVersion,
       "dev.zio" %% "zio-streams"  % zioVersion,
@@ -220,7 +212,7 @@ lazy val zioConfigRefined    = crossProject(JVMPlatform)
   .settings(crossProjectSettings)
   .settings(dottySettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     refinedDependencies,
     libraryDependencies ++=
       Seq(
@@ -238,7 +230,7 @@ lazy val zioConfigPureconfig    = crossProject(JVMPlatform)
   .settings(stdSettings("zio-config-pureconfig"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     pureconfigDependencies,
     libraryDependencies ++=
       Seq(
@@ -258,7 +250,7 @@ lazy val examples = crossProject(JVMPlatform)
   .settings(stdSettings("zio-config-examples"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     publish / skip := true,
     fork := true,
     magnoliaDependencies,
@@ -299,7 +291,7 @@ lazy val zioConfigMagnolia    = crossProject(JVMPlatform)
   .settings(crossProjectSettings)
   .settings(dottySettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     magnoliaDependencies,
     scalacOptions ++= {
       if (scalaVersion.value == ScalaDotty) {
@@ -324,6 +316,7 @@ lazy val zioConfigTypesafe    = crossProject(JVMPlatform)
   .settings(crossProjectSettings)
   .settings(dottySettings)
   .settings(
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "com.typesafe" % "config"       % "1.4.2",
       "dev.zio"     %% "zio-test"     % zioVersion % Test,
@@ -341,6 +334,7 @@ lazy val zioConfigYaml    = crossProject(JVMPlatform)
   .settings(stdSettings("zio-config-yaml"))
   .settings(crossProjectSettings)
   .settings(
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "org.snakeyaml" % "snakeyaml-engine" % "2.3",
       "dev.zio"      %% "zio-test"         % zioVersion % Test,
@@ -358,6 +352,7 @@ lazy val zioConfigXml    = crossProject(JVMPlatform)
   .settings(stdSettings("zio-config-xml"))
   .settings(crossProjectSettings)
   .settings(
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "dev.zio" %% "zio-parser"   % "0.1.8",
       "dev.zio" %% "zio-test"     % zioVersion % Test,
@@ -375,7 +370,7 @@ lazy val zioConfigScalaz    = crossProject(JSPlatform, JVMPlatform, NativePlatfo
   .settings(stdSettings("zio-config-scalaz"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211, Scala212),
+    crossScalaVersions --= Seq("2.11", Scala212),
     libraryDependencies ++= Seq(
       "org.scalaz" %% "scalaz-core"  % "7.4.0-M12",
       "dev.zio"    %% "zio-test"     % zioVersion % Test,
@@ -393,7 +388,7 @@ lazy val zioConfigCats    = crossProject(JSPlatform, JVMPlatform, NativePlatform
   .settings(stdSettings("zio-config-cats"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "org.typelevel" %% "cats-core"    % "2.8.0",
       "dev.zio"       %% "zio-test"     % zioVersion % Test,
@@ -411,7 +406,7 @@ lazy val zioConfigEnumeratum    = crossProject(JSPlatform, JVMPlatform, NativePl
   .settings(stdSettings("zio-config-enumeratum"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     libraryDependencies ++= Seq(
       "com.beachape" %% "enumeratum"   % "1.7.0",
       "dev.zio"      %% "zio-test"     % zioVersion % Test,
@@ -428,7 +423,7 @@ lazy val zioConfigTypesafeMagnoliaTests    = crossProject(JVMPlatform)
   .settings(stdSettings("zio-config-typesafe-magnolia-tests"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala211),
+    crossScalaVersions --= Seq("2.11"),
     publish / skip := true,
     libraryDependencies ++= Seq(
       "com.typesafe" % "config"       % "1.4.2",

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -22,7 +22,6 @@ object BuildHelper {
 
     (prefix: String) => map.find(_._1.startsWith(prefix)).map(_._2).get
   }
-  val Scala211: String   = versions("2.11")
   val Scala212: String   = versions("2.12")
   val Scala213: String   = versions("2.13")
   val ScalaDotty: String = versions("3")