diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e25619743..1cf26fa1d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -74,7 +74,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/chatroom add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/chatroom --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -88,7 +88,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/compile-di add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/compile-di --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -102,7 +102,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/dagger2 add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/dagger2 --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -116,7 +116,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/ebean add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/ebean --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -130,7 +130,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/fileupload add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/fileupload --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -144,7 +144,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/forms add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/forms --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -172,7 +172,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/hello-world add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/hello-world --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -186,7 +186,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/jpa add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/jpa --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -200,7 +200,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/pekko-cluster add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/pekko-cluster --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -214,7 +214,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/rest-api add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/rest-api --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -228,7 +228,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/starter add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/starter --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -242,7 +242,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/streaming add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/streaming --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -256,7 +256,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: java/websocket add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=java/websocket --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -284,7 +284,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/chatroom add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/chatroom --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -298,7 +298,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/compile-di add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/compile-di --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -312,7 +312,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/fileupload add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/fileupload --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -326,7 +326,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/forms add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/forms --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -354,7 +354,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/hello-world add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/hello-world --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -382,7 +382,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/log4j2 add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/log4j2 --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -396,7 +396,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/macwire-di add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/macwire-di --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -410,7 +410,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/rest-api add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/rest-api --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -424,7 +424,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/secure-session add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/secure-session --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -452,7 +452,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/starter add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/starter --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -466,7 +466,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/streaming add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/streaming --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL @@ -494,7 +494,7 @@ jobs: scala: 2.13.x, 3.x gradle-build-root: scala/websocket add-dimensions: >- - { "server": [ "pekko", "netty"], "build_tool": ["sbt"] } + { "server": [ "pekko", "netty"], "build_tool": ["gradle"] } cmd: | ./test.sh --sample=scala/websocket --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL diff --git a/java/chatroom/build.sbt b/java/chatroom/build.sbt index e046c76e8..91b1ed7ee 100644 --- a/java/chatroom/build.sbt +++ b/java/chatroom/build.sbt @@ -25,3 +25,4 @@ lazy val root = (project in file(".")) "-Xlint:deprecation" ) ) + diff --git a/java/compile-di/build.sbt b/java/compile-di/build.sbt index c609a4208..ef7708040 100644 --- a/java/compile-di/build.sbt +++ b/java/compile-di/build.sbt @@ -15,3 +15,4 @@ ThisBuild / scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-featur ThisBuild / javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror") Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) + diff --git a/java/dagger2/build.sbt b/java/dagger2/build.sbt index 6c236a7f7..36d07d558 100644 --- a/java/dagger2/build.sbt +++ b/java/dagger2/build.sbt @@ -24,3 +24,4 @@ lazy val root = (project in file(".")) // Verbose tests (Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) ) + diff --git a/java/ebean/build.sbt b/java/ebean/build.sbt index 7605aeb60..e3d093163 100644 --- a/java/ebean/build.sbt +++ b/java/ebean/build.sbt @@ -19,3 +19,4 @@ lazy val root = (project in file(".")) (Test / testOptions) += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation", "-Werror") ) + diff --git a/java/fileupload/build.sbt b/java/fileupload/build.sbt index 59c2640da..2fdb9fbbf 100644 --- a/java/fileupload/build.sbt +++ b/java/fileupload/build.sbt @@ -12,3 +12,4 @@ lazy val root = (project in file(".")) testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation", "-Werror") ) + diff --git a/java/forms/build.sbt b/java/forms/build.sbt index 12f629bc2..bc035fe11 100644 --- a/java/forms/build.sbt +++ b/java/forms/build.sbt @@ -21,3 +21,4 @@ javacOptions ++= Seq( "-Xlint:deprecation", "-Werror" ) + diff --git a/java/grpc/build.sbt b/java/grpc/build.sbt index 160c8cfbc..22afab41e 100644 --- a/java/grpc/build.sbt +++ b/java/grpc/build.sbt @@ -81,3 +81,4 @@ val TestDeps = Seq( // open docs/target/paradox/site/main/index.html lazy val docs = (project in file("docs")) .enablePlugins(ParadoxPlugin) + diff --git a/java/hello-world/build.sbt b/java/hello-world/build.sbt index c9d6373f4..81cf0187c 100644 --- a/java/hello-world/build.sbt +++ b/java/hello-world/build.sbt @@ -13,3 +13,4 @@ crossScalaVersions := Seq("2.13.18", "3.8.3") scalaVersion := crossScalaVersions.value.head libraryDependencies += guice + diff --git a/java/jpa/build.sbt b/java/jpa/build.sbt index 5a3109587..e242abbb5 100644 --- a/java/jpa/build.sbt +++ b/java/jpa/build.sbt @@ -23,3 +23,4 @@ lazy val root = (project in file(".")) javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"), PlayKeys.externalizeResourcesExcludes += baseDirectory.value / "conf" / "META-INF" / "persistence.xml" ) + diff --git a/java/pekko-cluster/build.sbt b/java/pekko-cluster/build.sbt index 67a58b984..c214ba531 100644 --- a/java/pekko-cluster/build.sbt +++ b/java/pekko-cluster/build.sbt @@ -24,3 +24,4 @@ libraryDependencies += "org.apache.pekko" %% "pekko-cluster-typed" % pekkoVersio // Sending messages from a node to another in the Pekko Cluster requires serializing. This // example application uses the default Pekko Jackson serializer with the CBOR format. // See also `conf/serialization.conf` and `services.CborSerializable` for more info. + diff --git a/java/rest-api/build.sbt b/java/rest-api/build.sbt index d6a7fb890..69d622169 100644 --- a/java/rest-api/build.sbt +++ b/java/rest-api/build.sbt @@ -40,3 +40,4 @@ lazy val gatling = (project in file("gatling")) "io.gatling" % "gatling-test-framework" % gatlingVersion % Test ) ) + diff --git a/java/starter/build.sbt b/java/starter/build.sbt index 1199357b1..e6df09fbb 100644 --- a/java/starter/build.sbt +++ b/java/starter/build.sbt @@ -27,3 +27,4 @@ lazy val root = (project in file(".")) // Make verbose tests (Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) ) + diff --git a/java/streaming/build.sbt b/java/streaming/build.sbt index 3bb6af3f9..0ecbccc1a 100644 --- a/java/streaming/build.sbt +++ b/java/streaming/build.sbt @@ -24,3 +24,4 @@ TwirlKeys.templateImports ++= Seq( "play.mvc.Http.{ RequestHeader => JRequestHeader }", "views.html.helper.CSPNonce" ) + diff --git a/java/websocket/build.sbt b/java/websocket/build.sbt index 6a05acd64..7d7d6feaa 100644 --- a/java/websocket/build.sbt +++ b/java/websocket/build.sbt @@ -29,3 +29,4 @@ lazy val root = (project in file(".")) "-Werror" ) ) + diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt index 214c1dddb..fd7c810f4 100644 --- a/scala/anorm/build.sbt +++ b/scala/anorm/build.sbt @@ -26,3 +26,4 @@ lazy val root = (project in file(".")) 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 index 20749f9fb..9a7c76708 100644 --- a/scala/chatroom/build.sbt +++ b/scala/chatroom/build.sbt @@ -38,3 +38,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) + diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt index 060640e57..55b34229c 100644 --- a/scala/compile-di/build.sbt +++ b/scala/compile-di/build.sbt @@ -24,3 +24,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt index 7f5af7c69..9cd1adfea 100644 --- a/scala/fileupload/build.sbt +++ b/scala/fileupload/build.sbt @@ -25,3 +25,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt index 475b32179..e550fb711 100644 --- a/scala/forms/build.sbt +++ b/scala/forms/build.sbt @@ -24,3 +24,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt index d2364cf0a..caad25076 100644 --- a/scala/grpc/build.sbt +++ b/scala/grpc/build.sbt @@ -91,3 +91,4 @@ scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchec // open docs/target/paradox/site/main/index.html lazy val docs = (project in file("docs")) .enablePlugins(ParadoxPlugin) + diff --git a/scala/hello-world/build.sbt b/scala/hello-world/build.sbt index 45ec8ac98..ff885bf98 100644 --- a/scala/hello-world/build.sbt +++ b/scala/hello-world/build.sbt @@ -25,3 +25,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) + diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index 8e74486be..13febbe88 100644 --- a/scala/isolated-slick/build.sbt +++ b/scala/isolated-slick/build.sbt @@ -110,3 +110,4 @@ lazy val root = (project in file(".")) ) .aggregate(slick) .dependsOn(slick) + diff --git a/scala/log4j2/build.sbt b/scala/log4j2/build.sbt index 4611038ff..54ff2d7b2 100644 --- a/scala/log4j2/build.sbt +++ b/scala/log4j2/build.sbt @@ -30,3 +30,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index 7bfe601fa..e18c3019e 100644 --- a/scala/macwire-di/build.sbt +++ b/scala/macwire-di/build.sbt @@ -24,3 +24,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index 189c638ec..b7f1dd32e 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -55,3 +55,4 @@ lazy val docs = (project in file("docs")).enablePlugins(ParadoxPlugin). crossScalaVersions := Seq(scala213, scala3), paradoxProperties += ("download_url" -> "https://example.lightbend.com/v1/download/play-samples-play-scala-rest-api-example") ) + diff --git a/scala/secure-session/build.sbt b/scala/secure-session/build.sbt index 1c6009023..4e788bc19 100644 --- a/scala/secure-session/build.sbt +++ b/scala/secure-session/build.sbt @@ -31,3 +31,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) + diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt index df0ba3ceb..6030cf9ae 100644 --- a/scala/slick/build.sbt +++ b/scala/slick/build.sbt @@ -51,3 +51,4 @@ lazy val computerDatabaseSample = sampleProject("computer-database") lazy val basicSample = sampleProject("basic") lazy val personSample = sampleProject("person") + diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt index 3dfd225c1..61c30bf95 100644 --- a/scala/starter/build.sbt +++ b/scala/starter/build.sbt @@ -25,3 +25,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt index a47360189..4cd806494 100644 --- a/scala/streaming/build.sbt +++ b/scala/streaming/build.sbt @@ -29,3 +29,4 @@ lazy val root = (project in file(".")) TwirlKeys.templateImports ++= Seq( "views.html.helper.CSPNonce" ) + diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt index af9239538..742872780 100644 --- a/scala/tls/build.sbt +++ b/scala/tls/build.sbt @@ -49,3 +49,4 @@ lazy val root = (project in file(".")) .dependsOn(one, two) addCommandAlias("client", "runMain Main") + diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt index 57570da93..07b26315a 100644 --- a/scala/websocket/build.sbt +++ b/scala/websocket/build.sbt @@ -34,3 +34,4 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) +