"-Xsource:3" (TODO: only apply for scala 2)

mkurz · mkurz · commit 9de4b15c7c2a · 2026-04-09T09:49:49.000+02:00
diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -16,6 +23,6 @@ lazy val root = (project in file("."))
       "org.playframework.anorm" %% "anorm" % "2.9.0-M1",
       "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2" % Test,
     ),
-    scalacOptions ++= List("-feature", "-Werror"),
+    scalacOptions ++= List("-feature", "-Werror") ++ scala2OnlyScalacOptions("-Xsource:3").value,
     javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"),
   )
diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt
@@ -2,6 +2,13 @@ import play.core.PlayVersion.pekkoVersion
 
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -29,5 +36,5 @@ lazy val root = (project in file("."))
       "-feature",
       //"-deprecation", // gets set by Play automatically
       "-Werror"
-    )
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value
   )
diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -15,5 +22,5 @@ lazy val root = (project in file("."))
       //"-unchecked",
       "-feature",
       "-Werror"
-    ),
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
   )
diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -16,5 +23,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    ),
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
   )
diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -15,5 +22,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    ),
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
   )
diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt
@@ -6,6 +6,13 @@ import play.scala.grpc.sample.BuildInfo
 
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 name := "play-scala-grpc-example"
 version := "1.0-SNAPSHOT"
 
@@ -74,7 +81,7 @@ val TestDeps = Seq(
 
 scalaVersion := "2.13.18"
 crossScalaVersions := Seq("2.13.18", "3.8.3")
-scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
+scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked") ++ scala2OnlyScalacOptions("-Xsource:3").value
 
 // Make verbose tests
 (Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v"))
diff --git a/scala/hello-world/build.sbt b/scala/hello-world/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -16,5 +23,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    )
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value
   )
diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt
@@ -8,6 +8,13 @@ lazy val databaseUrl = sys.env.getOrElse("DB_DEFAULT_URL", "jdbc:h2:./test")
 lazy val databaseUser = sys.env.getOrElse("DB_DEFAULT_USER", "sa")
 lazy val databasePassword = sys.env.getOrElse("DB_DEFAULT_PASSWORD", "")
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 val FlywayVersion = "11.10.1"
 
 (ThisBuild / version) := "1.1-SNAPSHOT"
@@ -26,7 +33,7 @@ val FlywayVersion = "11.10.1"
   "-unchecked",
   "-Xlint",
   "-Ywarn-numeric-widen"
-)
+) ++ scala2OnlyScalacOptions("-Xsource:3").value
 (ThisBuild / javacOptions) ++= Seq("--release", "17")
 
 lazy val flyway = (project in file("modules/flyway"))
diff --git a/scala/log4j2/build.sbt b/scala/log4j2/build.sbt
@@ -2,6 +2,13 @@ resolvers += Resolver.sonatypeCentralSnapshots
 
 val log4jVersion = "2.25.0"
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -21,5 +28,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    ),
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
   )
diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -15,5 +22,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    ),
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
   )
diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt
@@ -6,6 +6,13 @@ resolvers += Resolver.sonatypeCentralSnapshots
 lazy val scala213 = "2.13.18"
 lazy val scala3 = "3.8.3"
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayService, PlayLayoutPlugin, Common)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -24,7 +31,7 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    )
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value
   )
 
 lazy val gatlingVersion = "3.9.5"
diff --git a/scala/secure-session/build.sbt b/scala/secure-session/build.sbt
@@ -2,6 +2,13 @@ import play.core.PlayVersion.pekkoVersion
 
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -22,5 +29,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    )
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value
   )
diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt
@@ -1,6 +1,13 @@
 lazy val scala213 = "2.13.18"
 lazy val scala3 = "3.8.3"
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .settings(
     name := "play-scala-slick-examples",
@@ -25,7 +32,7 @@ def sampleProject(name: String) =
       scalacOptions ++= Seq(
         "-feature",
         "-Werror"
-      ),
+      ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
       libraryDependencies ++= Seq(
         guice,
         "org.playframework" %% "play-slick" % "7.0.0-M1",
diff --git a/scala/slick/samples/basic/app/models/Models.scala b/scala/slick/samples/basic/app/models/Models.scala
@@ -3,11 +3,15 @@ package models
 case class Cat(name: String, color: String)
 object Cat {
   def unapply(cat: Cat): Option[(String, String)] = Some((cat.name, cat.color))
-  def tupled = (this.apply).tupled
+  def tupled: ((String, String)) => Cat = {
+    case (name, color) => Cat(name, color)
+  }
 }
 
 case class Dog(name: String, color: String)
 object Dog {
   def unapply(dog: Dog): Option[(String, String)] = Some((dog.name, dog.color))
-  def tupled = (this.apply).tupled
+  def tupled: ((String, String)) => Dog = {
+    case (name, color) => Dog(name, color)
+  }
 }
diff --git a/scala/slick/samples/computer-database/app/models/Models.scala b/scala/slick/samples/computer-database/app/models/Models.scala
@@ -10,11 +10,15 @@ case class Page[A](items: Seq[A], page: Int, offset: Long, total: Long) {
 case class Company(id: Option[Long], name: String)
 object Company {
   def unapply(c: Company): Option[(Option[Long], String)] = Some((c.id, c.name))
-  def tupled = (this.apply).tupled
+  def tupled: ((Option[Long], String)) => Company = {
+    case (id, name) => Company(id, name)
+  }
 }
 
 case class Computer(id: Option[Long] = None, name: String, introduced: Option[Date] = None, discontinued: Option[Date] = None, companyId: Option[Long] = None)
 object Computer {
   def unapply(c: Computer): Option[(Option[Long], String, Option[Date], Option[Date], Option[Long])] = Some((c.id, c.name, c.introduced, c.discontinued, c.companyId))
-  def tupled = (this.apply).tupled
+  def tupled: ((Option[Long], String, Option[Date], Option[Date], Option[Long])) => Computer = {
+    case (id, name, introduced, discontinued, companyId) => Computer(id, name, introduced, discontinued, companyId)
+  }
 }
diff --git a/scala/slick/samples/person/app/controllers/PersonController.scala b/scala/slick/samples/person/app/controllers/PersonController.scala
@@ -78,5 +78,7 @@ class PersonController @Inject()(repo: PersonRepository,
 case class CreatePersonForm(name: String, age: Int)
 object CreatePersonForm {
   def unapply(cpf: CreatePersonForm): Option[(String, Int)] = Some((cpf.name, cpf.age))
-  def tupled = (this.apply).tupled
+  def tupled: ((String, Int)) => CreatePersonForm = {
+    case (name, age) => CreatePersonForm(name, age)
+  }
 }
diff --git a/scala/slick/samples/person/app/models/PersonRepository.scala b/scala/slick/samples/person/app/models/PersonRepository.scala
@@ -43,7 +43,9 @@ class PersonRepository @Inject() (dbConfigProvider: DatabaseConfigProvider)(impl
      * In this case, we are simply passing the id, name and page parameters to the Person case classes
      * apply and unapply methods.
      */
-    def * = (id, name, age) <> ((Person.apply).tupled, Person.unapply)
+    def * = (id, name, age) <> ({
+      case (id, name, age) => Person(id, name, age)
+    }, Person.unapply)
   }
 
   /**
diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -16,5 +23,5 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    ),
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value,
   )
diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt
@@ -1,5 +1,12 @@
 resolvers += Resolver.sonatypeCentralSnapshots
 
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
@@ -16,7 +23,7 @@ lazy val root = (project in file("."))
     scalacOptions ++= Seq(
       "-feature",
       "-Werror"
-    )
+    ) ++ scala2OnlyScalacOptions("-Xsource:3").value
   )
 
 TwirlKeys.templateImports ++= Seq(
diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt
@@ -1,11 +1,18 @@
+def scala2OnlyScalacOptions(options: String*) = Def.setting {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, _)) => options
+    case _            => Seq.empty
+  }
+}
+
 val commonSettings = Seq(
   resolvers += Resolver.sonatypeCentralSnapshots,
   crossScalaVersions := Seq("2.13.18", "3.8.3"),
   scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq(
     "-feature",
     "-Werror"
-  )
+  ) ++ scala2OnlyScalacOptions("-Xsource:3").value
 )
 
 lazy val one = (project in file("modules/one"))
diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt
