initial changes to drop Scala 2.12 support (#770)

* initial changes to drop Scala 2.12 support

* remove imm code

* Create remove-scala2.12-compat.excludes

Author: pjfanning

.github/workflows/nightly.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        SCALA_VERSION: [2.12, 2.13, 3]
+        SCALA_VERSION: [2.13, 3]
         JDK: [17, 21]
         PEKKO_VERSION: ['default']
     steps:

.github/workflows/validate-and-test.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        SCALA_VERSION: [2.12, 2.13, 3.3]
+        SCALA_VERSION: [2.13, 3.3]
         JDK: [17]
     steps:
       - name: Checkout

LICENSE

@@ -210,15 +210,6 @@ Copyright 2014 Twitter, Inc.
 
 ---------------
 
-pekko-http-core contains code from scala-collection-compat in the `org.apache.pekko.http.ccompat` package
-distributed under the Apache 2.0 license.
-- http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
-- http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/CompatImpl.scala
-
-Copyright EPFL and Lightbend, Inc.
-
----------------
-
 pekko-http-core contains code from https://bjoern.hoehrmann.de/utf-8/decoder/dfa/
 in `org.apache.pekko.http.impl.engine.ws.Utf8Decoder.scala` that was distributed under a MIT license.
 

NOTICE

@@ -12,25 +12,6 @@ Apache License, Version 2.0 License.
 
 ---------------
 
-pekko-http-core contains code from scala-collection-compat distributed under the Apache 2.0 license.
-
-scala-collection-compat
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
-
-Licensed under the Apache License, Version 2.0 (the "License").
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
----------------
-
 pekko-http-core and pekko-http-tests contain code based on akka-sse <https://github.com/hseeberger/akka-sse>
 distributed under the Apache 2.0 license.
 

build.sbt

@@ -88,40 +88,17 @@ lazy val root = Project(
     Compile / headerCreate / unmanagedSources := (baseDirectory.value / "project").**("*.scala").get)
   .aggregate(aggregatedProjects: _*)
 
-/**
- * Adds a `src/.../scala-2.13+` source directory for Scala 2.13 and newer
- * and a `src/.../scala-2.13-` source directory for Scala version older than 2.13
- */
-def add213CrossDirs(config: Configuration): Seq[Setting[_]] = Seq(
-  config / unmanagedSourceDirectories += {
-    val sourceDir = (config / sourceDirectory).value
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((e, n)) if e > 2 || (e == 2 && n >= 13) => sourceDir / "scala-2.13+"
-      case _                                            => sourceDir / "scala-2.13-"
-    }
-  })
-
-val commonSettings =
-  add213CrossDirs(Compile) ++
-  add213CrossDirs(Test)
-
 val scalaMacroSupport = Seq(
   scalacOptions ++= {
     CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, n)) if n >= 13 =>
+      case Some((2, n)) =>
         Seq("-Ymacro-annotations")
       case _ =>
         Seq.empty
     }
-  },
-  libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, n)) if n < 13 =>
-      Seq(compilerPlugin(("org.scalamacros" % "paradise" % "2.1.1").cross(CrossVersion.full)))
-    case _ => Seq.empty
-  }))
+  })
 
 lazy val parsing = project("parsing")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.parsing"))
   .addPekkoModuleDependency("pekko-actor", "provided", PekkoCoreDependency.default)
   .settings(Dependencies.parsing)
@@ -132,7 +109,6 @@ lazy val parsing = project("parsing")
   .disablePlugins(MimaPlugin)
 
 lazy val httpCore = project("http-core")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.core"))
   .settings(AddMetaInfLicenseFiles.httpCoreSettings)
   .dependsOn(parsing /*, httpScalafixRules % ScalafixConfig*/ )
@@ -152,7 +128,6 @@ lazy val httpCore = project("http-core")
   .disablePlugins(ScalafixPlugin)
 
 lazy val http = project("http")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http"))
   .dependsOn(httpCore)
   .addPekkoModuleDependency("pekko-stream", "provided", PekkoCoreDependency.default)
@@ -167,7 +142,6 @@ lazy val http = project("http")
   .enablePlugins(ReproducibleBuildsPlugin)
 
 lazy val http2Tests = project("http2-tests")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.http2"))
   .dependsOn(httpCore, httpTestkit % "test", httpCore % "test->test")
   .addPekkoModuleDependency("pekko-stream", "provided", PekkoCoreDependency.default)
@@ -209,7 +183,6 @@ lazy val http2Tests = project("http2-tests")
   .disablePlugins(MimaPlugin) // experimental module still
 
 lazy val httpTestkit = project("http-testkit")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.testkit"))
   .dependsOn(http)
   .addPekkoModuleDependency("pekko-stream-testkit", "provided", PekkoCoreDependency.default)
@@ -225,7 +198,6 @@ lazy val httpTestkit = project("http-testkit")
   .disablePlugins(MimaPlugin) // testkit, no bin compat guaranteed
 
 lazy val httpTestkitMunit = project("http-testkit-munit")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.testkit.munit"))
   .dependsOn(http, httpTestkit)
   .addPekkoModuleDependency("pekko-stream-testkit", "provided", PekkoCoreDependency.default)
@@ -234,7 +206,6 @@ lazy val httpTestkitMunit = project("http-testkit-munit")
   .disablePlugins(MimaPlugin) // testkit, no bin compat guaranteed
 
 lazy val httpTests = project("http-tests")
-  .settings(commonSettings)
   .settings(Dependencies.httpTests)
   .dependsOn(httpSprayJson, httpXml, httpJackson,
     httpTestkit % "test", httpCore % "test->test",
@@ -261,15 +232,13 @@ lazy val httpTests = project("http-tests")
     })
 
 lazy val httpJmhBench = project("http-bench-jmh")
-  .settings(commonSettings)
   .dependsOn(http, httpCors, http2Tests % "compile->compile,test")
   .addPekkoModuleDependency("pekko-stream", "", PekkoCoreDependency.default)
   .enablePlugins(JmhPlugin)
   .enablePlugins(NoPublish) // don't release benchs
   .disablePlugins(MimaPlugin)
 
 lazy val httpMarshallersScala = project("http-marshallers-scala")
-  .settings(commonSettings)
   .enablePlugins(NoPublish /*, AggregatePRValidation*/ )
   .disablePlugins(MimaPlugin)
   .aggregate(httpSprayJson, httpXml)
@@ -287,7 +256,6 @@ lazy val httpSprayJson =
     .settings(Dependencies.httpSprayJson)
 
 lazy val httpMarshallersJava = project("http-marshallers-java")
-  .settings(commonSettings)
   .enablePlugins(NoPublish /*, AggregatePRValidation*/ )
   .disablePlugins(MimaPlugin)
   .aggregate(httpJackson)
@@ -304,7 +272,6 @@ lazy val httpJackson =
 lazy val httpCaching = project("http-caching")
   .settings(
     name := "pekko-http-caching")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.caching"))
   .addPekkoModuleDependency("pekko-stream", "provided", PekkoCoreDependency.default)
   .addPekkoModuleDependency("pekko-stream-testkit", "provided", PekkoCoreDependency.default)
@@ -315,7 +282,6 @@ lazy val httpCaching = project("http-caching")
 lazy val httpCors = project("http-cors")
   .settings(
     name := "pekko-http-cors")
-  .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.cors"))
   .settings(AddMetaInfLicenseFiles.httpCorsSettings)
   .addPekkoModuleDependency("pekko-stream", "provided", PekkoCoreDependency.default)
@@ -335,7 +301,6 @@ def httpMarshallersScalaSubproject(moduleName: String) =
     .dependsOn(http)
     .settings(
       name := s"pekko-http-$moduleName")
-    .settings(commonSettings)
     .enablePlugins(BootstrapGenjavadoc)
     .enablePlugins(ReproducibleBuildsPlugin)
 
@@ -346,7 +311,6 @@ def httpMarshallersJavaSubproject(moduleName: String) =
     .settings(
       name := s"pekko-http-$moduleName")
     .dependsOn(http)
-    .settings(commonSettings)
     .enablePlugins(BootstrapGenjavadoc)
     .enablePlugins(ReproducibleBuildsPlugin)
 

http-core/src/main/mima-filters/2.0.x.backwards.excludes/remove-scala2.12-compat.excludes

@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Remove Scala 2.12 compatibility support
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.http.ccompat.imm.package")
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.http.ccompat.imm.package$")