Repository: 7mind/izumi
Pull request #979 (2020-04-02 23:07:20)

Stop publishing for 2.11


Patch:
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index bb732b59b..36623302b 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -56,23 +56,6 @@ jobs:
             - script: |
                 bash sbtgen.sc --js
                 bash .build.sh secrets site
-#        - job: publish
-#          displayName: 'Publish to Maven Central'
-#          dependsOn:
-#            - build_212
-#            - build_213
-#          steps:
-#            - script: |
-#                bash sbtgen.sc --js --native
-#                bash .build.sh scala-all secrets publishScala
-        - job: publish211
-          displayName: 'Publish to Maven Central (2.11)'
-          dependsOn:
-            - build_212
-          steps:
-            - script: |
-                bash sbtgen.sc --js --native
-                bash .build.sh 2.11 secrets publishScala
         - job: publish212
           displayName: 'Publish to Maven Central (2.12)'
           dependsOn:
diff --git a/build.sbt b/build.sbt
index ceba9ac8a..20febe691 100644
--- a/build.sbt
+++ b/build.sbt
@@ -93,8 +93,7 @@ lazy val `fundamentals-collections` = project.in(file("fundamentals/fundamentals
     scalaVersion := crossScalaVersions.value.head,
     crossScalaVersions := Seq(
       "2.12.11",
-      "2.13.1",
-      "2.11.12"
+      "2.13.1"
     )
   )
   .disablePlugins(AssemblyPlugin)
@@ -122,7 +121,6 @@ lazy val `fundamentals-platform` = project.in(file("fundamentals/fundamentals-pl
     unmanagedSourceDirectories in Compile := (unmanagedSourceDirectories in Compile).value.flatMap {
       dir =>
        Seq(dir, file(dir.getPath + (CrossVersion.partialVersion(scalaVersion.value) match {
-         case Some((2, 11)) => "_2.11"
          case Some((2, 12)) => "_2.12"
          case Some((2, 13)) => "_2.13"
          case _             => "_3.0"
@@ -201,8 +199,7 @@ lazy val `fundamentals-platform` = project.in(file("fundamentals/fundamentals-pl
     scalaVersion := crossScalaVersions.value.head,
     crossScalaVersions := Seq(
       "2.12.11",
-      "2.13.1",
-      "2.11.12"
+      "2.13.1"
     )
   )
   .disablePlugins(AssemblyPlugin)
@@ -296,8 +293,7 @@ lazy val `fundamentals-functional` = project.in(file("fundamentals/fundamentals-
     scalaVersion := crossScalaVersions.value.head,
     crossScalaVersions := Seq(
       "2.12.11",
-      "2.13.1",
-      "2.11.12"
+      "2.13.1"
     )
   )
   .disablePlugins(AssemblyPlugin)
@@ -322,7 +318,6 @@ lazy val `fundamentals-thirdparty-boopickle-shaded` = project.in(file("fundament
     unmanagedSourceDirectories in Compile := (unmanagedSourceDirectories in Compile).value.flatMap {
       dir =>
        Seq(dir, file(dir.getPath + (CrossVersion.partialVersion(scalaVersion.value) match {
-         case Some((2, 11)) => "_2.11"
          case Some((2, 12)) => "_2.12"
          case Some((2, 13)) => "_2.13"
          case _             => "_3.0"
@@ -402,8 +397,7 @@ lazy val `fundamentals-thirdparty-boopickle-shaded` = project.in(file("fundament
     scalaVersion := crossScalaVersions.value.head,
     crossScalaVersions := Seq(
       "2.12.11",
-      "2.13.1",
-      "2.11.12"
+      "2.13.1"
     )
   )
   .disablePlugins(AssemblyPlugin)
@@ -503,8 +497,7 @@ lazy val `fundamentals-reflection` = project.in(file("fundamentals/fundamentals-
     scalaVersion := crossScalaVersions.value.head,
     crossScalaVersions := Seq(
       "2.12.11",
-      "2.13.1",
-      "2.11.12"
+      "2.13.1"
     )
   )
   .disablePlugins(AssemblyPlugin)
diff --git a/project/Deps.sc b/project/Deps.sc
index 8aabff22a..af8e77598 100644
--- a/project/Deps.sc
+++ b/project/Deps.sc
@@ -130,7 +130,6 @@ object Izumi {
   import Deps._
 
   // DON'T REMOVE, these variables are read from CI build (build.sh)
-  final val scala211 = ScalaVersion("2.11.12")
   final val scala212 = ScalaVersion("2.12.11")
   final val scala213 = ScalaVersion("2.13.1")
 
@@ -146,15 +145,10 @@ object Izumi {
     // switch order to use 2.13 in IDEA
     val targetScala = Seq(scala212, scala213)
 //    val targetScala = Seq(scala213, scala212)
-    val targetScalaWith211 = Seq(scala212, scala213, scala211)
     private val jvmPlatform = PlatformEnv(
       platform = Platform.Jvm,
       language = targetScala,
     )
-    private val jvmPlatformWith211 = PlatformEnv(
-      platform = Platform.Jvm,
-      language = targetScalaWith211,
-    )
     private val jsPlatform = PlatformEnv(
       platform = Platform.Js,
       language = targetScala,
@@ -163,23 +157,6 @@ object Izumi {
         "scalaJSLinkerConfig" in (SettingScope.Project, Platform.Js) := "{ scalaJSLinkerConfig.value.withModuleKind(ModuleKind.CommonJSModule) }".raw,
       ),
     )
-    private val jsPlatformWith211 = PlatformEnv(
-      platform = Platform.Js,
-      language = targetScalaWith211,
-      settings = Seq(
-        "coverageEnabled" := false,
-        "scalaJSLinkerConfig" in (SettingScope.Project, Platform.Js) := "{ scalaJSLinkerConfig.value.withModuleKind(ModuleKind.CommonJSModule) }".raw,
-      ),
-    )
-    private val nativePlatform = PlatformEnv(
-      platform = Platform.Native,
-      language = Seq(scala211),
-      settings = Seq(
-        "coverageEnabled" := false,
-        "test" in Platform.Native := "{}".raw,
-        "test" in(SettingScope.Test, Platform.Native) := "{}".raw,
-      ),
-    )
     private val jvmPlatformSbt = PlatformEnv(
       platform = Platform.Jvm,
       language = Seq(scala212),
@@ -188,7 +165,6 @@ object Izumi {
       ),
     )
     final val cross = Seq(jvmPlatform, jsPlatform)
-    final val crossNativeWith211 = Seq(jvmPlatformWith211, jsPlatformWith211, nativePlatform)
     final val jvm = Seq(jvmPlatform)
     final val js = Seq(jsPlatform)
     final val jvmSbt = Seq(jvmPlatformSbt)
@@ -342,7 +318,6 @@ object Izumi {
       """(unmanagedSourceDirectories in Compile).value.flatMap {
         |  dir =>
         |   Seq(dir, file(dir.getPath + (CrossVersion.partialVersion(scalaVersion.value) match {
-        |     case Some((2, 11)) => "_2.11"
         |     case Some((2, 12)) => "_2.12"
         |     case Some((2, 13)) => "_2.13"
         |     case _             => "_3.0"
@@ -416,7 +391,7 @@ object Izumi {
     ),
     pathPrefix = Projects.fundamentals.basePath,
     groups = Groups.fundamentals,
-    defaultPlatforms = Targets.crossNativeWith211,
+    defaultPlatforms = Targets.cross,
     enableProjectSharedAggSettings = false,
     settings = Seq(
       "crossScalaVersions" := "Nil".raw,


Test patch:
diff --git a/distage/distage-testkit-scalatest/src/main/scala/org/scalatest/distage/DistageScalatestTestSuiteRunner.scala b/distage/distage-testkit-scalatest/src/main/scala/org/scalatest/distage/DistageScalatestTestSuiteRunner.scala
index 50eb81c6b..459e20160 100644
--- a/distage/distage-testkit-scalatest/src/main/scala/org/scalatest/distage/DistageScalatestTestSuiteRunner.scala
+++ b/distage/distage-testkit-scalatest/src/main/scala/org/scalatest/distage/DistageScalatestTestSuiteRunner.scala
@@ -81,7 +81,7 @@ abstract class DistageScalatestTestSuiteRunner[F[_]](implicit override val tagMo
   override def run(testName: Option[String], args: Args): Status = {
     DistageTestsRegistrySingleton.registerSuiteReporter(suiteId)(SuiteReporter(args.tracker, args.reporter))
     // If, we're running under sbt, scan the classpath manually to add all tests
-    // in neighboring packages before starting anything, because sbt runner
+    // in the classloader before starting anything, because sbt runner
     // instantiates & runs tests at the same time, so when `run` is called
     // NOT all tests have been registered, so we must force all tests, otherwise
     // we can't be sure.