From c99b5a29942edb0b28192f24566c85fd5bd42805 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 22 Feb 2025 20:25:38 +0100 Subject: [PATCH] Scala 3.3.5 --- java/chatroom/build.sbt | 2 +- java/compile-di/build.sbt | 2 +- java/dagger2/build.sbt | 2 +- java/ebean/build.sbt | 2 +- java/fileupload/build.sbt | 2 +- java/forms/build.sbt | 2 +- java/grpc/build.sbt | 2 +- java/hello-world/build.sbt | 2 +- java/jpa/build.sbt | 2 +- java/pekko-cluster/build.sbt | 2 +- java/rest-api/build.sbt | 2 +- java/starter/build.sbt | 2 +- java/streaming/build.sbt | 2 +- java/websocket/build.sbt | 2 +- scala/anorm/build.sbt | 2 +- scala/chatroom/build.sbt | 2 +- scala/compile-di/build.sbt | 2 +- scala/fileupload/build.sbt | 2 +- scala/forms/build.sbt | 2 +- scala/grpc/build.sbt | 2 +- scala/hello-world/build.sbt | 2 +- scala/isolated-slick/build.sbt | 2 +- scala/log4j2/build.sbt | 2 +- scala/macwire-di/build.sbt | 2 +- scala/rest-api/build.sbt | 2 +- scala/secure-session/build.sbt | 2 +- scala/slick/build.sbt | 2 +- scala/starter/build.sbt | 2 +- scala/streaming/build.sbt | 2 +- scala/tls/build.sbt | 2 +- scala/websocket/build.sbt | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/java/chatroom/build.sbt b/java/chatroom/build.sbt index 9cd5e1493..a2ab2f7ae 100644 --- a/java/chatroom/build.sbt +++ b/java/chatroom/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-chatroom-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "org.webjars" %% "webjars-play" % "3.1.0-M1", diff --git a/java/compile-di/build.sbt b/java/compile-di/build.sbt index a472b84be..349b29d42 100644 --- a/java/compile-di/build.sbt +++ b/java/compile-di/build.sbt @@ -7,7 +7,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalaVersion := crossScalaVersions.value.head diff --git a/java/dagger2/build.sbt b/java/dagger2/build.sbt index 8bceb68ac..8c0534dda 100644 --- a/java/dagger2/build.sbt +++ b/java/dagger2/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-dagger2-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/java/ebean/build.sbt b/java/ebean/build.sbt index 5aead5cad..67d754936 100644 --- a/java/ebean/build.sbt +++ b/java/ebean/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := "play-java-ebean-example", version := "1.0.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/fileupload/build.sbt b/java/fileupload/build.sbt index df6b853f4..1eb7620bc 100644 --- a/java/fileupload/build.sbt +++ b/java/fileupload/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-fileupload-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies += guice, testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), diff --git a/java/forms/build.sbt b/java/forms/build.sbt index 35de15b68..60b672675 100644 --- a/java/forms/build.sbt +++ b/java/forms/build.sbt @@ -7,7 +7,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalaVersion := crossScalaVersions.value.head diff --git a/java/grpc/build.sbt b/java/grpc/build.sbt index 690afecd0..22900d4bb 100644 --- a/java/grpc/build.sbt +++ b/java/grpc/build.sbt @@ -53,7 +53,7 @@ lazy val `play-java-grpc-example` = (project in file(".")) ) scalaVersion := "2.13.16" -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked") javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation") // Needed for ssl-config to create self signed certificated under Java 17 diff --git a/java/hello-world/build.sbt b/java/hello-world/build.sbt index dea16ad79..02825f8f6 100644 --- a/java/hello-world/build.sbt +++ b/java/hello-world/build.sbt @@ -8,7 +8,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalaVersion := crossScalaVersions.value.head diff --git a/java/jpa/build.sbt b/java/jpa/build.sbt index 089c360cd..04b5ae0a2 100644 --- a/java/jpa/build.sbt +++ b/java/jpa/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-jpa-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/pekko-cluster/build.sbt b/java/pekko-cluster/build.sbt index 2596a58d8..6f0b0059a 100644 --- a/java/pekko-cluster/build.sbt +++ b/java/pekko-cluster/build.sbt @@ -10,7 +10,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalaVersion := crossScalaVersions.value.head diff --git a/java/rest-api/build.sbt b/java/rest-api/build.sbt index 304fa3e1c..d05328847 100644 --- a/java/rest-api/build.sbt +++ b/java/rest-api/build.sbt @@ -1,7 +1,7 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") lazy val scala213 = "2.13.16" -lazy val scala3 = "3.3.4" +lazy val scala3 = "3.3.5" lazy val root = (project in file(".")) .enablePlugins(PlayJava) diff --git a/java/starter/build.sbt b/java/starter/build.sbt index 9c16e9426..57c856d39 100644 --- a/java/starter/build.sbt +++ b/java/starter/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-starter-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/streaming/build.sbt b/java/streaming/build.sbt index 8b4794cf9..e194842c9 100644 --- a/java/streaming/build.sbt +++ b/java/streaming/build.sbt @@ -4,7 +4,7 @@ name := "play-java-streaming-example" version := "1.0-SNAPSHOT" -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalaVersion := crossScalaVersions.value.head lazy val root = (project in file(".")).enablePlugins(PlayJava) diff --git a/java/websocket/build.sbt b/java/websocket/build.sbt index f000aa797..7176f6a33 100644 --- a/java/websocket/build.sbt +++ b/java/websocket/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := "play-java-websocket-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt index 7872e5c7d..defec3ac7 100644 --- a/scala/anorm/build.sbt +++ b/scala/anorm/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := "play-scala-anorm-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index 5287e8c34..bf4f3a745 100644 --- a/scala/chatroom/build.sbt +++ b/scala/chatroom/build.sbt @@ -8,7 +8,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-chatroom-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt index ca82e1cf8..2b5734776 100644 --- a/scala/compile-di/build.sbt +++ b/scala/compile-di/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-compile-di-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1", scalacOptions ++= List( diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt index cded8c395..90c0a799a 100644 --- a/scala/fileupload/build.sbt +++ b/scala/fileupload/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-fileupload-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt index 7bcff5b8f..71dd2f54e 100644 --- a/scala/forms/build.sbt +++ b/scala/forms/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-forms-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt index 63e68d4ea..ae479894e 100644 --- a/scala/grpc/build.sbt +++ b/scala/grpc/build.sbt @@ -73,7 +73,7 @@ val TestDeps = Seq( ) scalaVersion := "2.13.16" -crossScalaVersions := Seq("2.13.16", "3.3.4") +crossScalaVersions := Seq("2.13.16", "3.3.5") scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked") // Needed for ssl-config to create self signed certificated under Java 17 Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED") diff --git a/scala/hello-world/build.sbt b/scala/hello-world/build.sbt index 3080415da..54d481a9f 100644 --- a/scala/hello-world/build.sbt +++ b/scala/hello-world/build.sbt @@ -7,7 +7,7 @@ lazy val root = (project in file(".")) name := """play-scala-hello-world-tutorial""", organization := "com.example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index f36110470..4668d2ca5 100644 --- a/scala/isolated-slick/build.sbt +++ b/scala/isolated-slick/build.sbt @@ -17,7 +17,7 @@ val FlywayVersion = "10.21.0" "com.google.inject" % "guice" % "7.0.0" ) -(ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.4") +(ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.5") (ThisBuild / scalaVersion) := crossScalaVersions.value.head (ThisBuild / scalacOptions) ++= Seq( "-encoding", "UTF-8", // yes, this is 2 args diff --git a/scala/log4j2/build.sbt b/scala/log4j2/build.sbt index 9c48d1a13..3d6751706 100644 --- a/scala/log4j2/build.sbt +++ b/scala/log4j2/build.sbt @@ -9,7 +9,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-log4j2-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index 02064f7d7..7da632aad 100644 --- a/scala/macwire-di/build.sbt +++ b/scala/macwire-di/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-macwire-di-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "com.softwaremill.macwire" %% "macros" % "2.6.6" % "provided", diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index 285585636..825ba9b06 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -4,7 +4,7 @@ import play.sbt.PlaySettings resolvers ++= Resolver.sonatypeOssRepos("snapshots") lazy val scala213 = "2.13.16" -lazy val scala3 = "3.3.4" +lazy val scala3 = "3.3.5" lazy val root = (project in file(".")) .enablePlugins(PlayService, PlayLayoutPlugin, Common) diff --git a/scala/secure-session/build.sbt b/scala/secure-session/build.sbt index 9469e2fda..170eb4c7a 100644 --- a/scala/secure-session/build.sbt +++ b/scala/secure-session/build.sbt @@ -8,7 +8,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-secure-session-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt index 4a062d8c1..18942eda5 100644 --- a/scala/slick/build.sbt +++ b/scala/slick/build.sbt @@ -1,5 +1,5 @@ lazy val scala213 = "2.13.16" -lazy val scala3 = "3.3.4" +lazy val scala3 = "3.3.5" lazy val root = (project in file(".")) .settings( diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt index 8ea12f272..80acb5014 100644 --- a/scala/starter/build.sbt +++ b/scala/starter/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-starter-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt index b09a01175..1aa343a92 100644 --- a/scala/streaming/build.sbt +++ b/scala/streaming/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := "play-scala-streaming-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt index 6c87eee1b..ea11a68d8 100644 --- a/scala/tls/build.sbt +++ b/scala/tls/build.sbt @@ -1,6 +1,6 @@ val commonSettings = Seq( resolvers ++= Resolver.sonatypeOssRepos("snapshots"), - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq( "-feature", diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt index 4dcfa9269..d73710716 100644 --- a/scala/websocket/build.sbt +++ b/scala/websocket/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := "play-scala-websocket-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.16", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "3.3.5"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice,