Merge pull request #176 from mkurz/drop_scala212

Drop Scala 2.12 + add Scala 3 (but not use it)

src/main/scala/interplay/PlayBuildBase.scala

@@ -19,7 +19,6 @@ object PlayBuildBase extends AutoPlugin {
     val playBuildExtraTests = taskKey[Unit]("Run extra tests during the release")
     val playBuildExtraPublish = taskKey[Unit]("Publish extract non aggregated projects during the release")
     val playBuildRepoName = settingKey[String]("The name of the repository in the playframework GitHub organization")
-    val playCrossBuildRootProject = settingKey[Boolean]("Whether the root project should be cross built or not")
 
     // This is not using sbt-git because we need a more stable way to set
     // the current branch in a more stable way, for example, we may want to

src/main/scala/interplay/PlayLibraryBase.scala

@@ -24,8 +24,7 @@ import interplay.Omnidoc.autoImport.omnidocTagPrefix
     omnidocTagPrefix := "",
     compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8"),
     doc / javacOptions := Seq("-source", "1.8"),
-    crossScalaVersions := Seq(scalaVersion.value, ScalaVersions.scala212),
+    crossScalaVersions := Seq(scalaVersion.value), // TODO: Add ScalaVersions.scala3
     scalaVersion := sys.props.get("scala.version").getOrElse(ScalaVersions.scala213),
-    ThisBuild / playCrossBuildRootProject := true
   )
 }

src/main/scala/interplay/PlayRootProjectBase.scala

@@ -1,9 +1,6 @@
 package interplay
 
 import sbt._
-import sbt.Keys._
-
-import interplay.PlayBuildBase.autoImport._
 
 /**
  * Base Plugin for a root project that doesn't get published.
@@ -13,13 +10,5 @@ import interplay.PlayBuildBase.autoImport._
 object PlayRootProjectBase extends AutoPlugin {
   override def trigger = noTrigger
   override def requires = PlayBuildBase && PlaySonatypeBase && PlayReleaseBase
-  override def projectSettings = PlayNoPublishBase.projectSettings ++ Seq(
-    crossScalaVersions := {
-      if ((ThisBuild / playCrossBuildRootProject).?.value.exists(identity)) {
-        Seq(ScalaVersions.scala212, ScalaVersions.scala213)
-      } else {
-        Seq(ScalaVersions.scala212)
-      }
-    }
-  )
+  override def projectSettings = PlayNoPublishBase.projectSettings
 }

src/main/scala/interplay/Versions.scala

@@ -3,6 +3,7 @@ package interplay
 object ScalaVersions {
   val scala212 = "2.12.14"
   val scala213 = "2.13.6"
+  val scala3   = "3.0.1"
 }
 
 object SbtVersions {

src/sbt-test/interplay/library-with-plugin/build.sbt

@@ -1,3 +1,5 @@
+import interplay.ScalaVersions._
+
 lazy val common: Seq[Setting[_]] = Seq(
   PgpKeys.publishSigned := {
     IO.write(crossTarget.value / "publish-version", s"${publishTo.value.get.name}:${version.value}")
@@ -10,7 +12,7 @@ lazy val common: Seq[Setting[_]] = Seq(
 lazy val `mock-root` = (project in file("."))
   .settings(
     common,
-    ThisBuild / playCrossBuildRootProject := true // activates cross build for Scala 2.12 and 2.13
+    crossScalaVersions := Seq(scala212, scala213)
   )
   .enablePlugins(PlayRootProject)
   .aggregate(`mock-library`, `mock-sbt-plugin`) // has a sbt plugin that will be built together with root project

src/sbt-test/interplay/library-with-plugin/test

@@ -23,10 +23,12 @@ $ exec git branch -u origin/main
 $ exists mock-sbt-plugin/target/scripted-ran
 
 # Make sure publishSigned ran on every project with the right publish settings
-> contains target/scala-2.12/publish-version no-publish:1.2.3
+#TODO:
+#> contains target/scala-3/publish-version no-publish:1.2.3
 > contains target/scala-2.13/publish-version no-publish:1.2.3
 > contains mock-sbt-plugin/target/scala-2.12/sbt-1.0/publish-version sonatype-local-bundle:1.2.3
-> contains mock-library/target/scala-2.12/publish-version sonatype-local-bundle:1.2.3
+#TODO:
+#> contains mock-library/target/scala-3/publish-version sonatype-local-bundle:1.2.3
 > contains mock-library/target/scala-2.13/publish-version sonatype-local-bundle:1.2.3
 > contains mock-sbt-library/target/scala-2.12/publish-version sonatype-local-bundle:1.2.3
 

src/sbt-test/interplay/library-with-root/build.sbt

@@ -1,8 +1,13 @@
+import interplay.ScalaVersions._
+
 // What an actual project would look like
 lazy val `mock-root` = (project in file("."))
   .enablePlugins(PlayRootProject)
   .aggregate(`mock-library`)
-  .settings(common)
+  .settings(
+    common,
+    crossScalaVersions := Seq(scala212, scala213)
+  )
 
 lazy val `mock-library` = (project in file("mock-library"))
   .enablePlugins(PlayLibrary)

src/sbt-test/interplay/library-with-root/test

@@ -20,9 +20,11 @@ $ exec git branch -u origin/main
 > release with-defaults
 
 # Make sure publishSigned ran on every project with the right publish settings
-> contains target/scala-2.12/publish-version no-publish:1.2.3
+#TODO:
+#> contains target/scala-3/publish-version no-publish:1.2.3
 > contains target/scala-2.13/publish-version no-publish:1.2.3
-> contains mock-library/target/scala-2.12/publish-version sonatype-local-bundle:1.2.3
+#TODO:
+#> contains mock-library/target/scala-3/publish-version sonatype-local-bundle:1.2.3
 > contains mock-library/target/scala-2.13/publish-version sonatype-local-bundle:1.2.3
 
 # Make sure sonatypeRelease ran only in the root project

src/sbt-test/interplay/library/test

@@ -23,7 +23,8 @@ $ exec git diff
 > release with-defaults
 
 # Make sure publishSigned ran
-> contains target/scala-2.12/publish-version sonatype-local-bundle:1.2.3
+#TODO:
+#> contains target/scala-3/publish-version sonatype-local-bundle:1.2.3
 > contains target/scala-2.13/publish-version sonatype-local-bundle:1.2.3
 
 # Make sure sonatypeRelease ran

src/sbt-test/interplay/plugin-with-root/build.sbt

@@ -1,8 +1,13 @@
+import interplay.ScalaVersions._
+
 // What an actual project would look like
 lazy val `mock-root` = (project in file("."))
   .enablePlugins(PlayRootProject)
   .aggregate(`mock-sbt-plugin`)
-  .settings(common)
+  .settings(
+    common,
+    crossScalaVersions := Seq(scala212, scala213)
+  )
 
 lazy val `mock-sbt-plugin` = (project in file("mock-sbt-plugin"))
   .enablePlugins(PlaySbtPlugin)

src/sbt-test/interplay/plugin-with-root/test

@@ -17,14 +17,14 @@ $ exec git branch -u origin/main
 # However, that initial state does not contain the above created .git folder (created via git init) yet.
 > reload
 
-> release cross with-defaults
+> release with-defaults
 
 # Make sure scripted tests ran
 $ exists mock-sbt-plugin/target/scripted-ran
 
 # Make sure publishSigned ran on every project with the right publish settings
-$ exists target/scala-2.12/publish-version
-> contains target/scala-2.12/publish-version no-publish:1.2.3
+$ exists target/scala-2.13/publish-version
+> contains target/scala-2.13/publish-version no-publish:1.2.3
 > contains mock-sbt-plugin/target/scala-2.12/sbt-1.0/publish-version sonatype-local-bundle:1.2.3
 
 # Make sure bintrayRelease ran only in the root project