From 690f6b774a22f9a5360c40335770df7c6c3c49dd Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 26 Jan 2025 17:43:50 +0100 Subject: [PATCH 01/12] Update some package-lock.json --- java/jpa/package-lock.json | 1 + java/websocket/package-lock.json | 35 ++++++++++++++++++++++++------- scala/websocket/package-lock.json | 35 ++++++++++++++++++++++++------- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/java/jpa/package-lock.json b/java/jpa/package-lock.json index 8a3f3c51e..5d880c468 100644 --- a/java/jpa/package-lock.json +++ b/java/jpa/package-lock.json @@ -14,6 +14,7 @@ "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz", "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==", "dev": true, + "license": "MIT", "bin": { "cake": "bin/cake", "coffee": "bin/coffee" diff --git a/java/websocket/package-lock.json b/java/websocket/package-lock.json index 21ee7e154..52acfc275 100644 --- a/java/websocket/package-lock.json +++ b/java/websocket/package-lock.json @@ -15,6 +15,7 @@ "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz", "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==", "dev": true, + "license": "MIT", "bin": { "cake": "bin/cake", "coffee": "bin/coffee" @@ -28,6 +29,7 @@ "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", "dev": true, + "license": "MIT", "dependencies": { "is-what": "^3.14.1" }, @@ -40,6 +42,7 @@ "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "prr": "~1.0.1" @@ -53,6 +56,7 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true, + "license": "ISC", "optional": true }, "node_modules/iconv-lite": { @@ -60,6 +64,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -73,6 +78,7 @@ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", "dev": true, + "license": "MIT", "optional": true, "bin": { "image-size": "bin/image-size.js" @@ -85,13 +91,15 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/less": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz", - "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz", + "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -118,6 +126,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "pify": "^4.0.1", @@ -132,6 +141,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "optional": true, "bin": { "mime": "cli.js" @@ -145,6 +155,7 @@ "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz", "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.3", @@ -162,6 +173,7 @@ "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -171,6 +183,7 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=6" @@ -181,6 +194,7 @@ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/safer-buffer": { @@ -188,6 +202,7 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/sax": { @@ -195,6 +210,7 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", "dev": true, + "license": "ISC", "optional": true }, "node_modules/semver": { @@ -202,6 +218,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "optional": true, "bin": { "semver": "bin/semver" @@ -212,16 +229,18 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", - "dev": true + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD" } } } diff --git a/scala/websocket/package-lock.json b/scala/websocket/package-lock.json index 6cc5051f7..aaf7cf2d2 100644 --- a/scala/websocket/package-lock.json +++ b/scala/websocket/package-lock.json @@ -15,6 +15,7 @@ "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz", "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==", "dev": true, + "license": "MIT", "bin": { "cake": "bin/cake", "coffee": "bin/coffee" @@ -28,6 +29,7 @@ "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", "dev": true, + "license": "MIT", "dependencies": { "is-what": "^3.14.1" }, @@ -40,6 +42,7 @@ "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "prr": "~1.0.1" @@ -53,6 +56,7 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true, + "license": "ISC", "optional": true }, "node_modules/iconv-lite": { @@ -60,6 +64,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -73,6 +78,7 @@ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", "dev": true, + "license": "MIT", "optional": true, "bin": { "image-size": "bin/image-size.js" @@ -85,13 +91,15 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/less": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz", - "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz", + "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -118,6 +126,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "pify": "^4.0.1", @@ -132,6 +141,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "optional": true, "bin": { "mime": "cli.js" @@ -145,6 +155,7 @@ "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz", "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.3", @@ -162,6 +173,7 @@ "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -171,6 +183,7 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=6" @@ -181,6 +194,7 @@ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/safer-buffer": { @@ -188,6 +202,7 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/sax": { @@ -195,6 +210,7 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", "dev": true, + "license": "ISC", "optional": true }, "node_modules/semver": { @@ -202,6 +218,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "optional": true, "bin": { "semver": "bin/semver" @@ -212,16 +229,18 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "optional": true, "engines": { "node": ">=0.10.0" } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", - "dev": true + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD" } } } From 5cd81bc876a891166831d82467a3041829178bbd Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 25 Jan 2025 00:54:23 +0100 Subject: [PATCH 02/12] Scala 2.13.16 --- 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 | 4 ++-- java/grpc/docs/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 | 4 ++-- scala/grpc/docs/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 +- 33 files changed, 35 insertions(+), 35 deletions(-) diff --git a/java/chatroom/build.sbt b/java/chatroom/build.sbt index 3abf2e373..b98c9786f 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "org.webjars" %% "webjars-play" % "3.0.1", diff --git a/java/compile-di/build.sbt b/java/compile-di/build.sbt index 92736162c..cdd7c6235 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.14", "3.3.3") +crossScalaVersions := Seq("2.13.16", "3.3.3") scalaVersion := crossScalaVersions.value.head diff --git a/java/dagger2/build.sbt b/java/dagger2/build.sbt index f8e6e454c..592804803 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/java/ebean/build.sbt b/java/ebean/build.sbt index c05ce0133..a4b89d1b9 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/fileupload/build.sbt b/java/fileupload/build.sbt index 0515a225e..6aab202eb 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), 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 e58136f5a..15422b974 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.14", "3.3.3") +crossScalaVersions := Seq("2.13.16", "3.3.3") scalaVersion := crossScalaVersions.value.head diff --git a/java/grpc/build.sbt b/java/grpc/build.sbt index 0bc33fe98..13a03c860 100644 --- a/java/grpc/build.sbt +++ b/java/grpc/build.sbt @@ -52,8 +52,8 @@ lazy val `play-java-grpc-example` = (project in file(".")) libraryDependencies ++= CompileDeps ++ TestDeps ) -scalaVersion := "2.13.14" -crossScalaVersions := Seq("2.13.14", "3.3.3") +scalaVersion := "2.13.16" +crossScalaVersions := Seq("2.13.16", "3.3.3") 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/grpc/docs/build.sbt b/java/grpc/docs/build.sbt index a1e379494..0279e034c 100644 --- a/java/grpc/docs/build.sbt +++ b/java/grpc/docs/build.sbt @@ -1,4 +1,4 @@ paradoxTheme := Some(builtinParadoxTheme("generic")) -scalaVersion := "2.13.14" +scalaVersion := "2.13.16" diff --git a/java/hello-world/build.sbt b/java/hello-world/build.sbt index 94a627406..2dbcc7ff9 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.14", "3.3.3") +crossScalaVersions := Seq("2.13.16", "3.3.3") scalaVersion := crossScalaVersions.value.head diff --git a/java/jpa/build.sbt b/java/jpa/build.sbt index b8a37f6b9..6a3ea829d 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/pekko-cluster/build.sbt b/java/pekko-cluster/build.sbt index 07e2b5cd8..232dc3c95 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.14", "3.3.3") +crossScalaVersions := Seq("2.13.16", "3.3.3") scalaVersion := crossScalaVersions.value.head diff --git a/java/rest-api/build.sbt b/java/rest-api/build.sbt index 24c365974..772c07657 100644 --- a/java/rest-api/build.sbt +++ b/java/rest-api/build.sbt @@ -1,6 +1,6 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -lazy val scala213 = "2.13.14" +lazy val scala213 = "2.13.16" lazy val scala3 = "3.3.3" lazy val root = (project in file(".")) diff --git a/java/starter/build.sbt b/java/starter/build.sbt index 7bcfa47bf..58a5b0690 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/streaming/build.sbt b/java/streaming/build.sbt index 2ecce8a1e..d6cf35a78 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.14", "3.3.3") +crossScalaVersions := Seq("2.13.16", "3.3.3") 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 019776559..7a46f0ca8 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt index 1549b8f44..f73575dd1 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.15", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index 1483552f3..b87290184 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt index cda6e2fdb..bc722d01a 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1", scalacOptions ++= List( diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt index 3645c7f97..136a86f7e 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt index 17da3824a..27a49e160 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt index 1ed9e6f20..369de0d41 100644 --- a/scala/grpc/build.sbt +++ b/scala/grpc/build.sbt @@ -72,8 +72,8 @@ val TestDeps = Seq( "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, ) -scalaVersion := "2.13.14" -crossScalaVersions := Seq("2.13.14", "3.3.3") +scalaVersion := "2.13.16" +crossScalaVersions := Seq("2.13.16", "3.3.3") 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/grpc/docs/build.sbt b/scala/grpc/docs/build.sbt index a1e379494..0279e034c 100644 --- a/scala/grpc/docs/build.sbt +++ b/scala/grpc/docs/build.sbt @@ -1,4 +1,4 @@ paradoxTheme := Some(builtinParadoxTheme("generic")) -scalaVersion := "2.13.14" +scalaVersion := "2.13.16" diff --git a/scala/hello-world/build.sbt b/scala/hello-world/build.sbt index dce2055f2..27523c77f 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index be38c1321..bc923e714 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" % "6.0.0" ) -(ThisBuild / crossScalaVersions) := Seq("2.13.14", "3.3.3") +(ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.3") (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 784485fd8..c018e5b30 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index 87573e955..89be8a90f 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "com.softwaremill.macwire" %% "macros" % "2.6.5" % "provided", diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index 58c72384f..dbc1a4474 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -3,7 +3,7 @@ import play.sbt.PlaySettings resolvers ++= Resolver.sonatypeOssRepos("snapshots") -lazy val scala213 = "2.13.14" +lazy val scala213 = "2.13.16" lazy val scala3 = "3.3.3" lazy val root = (project in file(".")) diff --git a/scala/secure-session/build.sbt b/scala/secure-session/build.sbt index 80dbf7f00..2195180f6 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt index 0d3080c94..cb9d67c9a 100644 --- a/scala/slick/build.sbt +++ b/scala/slick/build.sbt @@ -1,4 +1,4 @@ -lazy val scala213 = "2.13.14" +lazy val scala213 = "2.13.16" lazy val scala3 = "3.3.3" lazy val root = (project in file(".")) diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt index 74e32bd63..c1b44b807 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt index 940ae3bb6..c88a9fe5c 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt index 59d17753b..2d661f8a6 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq( "-feature", diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt index 964ea415d..6d29ccf2c 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.14", "3.3.3"), + crossScalaVersions := Seq("2.13.16", "3.3.3"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, From 7ca22a6fed1fc968961343300bc2d9ac84e8408b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 26 Jan 2025 17:52:39 +0100 Subject: [PATCH 03/12] Scala 3.3.4 --- 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 b98c9786f..52e0d62c1 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "org.webjars" %% "webjars-play" % "3.0.1", diff --git a/java/compile-di/build.sbt b/java/compile-di/build.sbt index cdd7c6235..a472b84be 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") scalaVersion := crossScalaVersions.value.head diff --git a/java/dagger2/build.sbt b/java/dagger2/build.sbt index 592804803..8bceb68ac 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/java/ebean/build.sbt b/java/ebean/build.sbt index a4b89d1b9..5aead5cad 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/fileupload/build.sbt b/java/fileupload/build.sbt index 6aab202eb..df6b853f4 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), 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 15422b974..35de15b68 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") scalaVersion := crossScalaVersions.value.head diff --git a/java/grpc/build.sbt b/java/grpc/build.sbt index 13a03c860..690afecd0 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") 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 2dbcc7ff9..dea16ad79 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") scalaVersion := crossScalaVersions.value.head diff --git a/java/jpa/build.sbt b/java/jpa/build.sbt index 6a3ea829d..089c360cd 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/pekko-cluster/build.sbt b/java/pekko-cluster/build.sbt index 232dc3c95..2596a58d8 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") scalaVersion := crossScalaVersions.value.head diff --git a/java/rest-api/build.sbt b/java/rest-api/build.sbt index 772c07657..304fa3e1c 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.3" +lazy val scala3 = "3.3.4" lazy val root = (project in file(".")) .enablePlugins(PlayJava) diff --git a/java/starter/build.sbt b/java/starter/build.sbt index 58a5b0690..9c16e9426 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/java/streaming/build.sbt b/java/streaming/build.sbt index d6cf35a78..8b4794cf9 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") 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 7a46f0ca8..357c61d95 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt index f73575dd1..f853a22d6 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index b87290184..87c72dbcc 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt index bc722d01a..e0bf94698 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1", scalacOptions ++= List( diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt index 136a86f7e..01e9a2800 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt index 27a49e160..3df650fa0 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt index 369de0d41..0f1c3263b 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.3") +crossScalaVersions := Seq("2.13.16", "3.3.4") 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 27523c77f..feb66ac30 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index bc923e714..53931abdb 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" % "6.0.0" ) -(ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.3") +(ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.4") (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 c018e5b30..76bf141f2 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index 89be8a90f..2b30bf3c4 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "com.softwaremill.macwire" %% "macros" % "2.6.5" % "provided", diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index dbc1a4474..78ed7805d 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.3" +lazy val scala3 = "3.3.4" 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 2195180f6..f79892030 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt index cb9d67c9a..4d043329e 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.3" +lazy val scala3 = "3.3.4" lazy val root = (project in file(".")) .settings( diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt index c1b44b807..29fd3aa2e 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt index c88a9fe5c..ba0203b85 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt index 2d661f8a6..9239b6aa5 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq( "-feature", diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt index 6d29ccf2c..1085a9d99 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.3"), + crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, From 7d2e8c1ae27c80abef4cd08c29bdc437699cbd6d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 26 Jan 2025 17:53:55 +0100 Subject: [PATCH 04/12] sbt 1.10.7 --- java/chatroom/project/build.properties | 2 +- java/compile-di/project/build.properties | 2 +- java/dagger2/project/build.properties | 2 +- java/ebean/project/build.properties | 2 +- java/fileupload/project/build.properties | 2 +- java/forms/project/build.properties | 2 +- java/grpc/project/build.properties | 2 +- java/hello-world/project/build.properties | 2 +- java/jpa/project/build.properties | 2 +- java/pekko-cluster/project/build.properties | 2 +- java/rest-api/project/build.properties | 2 +- java/starter/project/build.properties | 2 +- java/streaming/project/build.properties | 2 +- java/websocket/project/build.properties | 2 +- scala/anorm/project/build.properties | 2 +- scala/chatroom/project/build.properties | 2 +- scala/compile-di/project/build.properties | 2 +- scala/fileupload/project/build.properties | 2 +- scala/forms/project/build.properties | 2 +- scala/grpc/project/build.properties | 2 +- scala/hello-world/project/build.properties | 2 +- scala/isolated-slick/project/build.properties | 2 +- scala/log4j2/project/build.properties | 2 +- scala/macwire-di/project/build.properties | 2 +- scala/rest-api/project/build.properties | 2 +- scala/secure-session/project/build.properties | 2 +- scala/slick/project/build.properties | 2 +- scala/starter/project/build.properties | 2 +- scala/streaming/project/build.properties | 2 +- scala/tls/modules/one/project/build.properties | 2 +- scala/tls/modules/two/project/build.properties | 2 +- scala/tls/project/build.properties | 2 +- scala/websocket/project/build.properties | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/java/chatroom/project/build.properties b/java/chatroom/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/chatroom/project/build.properties +++ b/java/chatroom/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/compile-di/project/build.properties b/java/compile-di/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/compile-di/project/build.properties +++ b/java/compile-di/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/dagger2/project/build.properties b/java/dagger2/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/dagger2/project/build.properties +++ b/java/dagger2/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/ebean/project/build.properties b/java/ebean/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/ebean/project/build.properties +++ b/java/ebean/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/fileupload/project/build.properties b/java/fileupload/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/fileupload/project/build.properties +++ b/java/fileupload/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/forms/project/build.properties b/java/forms/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/forms/project/build.properties +++ b/java/forms/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/grpc/project/build.properties b/java/grpc/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/grpc/project/build.properties +++ b/java/grpc/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/hello-world/project/build.properties b/java/hello-world/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/hello-world/project/build.properties +++ b/java/hello-world/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/jpa/project/build.properties b/java/jpa/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/jpa/project/build.properties +++ b/java/jpa/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/pekko-cluster/project/build.properties b/java/pekko-cluster/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/pekko-cluster/project/build.properties +++ b/java/pekko-cluster/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/rest-api/project/build.properties b/java/rest-api/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/rest-api/project/build.properties +++ b/java/rest-api/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/starter/project/build.properties b/java/starter/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/starter/project/build.properties +++ b/java/starter/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/streaming/project/build.properties b/java/streaming/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/streaming/project/build.properties +++ b/java/streaming/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/java/websocket/project/build.properties b/java/websocket/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/java/websocket/project/build.properties +++ b/java/websocket/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/anorm/project/build.properties b/scala/anorm/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/anorm/project/build.properties +++ b/scala/anorm/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/chatroom/project/build.properties b/scala/chatroom/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/chatroom/project/build.properties +++ b/scala/chatroom/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/compile-di/project/build.properties b/scala/compile-di/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/compile-di/project/build.properties +++ b/scala/compile-di/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/fileupload/project/build.properties b/scala/fileupload/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/fileupload/project/build.properties +++ b/scala/fileupload/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/forms/project/build.properties b/scala/forms/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/forms/project/build.properties +++ b/scala/forms/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/grpc/project/build.properties b/scala/grpc/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/grpc/project/build.properties +++ b/scala/grpc/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/hello-world/project/build.properties b/scala/hello-world/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/hello-world/project/build.properties +++ b/scala/hello-world/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/isolated-slick/project/build.properties b/scala/isolated-slick/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/isolated-slick/project/build.properties +++ b/scala/isolated-slick/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/log4j2/project/build.properties b/scala/log4j2/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/log4j2/project/build.properties +++ b/scala/log4j2/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/macwire-di/project/build.properties b/scala/macwire-di/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/macwire-di/project/build.properties +++ b/scala/macwire-di/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/rest-api/project/build.properties b/scala/rest-api/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/rest-api/project/build.properties +++ b/scala/rest-api/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/secure-session/project/build.properties b/scala/secure-session/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/secure-session/project/build.properties +++ b/scala/secure-session/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/slick/project/build.properties b/scala/slick/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/slick/project/build.properties +++ b/scala/slick/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/starter/project/build.properties b/scala/starter/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/starter/project/build.properties +++ b/scala/starter/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/streaming/project/build.properties b/scala/streaming/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/streaming/project/build.properties +++ b/scala/streaming/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/tls/modules/one/project/build.properties b/scala/tls/modules/one/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/tls/modules/one/project/build.properties +++ b/scala/tls/modules/one/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/tls/modules/two/project/build.properties b/scala/tls/modules/two/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/tls/modules/two/project/build.properties +++ b/scala/tls/modules/two/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/tls/project/build.properties b/scala/tls/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/tls/project/build.properties +++ b/scala/tls/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 diff --git a/scala/websocket/project/build.properties b/scala/websocket/project/build.properties index 081fdbbc7..73df629ac 100644 --- a/scala/websocket/project/build.properties +++ b/scala/websocket/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.7 From e6f23051bd449625ba8dbcee0ce8ddbd5cc960ae Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 25 Jan 2025 00:44:08 +0100 Subject: [PATCH 05/12] Bump to latest Play snapshot that upgrades to guice 7 --- java/chatroom/gradle/libs.versions.toml | 2 +- java/chatroom/project/plugins.sbt | 2 +- java/compile-di/gradle/libs.versions.toml | 2 +- java/compile-di/project/plugins.sbt | 2 +- java/dagger2/gradle/libs.versions.toml | 2 +- java/dagger2/project/plugins.sbt | 2 +- java/ebean/gradle/libs.versions.toml | 2 +- java/ebean/project/plugins.sbt | 2 +- java/fileupload/gradle/libs.versions.toml | 2 +- java/fileupload/project/plugins.sbt | 2 +- java/forms/gradle/libs.versions.toml | 2 +- java/forms/project/plugins.sbt | 2 +- java/grpc/project/plugins.sbt | 2 +- java/hello-world/gradle/libs.versions.toml | 2 +- java/hello-world/project/plugins.sbt | 2 +- java/jpa/gradle/libs.versions.toml | 2 +- java/jpa/project/plugins.sbt | 2 +- java/pekko-cluster/gradle/libs.versions.toml | 2 +- java/pekko-cluster/project/plugins.sbt | 2 +- java/rest-api/gradle/libs.versions.toml | 2 +- java/rest-api/project/plugins.sbt | 2 +- java/starter/gradle/libs.versions.toml | 2 +- java/starter/project/plugins.sbt | 2 +- java/streaming/gradle/libs.versions.toml | 2 +- java/streaming/project/plugins.sbt | 2 +- java/websocket/gradle/libs.versions.toml | 2 +- java/websocket/project/plugins.sbt | 2 +- scala/anorm/project/plugins.sbt | 2 +- scala/chatroom/gradle/libs.versions.toml | 2 +- scala/chatroom/project/plugins.sbt | 2 +- scala/compile-di/gradle/libs.versions.toml | 2 +- scala/compile-di/project/plugins.sbt | 2 +- scala/fileupload/gradle/libs.versions.toml | 2 +- scala/fileupload/project/plugins.sbt | 2 +- scala/forms/gradle/libs.versions.toml | 2 +- scala/forms/project/plugins.sbt | 2 +- scala/grpc/project/plugins.sbt | 2 +- scala/hello-world/gradle/libs.versions.toml | 2 +- scala/hello-world/project/plugins.sbt | 2 +- scala/isolated-slick/project/plugins.sbt | 2 +- scala/log4j2/gradle/libs.versions.toml | 2 +- scala/log4j2/project/plugins.sbt | 2 +- scala/macwire-di/gradle/libs.versions.toml | 2 +- scala/macwire-di/project/plugins.sbt | 2 +- scala/rest-api/gradle/libs.versions.toml | 2 +- scala/rest-api/project/plugins.sbt | 2 +- scala/secure-session/gradle/libs.versions.toml | 2 +- scala/secure-session/project/plugins.sbt | 2 +- scala/slick/project/plugins.sbt | 2 +- scala/starter/gradle/libs.versions.toml | 2 +- scala/starter/project/plugins.sbt | 2 +- scala/streaming/gradle/libs.versions.toml | 2 +- scala/streaming/project/plugins.sbt | 2 +- scala/tls/project/plugins.sbt | 2 +- scala/websocket/gradle/libs.versions.toml | 2 +- scala/websocket/project/plugins.sbt | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/java/chatroom/gradle/libs.versions.toml b/java/chatroom/gradle/libs.versions.toml index f52bf77ca..40fa7637e 100644 --- a/java/chatroom/gradle/libs.versions.toml +++ b/java/chatroom/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" webjars-play = "3.0.0" flot = "0.8.3-1" diff --git a/java/chatroom/project/plugins.sbt b/java/chatroom/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/java/chatroom/project/plugins.sbt +++ b/java/chatroom/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/compile-di/gradle/libs.versions.toml b/java/compile-di/gradle/libs.versions.toml index 9f3e09bef..a3ad699f8 100644 --- a/java/compile-di/gradle/libs.versions.toml +++ b/java/compile-di/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/compile-di/project/plugins.sbt b/java/compile-di/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/java/compile-di/project/plugins.sbt +++ b/java/compile-di/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/dagger2/gradle/libs.versions.toml b/java/dagger2/gradle/libs.versions.toml index 2226d63bd..9ee951d56 100644 --- a/java/dagger2/gradle/libs.versions.toml +++ b/java/dagger2/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" dagger = "2.51.1" diff --git a/java/dagger2/project/plugins.sbt b/java/dagger2/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/java/dagger2/project/plugins.sbt +++ b/java/dagger2/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/ebean/gradle/libs.versions.toml b/java/ebean/gradle/libs.versions.toml index 5f7d6db96..0ca81e8a0 100644 --- a/java/ebean/gradle/libs.versions.toml +++ b/java/ebean/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" play-ebean = "8.3.0" ebean = "15.1.0" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19 h2 = "2.3.232" diff --git a/java/ebean/project/plugins.sbt b/java/ebean/project/plugins.sbt index 0350e2fcb..ab069a8b4 100644 --- a/java/ebean/project/plugins.sbt +++ b/java/ebean/project/plugins.sbt @@ -1,5 +1,5 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.3.0") diff --git a/java/fileupload/gradle/libs.versions.toml b/java/fileupload/gradle/libs.versions.toml index a22b62c6e..838cba9c1 100644 --- a/java/fileupload/gradle/libs.versions.toml +++ b/java/fileupload/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/fileupload/project/plugins.sbt b/java/fileupload/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/java/fileupload/project/plugins.sbt +++ b/java/fileupload/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/forms/gradle/libs.versions.toml b/java/forms/gradle/libs.versions.toml index a22b62c6e..838cba9c1 100644 --- a/java/forms/gradle/libs.versions.toml +++ b/java/forms/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/forms/project/plugins.sbt b/java/forms/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/java/forms/project/plugins.sbt +++ b/java/forms/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/grpc/project/plugins.sbt b/java/grpc/project/plugins.sbt index 4bcb1b344..1a8c5a349 100644 --- a/java/grpc/project/plugins.sbt +++ b/java/grpc/project/plugins.sbt @@ -4,7 +4,7 @@ buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV) buildInfoPackage := "play.java.grpc.sample" resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7") diff --git a/java/hello-world/gradle/libs.versions.toml b/java/hello-world/gradle/libs.versions.toml index a22b62c6e..838cba9c1 100644 --- a/java/hello-world/gradle/libs.versions.toml +++ b/java/hello-world/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/hello-world/project/plugins.sbt b/java/hello-world/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/java/hello-world/project/plugins.sbt +++ b/java/hello-world/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/jpa/gradle/libs.versions.toml b/java/jpa/gradle/libs.versions.toml index 7bde649fb..139277367 100644 --- a/java/jpa/gradle/libs.versions.toml +++ b/java/jpa/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" play-ws = "3.0.0" node = "7.1.0" h2 = "2.3.232" diff --git a/java/jpa/project/plugins.sbt b/java/jpa/project/plugins.sbt index a6c34ea5e..3482d56e4 100644 --- a/java/jpa/project/plugins.sbt +++ b/java/jpa/project/plugins.sbt @@ -1,6 +1,6 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") // Web plugins addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.0.1") diff --git a/java/pekko-cluster/gradle/libs.versions.toml b/java/pekko-cluster/gradle/libs.versions.toml index 249d18788..493a9b243 100644 --- a/java/pekko-cluster/gradle/libs.versions.toml +++ b/java/pekko-cluster/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" pekko = "1.0.3" diff --git a/java/pekko-cluster/project/plugins.sbt b/java/pekko-cluster/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/java/pekko-cluster/project/plugins.sbt +++ b/java/pekko-cluster/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/rest-api/gradle/libs.versions.toml b/java/rest-api/gradle/libs.versions.toml index d7033cf8f..2839559b6 100644 --- a/java/rest-api/gradle/libs.versions.toml +++ b/java/rest-api/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" failsafe = "2.4.4" url-builder = "1.1.5" h2 = "2.3.232" diff --git a/java/rest-api/project/plugins.sbt b/java/rest-api/project/plugins.sbt index 9ac4ceedc..94acac849 100644 --- a/java/rest-api/project/plugins.sbt +++ b/java/rest-api/project/plugins.sbt @@ -1,6 +1,6 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") // Load testing tool: // https://gatling.io/docs/gatling/reference/current/extensions/sbt_plugin/ diff --git a/java/starter/gradle/libs.versions.toml b/java/starter/gradle/libs.versions.toml index e2c5c0ee0..2addd4e40 100644 --- a/java/starter/gradle/libs.versions.toml +++ b/java/starter/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" h2 = "2.3.232" assertj = "3.27.2" diff --git a/java/starter/project/plugins.sbt b/java/starter/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/java/starter/project/plugins.sbt +++ b/java/starter/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/streaming/gradle/libs.versions.toml b/java/streaming/gradle/libs.versions.toml index a22b62c6e..838cba9c1 100644 --- a/java/streaming/gradle/libs.versions.toml +++ b/java/streaming/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/streaming/project/plugins.sbt b/java/streaming/project/plugins.sbt index e7f26ed6e..e6a640061 100644 --- a/java/streaming/project/plugins.sbt +++ b/java/streaming/project/plugins.sbt @@ -1,3 +1,3 @@ // Use the Play sbt plugin for Play projects resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/java/websocket/gradle/libs.versions.toml b/java/websocket/gradle/libs.versions.toml index 28f68f781..821e14303 100644 --- a/java/websocket/gradle/libs.versions.toml +++ b/java/websocket/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" play-ws = "3.0.0" node = "7.1.0" webjars-play = "3.0.0" diff --git a/java/websocket/project/plugins.sbt b/java/websocket/project/plugins.sbt index 10617f8ed..a21c789d1 100644 --- a/java/websocket/project/plugins.sbt +++ b/java/websocket/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1") diff --git a/scala/anorm/project/plugins.sbt b/scala/anorm/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/anorm/project/plugins.sbt +++ b/scala/anorm/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/chatroom/gradle/libs.versions.toml b/scala/chatroom/gradle/libs.versions.toml index dd27f1112..62fecfbdc 100644 --- a/scala/chatroom/gradle/libs.versions.toml +++ b/scala/chatroom/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" webjars-play = "3.0.1" jsoup = "1.18.3" flot = "0.8.3-1" diff --git a/scala/chatroom/project/plugins.sbt b/scala/chatroom/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/scala/chatroom/project/plugins.sbt +++ b/scala/chatroom/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/compile-di/gradle/libs.versions.toml b/scala/compile-di/gradle/libs.versions.toml index 7b7a83c68..1134adc33 100644 --- a/scala/compile-di/gradle/libs.versions.toml +++ b/scala/compile-di/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/compile-di/project/plugins.sbt b/scala/compile-di/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/scala/compile-di/project/plugins.sbt +++ b/scala/compile-di/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/fileupload/gradle/libs.versions.toml b/scala/fileupload/gradle/libs.versions.toml index 7b7a83c68..1134adc33 100644 --- a/scala/fileupload/gradle/libs.versions.toml +++ b/scala/fileupload/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/fileupload/project/plugins.sbt b/scala/fileupload/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/fileupload/project/plugins.sbt +++ b/scala/fileupload/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/forms/gradle/libs.versions.toml b/scala/forms/gradle/libs.versions.toml index 7b7a83c68..1134adc33 100644 --- a/scala/forms/gradle/libs.versions.toml +++ b/scala/forms/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/forms/project/plugins.sbt b/scala/forms/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/scala/forms/project/plugins.sbt +++ b/scala/forms/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/grpc/project/plugins.sbt b/scala/grpc/project/plugins.sbt index 17759d510..62ecf377e 100644 --- a/scala/grpc/project/plugins.sbt +++ b/scala/grpc/project/plugins.sbt @@ -4,7 +4,7 @@ buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV) buildInfoPackage := "play.scala.grpc.sample" resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7") diff --git a/scala/hello-world/gradle/libs.versions.toml b/scala/hello-world/gradle/libs.versions.toml index 7b7a83c68..1134adc33 100644 --- a/scala/hello-world/gradle/libs.versions.toml +++ b/scala/hello-world/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/hello-world/project/plugins.sbt b/scala/hello-world/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/scala/hello-world/project/plugins.sbt +++ b/scala/hello-world/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/isolated-slick/project/plugins.sbt b/scala/isolated-slick/project/plugins.sbt index 38d80c0cb..3e4ded4c1 100644 --- a/scala/isolated-slick/project/plugins.sbt +++ b/scala/isolated-slick/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("com.github.tototoshi" % "sbt-slick-codegen" % "2.2.0") // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/log4j2/gradle/libs.versions.toml b/scala/log4j2/gradle/libs.versions.toml index 2e2072a9f..4be7a6634 100644 --- a/scala/log4j2/gradle/libs.versions.toml +++ b/scala/log4j2/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" log4j = "2.23.1" diff --git a/scala/log4j2/project/plugins.sbt b/scala/log4j2/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/log4j2/project/plugins.sbt +++ b/scala/log4j2/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/macwire-di/gradle/libs.versions.toml b/scala/macwire-di/gradle/libs.versions.toml index 8fb2caf6f..a83b80c09 100644 --- a/scala/macwire-di/gradle/libs.versions.toml +++ b/scala/macwire-di/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" macwire = "2.6.5" diff --git a/scala/macwire-di/project/plugins.sbt b/scala/macwire-di/project/plugins.sbt index 9942e394d..193c704f2 100644 --- a/scala/macwire-di/project/plugins.sbt +++ b/scala/macwire-di/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/rest-api/gradle/libs.versions.toml b/scala/rest-api/gradle/libs.versions.toml index 0e5cf681c..4ab2c8db5 100644 --- a/scala/rest-api/gradle/libs.versions.toml +++ b/scala/rest-api/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scala-guice = "6.0.0" scala-uri = "4.0.3" scalatestplus = "3.2.19.1" diff --git a/scala/rest-api/project/plugins.sbt b/scala/rest-api/project/plugins.sbt index cc73aea60..cb8b81f4e 100644 --- a/scala/rest-api/project/plugins.sbt +++ b/scala/rest-api/project/plugins.sbt @@ -1,6 +1,6 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") // sbt-paradox, used for documentation addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7") diff --git a/scala/secure-session/gradle/libs.versions.toml b/scala/secure-session/gradle/libs.versions.toml index 9d970f3f4..8b3f8aa8f 100644 --- a/scala/secure-session/gradle/libs.versions.toml +++ b/scala/secure-session/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" pekko = "1.0.3" diff --git a/scala/secure-session/project/plugins.sbt b/scala/secure-session/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/secure-session/project/plugins.sbt +++ b/scala/secure-session/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/slick/project/plugins.sbt b/scala/slick/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/slick/project/plugins.sbt +++ b/scala/slick/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/starter/gradle/libs.versions.toml b/scala/starter/gradle/libs.versions.toml index 7b7a83c68..1134adc33 100644 --- a/scala/starter/gradle/libs.versions.toml +++ b/scala/starter/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/starter/project/plugins.sbt b/scala/starter/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/starter/project/plugins.sbt +++ b/scala/starter/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/streaming/gradle/libs.versions.toml b/scala/streaming/gradle/libs.versions.toml index 7b7a83c68..1134adc33 100644 --- a/scala/streaming/gradle/libs.versions.toml +++ b/scala/streaming/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/streaming/project/plugins.sbt b/scala/streaming/project/plugins.sbt index e7f26ed6e..e6a640061 100644 --- a/scala/streaming/project/plugins.sbt +++ b/scala/streaming/project/plugins.sbt @@ -1,3 +1,3 @@ // Use the Play sbt plugin for Play projects resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/tls/project/plugins.sbt b/scala/tls/project/plugins.sbt index ad2d1c49a..8904026ab 100644 --- a/scala/tls/project/plugins.sbt +++ b/scala/tls/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") diff --git a/scala/websocket/gradle/libs.versions.toml b/scala/websocket/gradle/libs.versions.toml index d67ba7e33..d7f1ec17b 100644 --- a/scala/websocket/gradle/libs.versions.toml +++ b/scala/websocket/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] twirl = "2.0.7" -play = "3.1.0-d1f1b9f8-SNAPSHOT" +play = "3.1.0-2c77ebef-SNAPSHOT" play-ws = "3.0.0" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" diff --git a/scala/websocket/project/plugins.sbt b/scala/websocket/project/plugins.sbt index 10617f8ed..a21c789d1 100644 --- a/scala/websocket/project/plugins.sbt +++ b/scala/websocket/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1") From 2ef74faffdacda7f4a398a464efc081ffa5e950d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 25 Jan 2025 01:15:19 +0100 Subject: [PATCH 06/12] imports: javax.inject -> jakarta.inject --- java/chatroom/app/controllers/HomeController.java | 2 +- java/dagger2/app/controllers/TimeController.java | 2 +- java/dagger2/app/dagger/ApplicationComponent.java | 2 +- java/dagger2/app/dagger/MyComponentsFromContext.java | 2 +- java/dagger2/app/filters/LoggingFilter.java | 2 +- java/ebean/app/controllers/HomeController.java | 2 +- java/ebean/app/repository/CompanyRepository.java | 2 +- java/ebean/app/repository/ComputerRepository.java | 2 +- java/ebean/app/repository/DatabaseExecutionContext.java | 2 +- java/fileupload/app/controllers/HomeController.java | 4 ++-- .../app/controllers/MyMultipartFormDataBodyParser.java | 2 +- java/forms/app/controllers/WidgetController.java | 4 ++-- java/grpc/app/controllers/HomeController.java | 2 +- java/grpc/app/routers/HelloWorldRouter.java | 4 ++-- java/jpa/app/controllers/PersonController.java | 2 +- java/jpa/app/models/DatabaseExecutionContext.java | 2 +- java/jpa/app/models/JPAPersonRepository.java | 2 +- java/pekko-cluster/app/controllers/HomeController.java | 2 +- java/pekko-cluster/app/modules/AppModule.java | 4 ++-- java/rest-api/app/Module.java | 2 +- java/rest-api/app/v1/post/JPAPostRepository.java | 4 ++-- java/rest-api/app/v1/post/PostAction.java | 4 ++-- java/rest-api/app/v1/post/PostController.java | 2 +- java/rest-api/app/v1/post/PostExecutionContext.java | 2 +- java/rest-api/app/v1/post/PostResourceHandler.java | 2 +- java/starter/app/controllers/AsyncController.java | 2 +- java/starter/app/controllers/CountController.java | 4 ++-- java/starter/app/controllers/HomeController.java | 2 +- java/starter/app/filters/ExampleFilter.java | 4 ++-- java/starter/app/services/ApplicationTimer.java | 2 +- java/starter/app/services/AtomicCounter.java | 2 +- java/streaming/app/controllers/HomeController.java | 2 +- java/streaming/app/controllers/JavaCometController.java | 2 +- .../app/controllers/JavaEventSourceController.java | 2 +- java/websocket/app/Module.java | 6 +++--- java/websocket/app/actors/UserActor.java | 2 +- java/websocket/app/controllers/HomeController.java | 4 ++-- java/websocket/app/controllers/StockSentiment.java | 4 ++-- scala/anorm/app/controllers/HomeController.scala | 2 +- scala/anorm/app/models/CompanyRepository.scala | 4 ++-- scala/anorm/app/models/ComputerRepository.scala | 4 ++-- scala/anorm/app/models/DatabaseExecutionContext.scala | 2 +- scala/chatroom/README.md | 2 +- scala/chatroom/app/controllers/HomeController.scala | 2 +- .../chatroom/app/filters/ContentSecurityPolicyFilter.scala | 2 +- scala/compile-di/app/controllers/HomeController.scala | 2 +- scala/fileupload/app/controllers/HomeController.scala | 2 +- scala/forms/app/controllers/WidgetController.scala | 2 +- scala/grpc/app/controllers/HomeController.scala | 2 +- scala/grpc/app/routers/HelloWorldRouter.scala | 2 +- scala/hello-world/app/controllers/HomeController.scala | 2 +- scala/isolated-slick/app/Module.scala | 2 +- scala/isolated-slick/app/controllers/UserController.scala | 2 +- .../main/scala/com/example/user/slick/SlickUserDAO.scala | 2 +- scala/log4j2/app/Filters.scala | 2 +- scala/log4j2/app/controllers/AsyncController.scala | 2 +- scala/log4j2/app/controllers/CountController.scala | 2 +- scala/log4j2/app/controllers/HomeController.scala | 2 +- scala/log4j2/app/filters/ExampleFilter.scala | 2 +- scala/log4j2/app/services/ApplicationTimer.scala | 2 +- scala/log4j2/app/services/Counter.scala | 2 +- scala/rest-api/app/ErrorHandler.scala | 2 +- scala/rest-api/app/Module.scala | 2 +- scala/rest-api/app/RequestHandler.scala | 2 +- scala/rest-api/app/v1/post/PostActionBuilder.scala | 2 +- scala/rest-api/app/v1/post/PostController.scala | 2 +- scala/rest-api/app/v1/post/PostRepository.scala | 2 +- scala/rest-api/app/v1/post/PostResourceHandler.scala | 2 +- scala/rest-api/app/v1/post/PostRouter.scala | 2 +- scala/rest-api/docs/src/main/paradox/part-1/index.md | 6 +++--- scala/secure-session/app/controllers/HomeController.scala | 2 +- scala/secure-session/app/controllers/LoginController.scala | 2 +- scala/secure-session/app/controllers/LogoutController.scala | 2 +- scala/secure-session/app/controllers/package.scala | 2 +- .../app/services/encryption/EncryptionService.scala | 2 +- .../secure-session/app/services/session/ClusterSystem.scala | 2 +- .../app/services/session/SessionService.scala | 2 +- scala/slick/samples/basic/app/controllers/Application.scala | 2 +- scala/slick/samples/basic/app/dao/CatDAO.scala | 2 +- scala/slick/samples/basic/app/dao/DogDAO.scala | 2 +- .../computer-database/app/bootstrap/InitialData.scala | 2 +- .../computer-database/app/controllers/Application.scala | 2 +- .../samples/computer-database/app/dao/CompaniesDAO.scala | 2 +- .../samples/computer-database/app/dao/ComputersDAO.scala | 2 +- .../samples/person/app/controllers/PersonController.scala | 2 +- .../slick/samples/person/app/models/PersonRepository.scala | 2 +- scala/starter/app/controllers/AsyncController.scala | 2 +- scala/starter/app/controllers/CountController.scala | 2 +- scala/starter/app/controllers/HomeController.scala | 2 +- scala/starter/app/filters/ExampleFilter.scala | 2 +- scala/starter/app/services/ApplicationTimer.scala | 2 +- scala/starter/app/services/Counter.scala | 2 +- scala/streaming/app/controllers/HomeController.scala | 2 +- scala/streaming/app/controllers/ScalaCometController.scala | 2 +- .../app/controllers/ScalaEventSourceController.scala | 2 +- scala/tls/app/controllers/HomeController.scala | 2 +- scala/tls/app/router/MultiSiteRequestHandler.scala | 2 +- scala/tls/modules/one/app/controllers/HomeController.scala | 2 +- scala/tls/modules/two/app/controllers/HomeController.scala | 2 +- scala/websocket/app/Module.scala | 2 +- scala/websocket/app/actors/UserActor.scala | 2 +- scala/websocket/app/controllers/HomeController.scala | 2 +- scala/websocket/app/controllers/StockSentiment.scala | 2 +- 103 files changed, 119 insertions(+), 119 deletions(-) diff --git a/java/chatroom/app/controllers/HomeController.java b/java/chatroom/app/controllers/HomeController.java index d5b88193f..af95c7df1 100644 --- a/java/chatroom/app/controllers/HomeController.java +++ b/java/chatroom/app/controllers/HomeController.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * A very simple chat client using websockets. diff --git a/java/dagger2/app/controllers/TimeController.java b/java/dagger2/app/controllers/TimeController.java index 1e31f8506..f562ea9d4 100644 --- a/java/dagger2/app/controllers/TimeController.java +++ b/java/dagger2/app/controllers/TimeController.java @@ -12,7 +12,7 @@ import play.mvc.Http; import play.mvc.Result; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.*; import java.time.format.DateTimeFormatter; import java.util.Arrays; diff --git a/java/dagger2/app/dagger/ApplicationComponent.java b/java/dagger2/app/dagger/ApplicationComponent.java index 404012d69..b86e46155 100644 --- a/java/dagger2/app/dagger/ApplicationComponent.java +++ b/java/dagger2/app/dagger/ApplicationComponent.java @@ -1,6 +1,6 @@ package dagger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** * The application component that specifies all the modules backing diff --git a/java/dagger2/app/dagger/MyComponentsFromContext.java b/java/dagger2/app/dagger/MyComponentsFromContext.java index 288f343cf..05d3a45fa 100644 --- a/java/dagger2/app/dagger/MyComponentsFromContext.java +++ b/java/dagger2/app/dagger/MyComponentsFromContext.java @@ -19,7 +19,7 @@ import router.Routes; import scala.concurrent.ExecutionContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.Clock; import java.util.HashMap; import java.util.Map; diff --git a/java/dagger2/app/filters/LoggingFilter.java b/java/dagger2/app/filters/LoggingFilter.java index 119f15b3e..64b4f67e4 100644 --- a/java/dagger2/app/filters/LoggingFilter.java +++ b/java/dagger2/app/filters/LoggingFilter.java @@ -6,7 +6,7 @@ import play.mvc.Http; import play.mvc.Result; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.CompletionStage; import java.util.function.Function; diff --git a/java/ebean/app/controllers/HomeController.java b/java/ebean/app/controllers/HomeController.java index d511f1421..dd1b3129b 100644 --- a/java/ebean/app/controllers/HomeController.java +++ b/java/ebean/app/controllers/HomeController.java @@ -12,7 +12,7 @@ import repository.CompanyRepository; import repository.ComputerRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.persistence.PersistenceException; import java.util.Map; import java.util.concurrent.CompletionStage; diff --git a/java/ebean/app/repository/CompanyRepository.java b/java/ebean/app/repository/CompanyRepository.java index 1e2cba2e9..38b36e7fc 100644 --- a/java/ebean/app/repository/CompanyRepository.java +++ b/java/ebean/app/repository/CompanyRepository.java @@ -3,7 +3,7 @@ import io.ebean.DB; import models.Company; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/java/ebean/app/repository/ComputerRepository.java b/java/ebean/app/repository/ComputerRepository.java index f08c081f0..78c8eac2b 100644 --- a/java/ebean/app/repository/ComputerRepository.java +++ b/java/ebean/app/repository/ComputerRepository.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import models.Computer; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; import java.util.concurrent.CompletionStage; diff --git a/java/ebean/app/repository/DatabaseExecutionContext.java b/java/ebean/app/repository/DatabaseExecutionContext.java index b07348fa1..a8d2408d4 100644 --- a/java/ebean/app/repository/DatabaseExecutionContext.java +++ b/java/ebean/app/repository/DatabaseExecutionContext.java @@ -3,7 +3,7 @@ import org.apache.pekko.actor.ActorSystem; import play.libs.concurrent.CustomExecutionContext; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Custom execution context, so that blocking database operations don't diff --git a/java/fileupload/app/controllers/HomeController.java b/java/fileupload/app/controllers/HomeController.java index c964cdd6f..b524175ef 100644 --- a/java/fileupload/app/controllers/HomeController.java +++ b/java/fileupload/app/controllers/HomeController.java @@ -6,8 +6,8 @@ import play.mvc.*; import views.html.index; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/java/fileupload/app/controllers/MyMultipartFormDataBodyParser.java b/java/fileupload/app/controllers/MyMultipartFormDataBodyParser.java index 7de0db5d0..2179a07fa 100644 --- a/java/fileupload/app/controllers/MyMultipartFormDataBodyParser.java +++ b/java/fileupload/app/controllers/MyMultipartFormDataBodyParser.java @@ -11,7 +11,7 @@ import play.mvc.BodyParser; import play.mvc.Http; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/java/forms/app/controllers/WidgetController.java b/java/forms/app/controllers/WidgetController.java index ca6c8ae37..6608b7445 100644 --- a/java/forms/app/controllers/WidgetController.java +++ b/java/forms/app/controllers/WidgetController.java @@ -8,8 +8,8 @@ import play.i18n.MessagesApi; import play.mvc.*; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.List; import static play.libs.Scala.asScala; diff --git a/java/grpc/app/controllers/HomeController.java b/java/grpc/app/controllers/HomeController.java index 6295c83f6..816119a1e 100644 --- a/java/grpc/app/controllers/HomeController.java +++ b/java/grpc/app/controllers/HomeController.java @@ -6,7 +6,7 @@ import play.mvc.Result; import play.mvc.Results; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.CompletionStage; // #grpc_client_injection diff --git a/java/grpc/app/routers/HelloWorldRouter.java b/java/grpc/app/routers/HelloWorldRouter.java index 5544bed80..397a7c53a 100644 --- a/java/grpc/app/routers/HelloWorldRouter.java +++ b/java/grpc/app/routers/HelloWorldRouter.java @@ -6,8 +6,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class HelloWorldRouter extends example.myapp.helloworld.grpc.AbstractGreeterServiceRouter { diff --git a/java/jpa/app/controllers/PersonController.java b/java/jpa/app/controllers/PersonController.java index 5d9c53288..bae71a8fa 100644 --- a/java/jpa/app/controllers/PersonController.java +++ b/java/jpa/app/controllers/PersonController.java @@ -8,7 +8,7 @@ import play.mvc.Http; import play.mvc.Result; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; diff --git a/java/jpa/app/models/DatabaseExecutionContext.java b/java/jpa/app/models/DatabaseExecutionContext.java index 9944f6ef7..b7c9f3fbb 100644 --- a/java/jpa/app/models/DatabaseExecutionContext.java +++ b/java/jpa/app/models/DatabaseExecutionContext.java @@ -3,7 +3,7 @@ import org.apache.pekko.actor.ActorSystem; import play.libs.concurrent.CustomExecutionContext; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Custom execution context wired to "database.dispatcher" thread pool diff --git a/java/jpa/app/models/JPAPersonRepository.java b/java/jpa/app/models/JPAPersonRepository.java index 187c433f1..4e970e036 100644 --- a/java/jpa/app/models/JPAPersonRepository.java +++ b/java/jpa/app/models/JPAPersonRepository.java @@ -2,7 +2,7 @@ import play.db.jpa.JPAApi; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.persistence.EntityManager; import java.util.List; import java.util.concurrent.CompletionStage; diff --git a/java/pekko-cluster/app/controllers/HomeController.java b/java/pekko-cluster/app/controllers/HomeController.java index 5b2306c8e..38626be24 100644 --- a/java/pekko-cluster/app/controllers/HomeController.java +++ b/java/pekko-cluster/app/controllers/HomeController.java @@ -15,7 +15,7 @@ import services.CounterActor.GetValue; import services.CounterActor.Increment; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.Duration; import java.util.concurrent.CompletionStage; diff --git a/java/pekko-cluster/app/modules/AppModule.java b/java/pekko-cluster/app/modules/AppModule.java index 71af4fc1e..2461dc2f7 100644 --- a/java/pekko-cluster/app/modules/AppModule.java +++ b/java/pekko-cluster/app/modules/AppModule.java @@ -13,8 +13,8 @@ import services.CounterActor; import services.CounterActor.Command; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; /** * diff --git a/java/rest-api/app/Module.java b/java/rest-api/app/Module.java index 190189a56..8b4b5802d 100644 --- a/java/rest-api/app/Module.java +++ b/java/rest-api/app/Module.java @@ -7,7 +7,7 @@ import v1.post.PostRepository; import v1.post.JPAPostRepository; -import javax.inject.Provider; +import jakarta.inject.Provider; import java.util.concurrent.TimeUnit; /** diff --git a/java/rest-api/app/v1/post/JPAPostRepository.java b/java/rest-api/app/v1/post/JPAPostRepository.java index 4e12ac210..b1f0133e9 100644 --- a/java/rest-api/app/v1/post/JPAPostRepository.java +++ b/java/rest-api/app/v1/post/JPAPostRepository.java @@ -4,8 +4,8 @@ import net.jodah.failsafe.Failsafe; import play.db.jpa.JPAApi; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; import java.sql.SQLException; diff --git a/java/rest-api/app/v1/post/PostAction.java b/java/rest-api/app/v1/post/PostAction.java index fa4708255..6a8d6f825 100644 --- a/java/rest-api/app/v1/post/PostAction.java +++ b/java/rest-api/app/v1/post/PostAction.java @@ -12,8 +12,8 @@ import play.mvc.Result; import play.mvc.Results; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; diff --git a/java/rest-api/app/v1/post/PostController.java b/java/rest-api/app/v1/post/PostController.java index 73d0f88d9..24f52cfcf 100644 --- a/java/rest-api/app/v1/post/PostController.java +++ b/java/rest-api/app/v1/post/PostController.java @@ -5,7 +5,7 @@ import play.libs.concurrent.ClassLoaderExecutionContext; import play.mvc.*; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; diff --git a/java/rest-api/app/v1/post/PostExecutionContext.java b/java/rest-api/app/v1/post/PostExecutionContext.java index bc8873e66..832d2a495 100644 --- a/java/rest-api/app/v1/post/PostExecutionContext.java +++ b/java/rest-api/app/v1/post/PostExecutionContext.java @@ -3,7 +3,7 @@ import org.apache.pekko.actor.ActorSystem; import play.libs.concurrent.CustomExecutionContext; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Custom execution context wired to "post.repository" thread pool diff --git a/java/rest-api/app/v1/post/PostResourceHandler.java b/java/rest-api/app/v1/post/PostResourceHandler.java index 09717df04..455edd595 100644 --- a/java/rest-api/app/v1/post/PostResourceHandler.java +++ b/java/rest-api/app/v1/post/PostResourceHandler.java @@ -4,7 +4,7 @@ import play.libs.concurrent.ClassLoaderExecutionContext; import play.mvc.Http; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.nio.charset.CharacterCodingException; import java.util.Optional; import java.util.concurrent.CompletionStage; diff --git a/java/starter/app/controllers/AsyncController.java b/java/starter/app/controllers/AsyncController.java index 86b1fe794..c9cf66163 100644 --- a/java/starter/app/controllers/AsyncController.java +++ b/java/starter/app/controllers/AsyncController.java @@ -1,7 +1,7 @@ package controllers; import org.apache.pekko.actor.ActorSystem; -import javax.inject.*; +import jakarta.inject.*; import org.apache.pekko.actor.Scheduler; import play.*; diff --git a/java/starter/app/controllers/CountController.java b/java/starter/app/controllers/CountController.java index e558123b9..baef8413e 100644 --- a/java/starter/app/controllers/CountController.java +++ b/java/starter/app/controllers/CountController.java @@ -4,8 +4,8 @@ import play.mvc.Result; import services.Counter; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * This controller demonstrates how to use dependency injection to diff --git a/java/starter/app/controllers/HomeController.java b/java/starter/app/controllers/HomeController.java index f290f059c..1ca0e6c07 100644 --- a/java/starter/app/controllers/HomeController.java +++ b/java/starter/app/controllers/HomeController.java @@ -4,7 +4,7 @@ import views.html.*; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * This controller contains an action to handle HTTP requests diff --git a/java/starter/app/filters/ExampleFilter.java b/java/starter/app/filters/ExampleFilter.java index 03e5d6dc1..27fa4a616 100644 --- a/java/starter/app/filters/ExampleFilter.java +++ b/java/starter/app/filters/ExampleFilter.java @@ -3,8 +3,8 @@ import play.mvc.EssentialAction; import play.mvc.EssentialFilter; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.concurrent.Executor; /** diff --git a/java/starter/app/services/ApplicationTimer.java b/java/starter/app/services/ApplicationTimer.java index 14027484b..ff3a45393 100644 --- a/java/starter/app/services/ApplicationTimer.java +++ b/java/starter/app/services/ApplicationTimer.java @@ -3,7 +3,7 @@ import java.time.Clock; import java.time.Instant; import java.util.concurrent.CompletableFuture; -import javax.inject.*; +import jakarta.inject.*; import play.inject.ApplicationLifecycle; /** diff --git a/java/starter/app/services/AtomicCounter.java b/java/starter/app/services/AtomicCounter.java index 41f741cbf..1c6420704 100644 --- a/java/starter/app/services/AtomicCounter.java +++ b/java/starter/app/services/AtomicCounter.java @@ -1,7 +1,7 @@ package services; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.*; +import jakarta.inject.*; /** * This class is a concrete implementation of the {@link Counter} trait. diff --git a/java/streaming/app/controllers/HomeController.java b/java/streaming/app/controllers/HomeController.java index 427c8d9b2..3cdb3d91a 100644 --- a/java/streaming/app/controllers/HomeController.java +++ b/java/streaming/app/controllers/HomeController.java @@ -1,6 +1,6 @@ package controllers; -import javax.inject.Inject; +import jakarta.inject.Inject; import play.routing.*; diff --git a/java/streaming/app/controllers/JavaCometController.java b/java/streaming/app/controllers/JavaCometController.java index 5374e4f89..058f9da39 100644 --- a/java/streaming/app/controllers/JavaCometController.java +++ b/java/streaming/app/controllers/JavaCometController.java @@ -6,7 +6,7 @@ import play.mvc.Result; import views.html.helper.CSPNonce; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class JavaCometController extends Controller implements JavaTicker { diff --git a/java/streaming/app/controllers/JavaEventSourceController.java b/java/streaming/app/controllers/JavaEventSourceController.java index b8d478fae..c6ed448e3 100644 --- a/java/streaming/app/controllers/JavaEventSourceController.java +++ b/java/streaming/app/controllers/JavaEventSourceController.java @@ -6,7 +6,7 @@ import play.mvc.Http; import play.mvc.Result; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class JavaEventSourceController extends Controller implements JavaTicker { diff --git a/java/websocket/app/Module.java b/java/websocket/app/Module.java index f11a690d2..dab25276d 100644 --- a/java/websocket/app/Module.java +++ b/java/websocket/app/Module.java @@ -9,9 +9,9 @@ import com.typesafe.config.Config; import play.libs.pekko.PekkoGuiceSupport; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; @SuppressWarnings("unused") public class Module extends AbstractModule implements PekkoGuiceSupport { diff --git a/java/websocket/app/actors/UserActor.java b/java/websocket/app/actors/UserActor.java index 4be7563c0..b8ade71aa 100644 --- a/java/websocket/app/actors/UserActor.java +++ b/java/websocket/app/actors/UserActor.java @@ -19,7 +19,7 @@ import play.libs.Json; import stocks.Stock; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Collections; diff --git a/java/websocket/app/controllers/HomeController.java b/java/websocket/app/controllers/HomeController.java index 34a2b2cf8..d70b6134a 100644 --- a/java/websocket/app/controllers/HomeController.java +++ b/java/websocket/app/controllers/HomeController.java @@ -14,8 +14,8 @@ import play.libs.F.Either; import play.mvc.*; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.time.Duration; import java.util.Arrays; import java.util.List; diff --git a/java/websocket/app/controllers/StockSentiment.java b/java/websocket/app/controllers/StockSentiment.java index 4d69880c5..6ac14d21a 100644 --- a/java/websocket/app/controllers/StockSentiment.java +++ b/java/websocket/app/controllers/StockSentiment.java @@ -12,8 +12,8 @@ import play.mvc.Result; import play.mvc.Results; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.List; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; diff --git a/scala/anorm/app/controllers/HomeController.scala b/scala/anorm/app/controllers/HomeController.scala index a38cff355..43e784659 100644 --- a/scala/anorm/app/controllers/HomeController.scala +++ b/scala/anorm/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import models._ import play.api.data.Forms._ import play.api.data._ diff --git a/scala/anorm/app/models/CompanyRepository.scala b/scala/anorm/app/models/CompanyRepository.scala index e52a429e7..d999adb54 100644 --- a/scala/anorm/app/models/CompanyRepository.scala +++ b/scala/anorm/app/models/CompanyRepository.scala @@ -1,6 +1,6 @@ package models -import javax.inject.Inject +import jakarta.inject.Inject import scala.util.{ Failure, Success } @@ -13,7 +13,7 @@ import scala.concurrent.Future case class Company(id: Option[Long] = None, name: String) -@javax.inject.Singleton +@jakarta.inject.Singleton class CompanyRepository @Inject()(dbapi: DBApi)(implicit ec: DatabaseExecutionContext) { private val db = dbapi.database("default") diff --git a/scala/anorm/app/models/ComputerRepository.scala b/scala/anorm/app/models/ComputerRepository.scala index e3f9095f7..673d4cadd 100644 --- a/scala/anorm/app/models/ComputerRepository.scala +++ b/scala/anorm/app/models/ComputerRepository.scala @@ -1,7 +1,7 @@ package models import java.util.Date -import javax.inject.Inject +import jakarta.inject.Inject import anorm.SqlParser.{ get, scalar } import anorm._ @@ -30,7 +30,7 @@ case class Page[A](items: Seq[A], page: Int, offset: Long, total: Long) { } -@javax.inject.Singleton +@jakarta.inject.Singleton class ComputerRepository @Inject()(dbapi: DBApi, companyRepository: CompanyRepository)(implicit ec: DatabaseExecutionContext) { private val db = dbapi.database("default") diff --git a/scala/anorm/app/models/DatabaseExecutionContext.scala b/scala/anorm/app/models/DatabaseExecutionContext.scala index dec2cc420..4d4e232f3 100644 --- a/scala/anorm/app/models/DatabaseExecutionContext.scala +++ b/scala/anorm/app/models/DatabaseExecutionContext.scala @@ -1,6 +1,6 @@ package models -import javax.inject._ +import jakarta.inject._ import org.apache.pekko.actor.ActorSystem import play.api.libs.concurrent.CustomExecutionContext diff --git a/scala/chatroom/README.md b/scala/chatroom/README.md index 30854e585..74bbf90fa 100644 --- a/scala/chatroom/README.md +++ b/scala/chatroom/README.md @@ -9,7 +9,7 @@ This project makes use of [dynamic streams](https://pekko.apache.org/docs/pekko/ The flow is defined once in the controller, and used everywhere from the `chat` action: ```scala -import javax.inject._ +import jakarta.inject._ import play.api.mvc._ import org.apache.pekko.stream.scaladsl._ diff --git a/scala/chatroom/app/controllers/HomeController.scala b/scala/chatroom/app/controllers/HomeController.scala index a191df1d0..963002380 100644 --- a/scala/chatroom/app/controllers/HomeController.scala +++ b/scala/chatroom/app/controllers/HomeController.scala @@ -1,7 +1,7 @@ package controllers import java.net.URI -import javax.inject._ +import jakarta.inject._ import org.apache.pekko.actor.ActorSystem import org.apache.pekko.event.{Logging, LoggingAdapter} diff --git a/scala/chatroom/app/filters/ContentSecurityPolicyFilter.scala b/scala/chatroom/app/filters/ContentSecurityPolicyFilter.scala index 45bf1e814..b7425ac2b 100644 --- a/scala/chatroom/app/filters/ContentSecurityPolicyFilter.scala +++ b/scala/chatroom/app/filters/ContentSecurityPolicyFilter.scala @@ -1,6 +1,6 @@ package filters -import javax.inject.Inject +import jakarta.inject.Inject import controllers.routes import play.api.mvc.{EssentialAction, EssentialFilter, RequestHeader} diff --git a/scala/compile-di/app/controllers/HomeController.scala b/scala/compile-di/app/controllers/HomeController.scala index 474c1817a..6e4bb38fa 100644 --- a/scala/compile-di/app/controllers/HomeController.scala +++ b/scala/compile-di/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import play.api.mvc._ diff --git a/scala/fileupload/app/controllers/HomeController.scala b/scala/fileupload/app/controllers/HomeController.scala index 876bfb255..5d92f2511 100644 --- a/scala/fileupload/app/controllers/HomeController.scala +++ b/scala/fileupload/app/controllers/HomeController.scala @@ -2,7 +2,7 @@ package controllers import java.io.File import java.nio.file.{Files, Path} -import javax.inject._ +import jakarta.inject._ import org.apache.pekko.stream.IOResult import org.apache.pekko.stream.scaladsl._ diff --git a/scala/forms/app/controllers/WidgetController.scala b/scala/forms/app/controllers/WidgetController.scala index bdfc8efb7..a43fd2668 100644 --- a/scala/forms/app/controllers/WidgetController.scala +++ b/scala/forms/app/controllers/WidgetController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import models.Widget import play.api.data._ diff --git a/scala/grpc/app/controllers/HomeController.scala b/scala/grpc/app/controllers/HomeController.scala index 4ebf9627f..15c521809 100644 --- a/scala/grpc/app/controllers/HomeController.scala +++ b/scala/grpc/app/controllers/HomeController.scala @@ -4,7 +4,7 @@ package controllers //app/controllers/HomeController.scala import com.typesafe.config.Config import example.myapp.helloworld.grpc.{ GreeterServiceClient, HelloReply, HelloRequest } -import javax.inject.Inject +import jakarta.inject.Inject import play.api.mvc._ import scala.concurrent.{ ExecutionContext, Future } diff --git a/scala/grpc/app/routers/HelloWorldRouter.scala b/scala/grpc/app/routers/HelloWorldRouter.scala index 1a3983cef..db57d1d74 100644 --- a/scala/grpc/app/routers/HelloWorldRouter.scala +++ b/scala/grpc/app/routers/HelloWorldRouter.scala @@ -4,7 +4,7 @@ import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.Materializer import example.myapp.helloworld.grpc.AbstractGreeterServiceRouter import example.myapp.helloworld.grpc.{ HelloReply, HelloRequest } -import javax.inject.Inject +import jakarta.inject.Inject import scala.concurrent.Future diff --git a/scala/hello-world/app/controllers/HomeController.scala b/scala/hello-world/app/controllers/HomeController.scala index d1ea2ce46..e89f66d12 100644 --- a/scala/hello-world/app/controllers/HomeController.scala +++ b/scala/hello-world/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.mvc._ diff --git a/scala/isolated-slick/app/Module.scala b/scala/isolated-slick/app/Module.scala index b4d328b02..4bc0a0705 100644 --- a/scala/isolated-slick/app/Module.scala +++ b/scala/isolated-slick/app/Module.scala @@ -1,4 +1,4 @@ -import javax.inject.{Inject, Provider, Singleton} +import jakarta.inject.{Inject, Provider, Singleton} import com.example.user.UserDAO import com.example.user.slick.SlickUserDAO diff --git a/scala/isolated-slick/app/controllers/UserController.scala b/scala/isolated-slick/app/controllers/UserController.scala index b83937b32..b8c13856d 100644 --- a/scala/isolated-slick/app/controllers/UserController.scala +++ b/scala/isolated-slick/app/controllers/UserController.scala @@ -8,7 +8,7 @@ import play.api.mvc._ import java.time.Instant import java.util.UUID -import javax.inject.{Inject, Singleton} +import jakarta.inject.{Inject, Singleton} import scala.concurrent.ExecutionContext @Singleton diff --git a/scala/isolated-slick/modules/slick/src/main/scala/com/example/user/slick/SlickUserDAO.scala b/scala/isolated-slick/modules/slick/src/main/scala/com/example/user/slick/SlickUserDAO.scala index f09416c20..178ae3f79 100644 --- a/scala/isolated-slick/modules/slick/src/main/scala/com/example/user/slick/SlickUserDAO.scala +++ b/scala/isolated-slick/modules/slick/src/main/scala/com/example/user/slick/SlickUserDAO.scala @@ -1,6 +1,6 @@ package com.example.user.slick -import javax.inject.{Inject, Singleton} +import jakarta.inject.{Inject, Singleton} import java.time.Instant import slick.jdbc.JdbcProfile diff --git a/scala/log4j2/app/Filters.scala b/scala/log4j2/app/Filters.scala index a72db50dc..049f94ef6 100644 --- a/scala/log4j2/app/Filters.scala +++ b/scala/log4j2/app/Filters.scala @@ -1,4 +1,4 @@ -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.http.HttpFilters import play.api.mvc._ diff --git a/scala/log4j2/app/controllers/AsyncController.scala b/scala/log4j2/app/controllers/AsyncController.scala index 08d9a1b07..8cb81576a 100644 --- a/scala/log4j2/app/controllers/AsyncController.scala +++ b/scala/log4j2/app/controllers/AsyncController.scala @@ -1,7 +1,7 @@ package controllers import org.apache.pekko.actor.ActorSystem -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.mvc._ import scala.concurrent.{ExecutionContext, Future, Promise} diff --git a/scala/log4j2/app/controllers/CountController.scala b/scala/log4j2/app/controllers/CountController.scala index 29ede4f92..e8f399606 100644 --- a/scala/log4j2/app/controllers/CountController.scala +++ b/scala/log4j2/app/controllers/CountController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.mvc._ diff --git a/scala/log4j2/app/controllers/HomeController.scala b/scala/log4j2/app/controllers/HomeController.scala index 3bf63461a..e2cd91953 100644 --- a/scala/log4j2/app/controllers/HomeController.scala +++ b/scala/log4j2/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.mvc._ diff --git a/scala/log4j2/app/filters/ExampleFilter.scala b/scala/log4j2/app/filters/ExampleFilter.scala index 3543f4718..a37962887 100644 --- a/scala/log4j2/app/filters/ExampleFilter.scala +++ b/scala/log4j2/app/filters/ExampleFilter.scala @@ -1,7 +1,7 @@ package filters import org.apache.pekko.stream.Materializer -import javax.inject._ +import jakarta.inject._ import play.api.mvc._ import scala.concurrent.{ExecutionContext, Future} diff --git a/scala/log4j2/app/services/ApplicationTimer.scala b/scala/log4j2/app/services/ApplicationTimer.scala index d7f436f0a..e895da37b 100644 --- a/scala/log4j2/app/services/ApplicationTimer.scala +++ b/scala/log4j2/app/services/ApplicationTimer.scala @@ -2,7 +2,7 @@ package services import java.time.{Clock, Instant} -import javax.inject._ +import jakarta.inject._ import org.slf4j.LoggerFactory import play.api.inject._ diff --git a/scala/log4j2/app/services/Counter.scala b/scala/log4j2/app/services/Counter.scala index fe19334ee..b40fe907b 100644 --- a/scala/log4j2/app/services/Counter.scala +++ b/scala/log4j2/app/services/Counter.scala @@ -1,7 +1,7 @@ package services import java.util.concurrent.atomic.AtomicInteger -import javax.inject._ +import jakarta.inject._ /** * This trait demonstrates how to create a component that is injected diff --git a/scala/rest-api/app/ErrorHandler.scala b/scala/rest-api/app/ErrorHandler.scala index 8bfb6d21d..6d8048208 100644 --- a/scala/rest-api/app/ErrorHandler.scala +++ b/scala/rest-api/app/ErrorHandler.scala @@ -1,4 +1,4 @@ -import javax.inject.{Inject, Provider} +import jakarta.inject.{Inject, Provider} import play.api._ import play.api.http.DefaultHttpErrorHandler diff --git a/scala/rest-api/app/Module.scala b/scala/rest-api/app/Module.scala index 5523be112..0fc7e6c58 100644 --- a/scala/rest-api/app/Module.scala +++ b/scala/rest-api/app/Module.scala @@ -1,4 +1,4 @@ -import javax.inject._ +import jakarta.inject._ import com.google.inject.AbstractModule import net.codingwell.scalaguice.ScalaModule diff --git a/scala/rest-api/app/RequestHandler.scala b/scala/rest-api/app/RequestHandler.scala index 2f954a391..cbdd10bcc 100644 --- a/scala/rest-api/app/RequestHandler.scala +++ b/scala/rest-api/app/RequestHandler.scala @@ -1,4 +1,4 @@ -import javax.inject.Inject +import jakarta.inject.Inject import play.api.OptionalDevContext import play.api.http._ import play.api.mvc._ diff --git a/scala/rest-api/app/v1/post/PostActionBuilder.scala b/scala/rest-api/app/v1/post/PostActionBuilder.scala index c34a06fbc..07d6cef4e 100644 --- a/scala/rest-api/app/v1/post/PostActionBuilder.scala +++ b/scala/rest-api/app/v1/post/PostActionBuilder.scala @@ -1,6 +1,6 @@ package v1.post -import javax.inject.Inject +import jakarta.inject.Inject import net.logstash.logback.marker.LogstashMarker import play.api.{Logger, MarkerContext} diff --git a/scala/rest-api/app/v1/post/PostController.scala b/scala/rest-api/app/v1/post/PostController.scala index 30f49d982..4908156a6 100644 --- a/scala/rest-api/app/v1/post/PostController.scala +++ b/scala/rest-api/app/v1/post/PostController.scala @@ -1,6 +1,6 @@ package v1.post -import javax.inject.Inject +import jakarta.inject.Inject import play.api.Logger import play.api.data.Form diff --git a/scala/rest-api/app/v1/post/PostRepository.scala b/scala/rest-api/app/v1/post/PostRepository.scala index 25a520c65..855e539d0 100644 --- a/scala/rest-api/app/v1/post/PostRepository.scala +++ b/scala/rest-api/app/v1/post/PostRepository.scala @@ -1,6 +1,6 @@ package v1.post -import javax.inject.{Inject, Singleton} +import jakarta.inject.{Inject, Singleton} import org.apache.pekko.actor.ActorSystem import play.api.libs.concurrent.CustomExecutionContext diff --git a/scala/rest-api/app/v1/post/PostResourceHandler.scala b/scala/rest-api/app/v1/post/PostResourceHandler.scala index b2b3a7ddf..1c1eb1dc7 100644 --- a/scala/rest-api/app/v1/post/PostResourceHandler.scala +++ b/scala/rest-api/app/v1/post/PostResourceHandler.scala @@ -1,6 +1,6 @@ package v1.post -import javax.inject.{Inject, Provider} +import jakarta.inject.{Inject, Provider} import play.api.MarkerContext diff --git a/scala/rest-api/app/v1/post/PostRouter.scala b/scala/rest-api/app/v1/post/PostRouter.scala index 7a7798e73..c5f1a29fc 100644 --- a/scala/rest-api/app/v1/post/PostRouter.scala +++ b/scala/rest-api/app/v1/post/PostRouter.scala @@ -1,6 +1,6 @@ package v1.post -import javax.inject.Inject +import jakarta.inject.Inject import play.api.routing.Router.Routes import play.api.routing.SimpleRouter diff --git a/scala/rest-api/docs/src/main/paradox/part-1/index.md b/scala/rest-api/docs/src/main/paradox/part-1/index.md index 81cdf7ff8..e7386cb85 100644 --- a/scala/rest-api/docs/src/main/paradox/part-1/index.md +++ b/scala/rest-api/docs/src/main/paradox/part-1/index.md @@ -59,7 +59,7 @@ The `PostRouter` examines the URL and extracts data to pass along to the control ```scala package v1.post -import javax.inject.Inject +import jakarta.inject.Inject import play.api.routing.Router.Routes import play.api.routing.SimpleRouter @@ -123,7 +123,7 @@ Using the action, the controller passes in a block of code that takes a [`Reques Here's a simple example of a Controller: ```scala -import javax.inject.Inject +import jakarta.inject.Inject import play.api.mvc._ import scala.concurrent._ @@ -151,7 +151,7 @@ Let's take a look at the most important parts of the PostController: ```scala package v1.post -import javax.inject.Inject +import jakarta.inject.Inject import play.api.Logger import play.api.data.Form diff --git a/scala/secure-session/app/controllers/HomeController.scala b/scala/secure-session/app/controllers/HomeController.scala index 371e6bf89..aade54b86 100644 --- a/scala/secure-session/app/controllers/HomeController.scala +++ b/scala/secure-session/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api.mvc._ diff --git a/scala/secure-session/app/controllers/LoginController.scala b/scala/secure-session/app/controllers/LoginController.scala index 85ad7cb39..5a2c83c55 100644 --- a/scala/secure-session/app/controllers/LoginController.scala +++ b/scala/secure-session/app/controllers/LoginController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import play.api.data.Form import play.api.mvc._ diff --git a/scala/secure-session/app/controllers/LogoutController.scala b/scala/secure-session/app/controllers/LogoutController.scala index d497ff3ae..39af629ad 100644 --- a/scala/secure-session/app/controllers/LogoutController.scala +++ b/scala/secure-session/app/controllers/LogoutController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import play.api.mvc._ import services.session.SessionService diff --git a/scala/secure-session/app/controllers/package.scala b/scala/secure-session/app/controllers/package.scala index 95dd381cf..f07a0d097 100644 --- a/scala/secure-session/app/controllers/package.scala +++ b/scala/secure-session/app/controllers/package.scala @@ -1,4 +1,4 @@ -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import play.api.http.SecretConfiguration import play.api.i18n.MessagesApi diff --git a/scala/secure-session/app/services/encryption/EncryptionService.scala b/scala/secure-session/app/services/encryption/EncryptionService.scala index 56a95724a..7104c87c9 100644 --- a/scala/secure-session/app/services/encryption/EncryptionService.scala +++ b/scala/secure-session/app/services/encryption/EncryptionService.scala @@ -2,7 +2,7 @@ package services.encryption import java.nio.charset.StandardCharsets import java.security.SecureRandom -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import play.api.{ Configuration, Logger } import play.api.libs.json.{ JsResult, Json, Reads, Writes } diff --git a/scala/secure-session/app/services/session/ClusterSystem.scala b/scala/secure-session/app/services/session/ClusterSystem.scala index 74a308cc9..baa72bf5d 100644 --- a/scala/secure-session/app/services/session/ClusterSystem.scala +++ b/scala/secure-session/app/services/session/ClusterSystem.scala @@ -1,6 +1,6 @@ package services.session -import javax.inject.Inject +import jakarta.inject.Inject import org.apache.pekko.actor.ActorSystem import com.typesafe.config.ConfigFactory diff --git a/scala/secure-session/app/services/session/SessionService.scala b/scala/secure-session/app/services/session/SessionService.scala index 4d9582cf6..04ab0f48c 100644 --- a/scala/secure-session/app/services/session/SessionService.scala +++ b/scala/secure-session/app/services/session/SessionService.scala @@ -1,6 +1,6 @@ package services.session -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import org.apache.pekko.actor.typed.{ ActorRef, Scheduler } import org.apache.pekko.actor.typed.scaladsl.AskPattern._ diff --git a/scala/slick/samples/basic/app/controllers/Application.scala b/scala/slick/samples/basic/app/controllers/Application.scala index fec7d72ba..f4688b2fc 100644 --- a/scala/slick/samples/basic/app/controllers/Application.scala +++ b/scala/slick/samples/basic/app/controllers/Application.scala @@ -3,7 +3,7 @@ package controllers import dao.CatDAO import dao.DogDAO -import javax.inject.Inject +import jakarta.inject.Inject import models.Cat import play.api.data.Form import play.api.data.Forms._ diff --git a/scala/slick/samples/basic/app/dao/CatDAO.scala b/scala/slick/samples/basic/app/dao/CatDAO.scala index 9cd55ec87..25bfda672 100644 --- a/scala/slick/samples/basic/app/dao/CatDAO.scala +++ b/scala/slick/samples/basic/app/dao/CatDAO.scala @@ -1,7 +1,7 @@ package dao import scala.concurrent.{ ExecutionContext, Future } -import javax.inject.Inject +import jakarta.inject.Inject import models.Cat import play.api.db.slick.DatabaseConfigProvider diff --git a/scala/slick/samples/basic/app/dao/DogDAO.scala b/scala/slick/samples/basic/app/dao/DogDAO.scala index cd91e2055..35220f81e 100644 --- a/scala/slick/samples/basic/app/dao/DogDAO.scala +++ b/scala/slick/samples/basic/app/dao/DogDAO.scala @@ -1,7 +1,7 @@ package dao import scala.concurrent.{ ExecutionContext, Future } -import javax.inject.Inject +import jakarta.inject.Inject import models.Dog import play.api.db.slick.DatabaseConfigProvider diff --git a/scala/slick/samples/computer-database/app/bootstrap/InitialData.scala b/scala/slick/samples/computer-database/app/bootstrap/InitialData.scala index 440cdd8da..faf0d6fca 100644 --- a/scala/slick/samples/computer-database/app/bootstrap/InitialData.scala +++ b/scala/slick/samples/computer-database/app/bootstrap/InitialData.scala @@ -1,7 +1,7 @@ package bootstrap import java.text.SimpleDateFormat -import javax.inject.Inject +import jakarta.inject.Inject import dao.{ CompaniesDAO, ComputersDAO } import models.{ Company, Computer } diff --git a/scala/slick/samples/computer-database/app/controllers/Application.scala b/scala/slick/samples/computer-database/app/controllers/Application.scala index a1f4176e8..401968c86 100644 --- a/scala/slick/samples/computer-database/app/controllers/Application.scala +++ b/scala/slick/samples/computer-database/app/controllers/Application.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import dao.{ CompaniesDAO, ComputersDAO } import models.Computer diff --git a/scala/slick/samples/computer-database/app/dao/CompaniesDAO.scala b/scala/slick/samples/computer-database/app/dao/CompaniesDAO.scala index d9caeef40..e21790ddc 100644 --- a/scala/slick/samples/computer-database/app/dao/CompaniesDAO.scala +++ b/scala/slick/samples/computer-database/app/dao/CompaniesDAO.scala @@ -1,6 +1,6 @@ package dao -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import scala.concurrent.{ ExecutionContext, Future } import models.Company diff --git a/scala/slick/samples/computer-database/app/dao/ComputersDAO.scala b/scala/slick/samples/computer-database/app/dao/ComputersDAO.scala index 5d93eb23b..7132dd8c8 100644 --- a/scala/slick/samples/computer-database/app/dao/ComputersDAO.scala +++ b/scala/slick/samples/computer-database/app/dao/ComputersDAO.scala @@ -1,7 +1,7 @@ package dao import java.util.Date -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import models.{ Company, Computer, Page } import play.api.db.slick.{ DatabaseConfigProvider, HasDatabaseConfigProvider } diff --git a/scala/slick/samples/person/app/controllers/PersonController.scala b/scala/slick/samples/person/app/controllers/PersonController.scala index 95f1f32e2..a67d9aad9 100644 --- a/scala/slick/samples/person/app/controllers/PersonController.scala +++ b/scala/slick/samples/person/app/controllers/PersonController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import models._ import play.api.data.Form diff --git a/scala/slick/samples/person/app/models/PersonRepository.scala b/scala/slick/samples/person/app/models/PersonRepository.scala index 1cce09632..c406dd673 100644 --- a/scala/slick/samples/person/app/models/PersonRepository.scala +++ b/scala/slick/samples/person/app/models/PersonRepository.scala @@ -1,6 +1,6 @@ package models -import javax.inject.{ Inject, Singleton } +import jakarta.inject.{ Inject, Singleton } import play.api.db.slick.DatabaseConfigProvider import slick.jdbc.JdbcProfile diff --git a/scala/starter/app/controllers/AsyncController.scala b/scala/starter/app/controllers/AsyncController.scala index add861e72..df366de0f 100644 --- a/scala/starter/app/controllers/AsyncController.scala +++ b/scala/starter/app/controllers/AsyncController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import org.apache.pekko.actor.ActorSystem import play.api.mvc._ diff --git a/scala/starter/app/controllers/CountController.scala b/scala/starter/app/controllers/CountController.scala index 78e706360..8b46f6ec3 100644 --- a/scala/starter/app/controllers/CountController.scala +++ b/scala/starter/app/controllers/CountController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api.mvc._ import services.Counter diff --git a/scala/starter/app/controllers/HomeController.scala b/scala/starter/app/controllers/HomeController.scala index e6af3d5dd..f9ec1b183 100644 --- a/scala/starter/app/controllers/HomeController.scala +++ b/scala/starter/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api.mvc._ diff --git a/scala/starter/app/filters/ExampleFilter.scala b/scala/starter/app/filters/ExampleFilter.scala index da1447ad5..441ba10d4 100644 --- a/scala/starter/app/filters/ExampleFilter.scala +++ b/scala/starter/app/filters/ExampleFilter.scala @@ -1,6 +1,6 @@ package filters -import javax.inject._ +import jakarta.inject._ import play.api.mvc._ import scala.concurrent.ExecutionContext diff --git a/scala/starter/app/services/ApplicationTimer.scala b/scala/starter/app/services/ApplicationTimer.scala index 4d23e5a8b..f160fa7ed 100644 --- a/scala/starter/app/services/ApplicationTimer.scala +++ b/scala/starter/app/services/ApplicationTimer.scala @@ -1,7 +1,7 @@ package services import java.time.{Clock, Instant} -import javax.inject._ +import jakarta.inject._ import play.api.Logger import play.api.inject.ApplicationLifecycle import scala.concurrent.Future diff --git a/scala/starter/app/services/Counter.scala b/scala/starter/app/services/Counter.scala index fe19334ee..b40fe907b 100644 --- a/scala/starter/app/services/Counter.scala +++ b/scala/starter/app/services/Counter.scala @@ -1,7 +1,7 @@ package services import java.util.concurrent.atomic.AtomicInteger -import javax.inject._ +import jakarta.inject._ /** * This trait demonstrates how to create a component that is injected diff --git a/scala/streaming/app/controllers/HomeController.scala b/scala/streaming/app/controllers/HomeController.scala index 0618cbe3f..3c1fc673d 100644 --- a/scala/streaming/app/controllers/HomeController.scala +++ b/scala/streaming/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import play.api.mvc.{AbstractController, Action, AnyContent, ControllerComponents, RequestHeader} class HomeController @Inject()(cc: ControllerComponents) extends AbstractController(cc) { diff --git a/scala/streaming/app/controllers/ScalaCometController.scala b/scala/streaming/app/controllers/ScalaCometController.scala index c6609110f..1407c1ddc 100644 --- a/scala/streaming/app/controllers/ScalaCometController.scala +++ b/scala/streaming/app/controllers/ScalaCometController.scala @@ -6,7 +6,7 @@ import play.api.libs.Comet import play.api.mvc._ import views.html.helper.CSPNonce -import javax.inject.{Inject, Singleton} +import jakarta.inject.{Inject, Singleton} @Singleton class ScalaCometController @Inject()(cc: ControllerComponents, materializer: Materializer) extends AbstractController(cc) diff --git a/scala/streaming/app/controllers/ScalaEventSourceController.scala b/scala/streaming/app/controllers/ScalaEventSourceController.scala index 48337371f..92c3dc267 100644 --- a/scala/streaming/app/controllers/ScalaEventSourceController.scala +++ b/scala/streaming/app/controllers/ScalaEventSourceController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.{Inject, Singleton} +import jakarta.inject.{Inject, Singleton} import play.api.http.ContentTypes import play.api.libs.EventSource diff --git a/scala/tls/app/controllers/HomeController.scala b/scala/tls/app/controllers/HomeController.scala index 33b653f3f..9b60a9b27 100644 --- a/scala/tls/app/controllers/HomeController.scala +++ b/scala/tls/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject.Inject +import jakarta.inject.Inject import play.api._ import play.api.mvc._ diff --git a/scala/tls/app/router/MultiSiteRequestHandler.scala b/scala/tls/app/router/MultiSiteRequestHandler.scala index 29e1985d7..b22578334 100644 --- a/scala/tls/app/router/MultiSiteRequestHandler.scala +++ b/scala/tls/app/router/MultiSiteRequestHandler.scala @@ -1,6 +1,6 @@ package router -import javax.inject._ +import jakarta.inject._ import play.api.ApplicationLoader.DevContext import play.api.OptionalDevContext import play.api.mvc.RequestHeader diff --git a/scala/tls/modules/one/app/controllers/HomeController.scala b/scala/tls/modules/one/app/controllers/HomeController.scala index 687c481bd..39414199d 100644 --- a/scala/tls/modules/one/app/controllers/HomeController.scala +++ b/scala/tls/modules/one/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers.one -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.mvc._ diff --git a/scala/tls/modules/two/app/controllers/HomeController.scala b/scala/tls/modules/two/app/controllers/HomeController.scala index b9675907e..52d64cf9e 100644 --- a/scala/tls/modules/two/app/controllers/HomeController.scala +++ b/scala/tls/modules/two/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers.two -import javax.inject._ +import jakarta.inject._ import play.api._ import play.api.mvc._ diff --git a/scala/websocket/app/Module.scala b/scala/websocket/app/Module.scala index a4fdc1b12..6ffb8431a 100644 --- a/scala/websocket/app/Module.scala +++ b/scala/websocket/app/Module.scala @@ -1,4 +1,4 @@ -import javax.inject.{ Inject, Provider, Singleton } +import jakarta.inject.{ Inject, Provider, Singleton } import actors._ import org.apache.pekko.actor.typed.{ ActorRef, Behavior } diff --git a/scala/websocket/app/actors/UserActor.scala b/scala/websocket/app/actors/UserActor.scala index 3fb36eb37..27ee61d3d 100644 --- a/scala/websocket/app/actors/UserActor.scala +++ b/scala/websocket/app/actors/UserActor.scala @@ -1,6 +1,6 @@ package actors -import javax.inject._ +import jakarta.inject._ import actors.StocksActor.{ GetStocks, Stocks } import org.apache.pekko.actor.typed.scaladsl.{ ActorContext, Behaviors } diff --git a/scala/websocket/app/controllers/HomeController.scala b/scala/websocket/app/controllers/HomeController.scala index 44d533e34..f25087d78 100644 --- a/scala/websocket/app/controllers/HomeController.scala +++ b/scala/websocket/app/controllers/HomeController.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import actors._ import org.apache.pekko.NotUsed diff --git a/scala/websocket/app/controllers/StockSentiment.scala b/scala/websocket/app/controllers/StockSentiment.scala index 253dc3399..52c14c225 100644 --- a/scala/websocket/app/controllers/StockSentiment.scala +++ b/scala/websocket/app/controllers/StockSentiment.scala @@ -1,6 +1,6 @@ package controllers -import javax.inject._ +import jakarta.inject._ import play.api.{Configuration, Logger} import play.api.libs.json.{JsObject, JsString, JsValue, Json, Reads} From 1b33d363aec9e7fc1409a6a279003d14f2e676c5 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 25 Jan 2025 01:15:42 +0100 Subject: [PATCH 07/12] Dependency: javax.inject -> jakarta.inject --- scala/isolated-slick/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index 53931abdb..9bb2c0140 100644 --- a/scala/isolated-slick/build.sbt +++ b/scala/isolated-slick/build.sbt @@ -13,7 +13,7 @@ val FlywayVersion = "10.21.0" (ThisBuild / version) := "1.1-SNAPSHOT" (ThisBuild / libraryDependencies) ++= Seq( - "javax.inject" % "javax.inject" % "1", + "jakarta.inject" % "jakarta.inject-api" % "2.0.1", "com.google.inject" % "guice" % "6.0.0" ) From 9a0777c616e46182a86c98baf56b63f971d27fe8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 5 May 2024 22:22:17 +0000 Subject: [PATCH 08/12] guice 7.0.0 (was 6.0.0) --- scala/isolated-slick/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index 9bb2c0140..92ad000c1 100644 --- a/scala/isolated-slick/build.sbt +++ b/scala/isolated-slick/build.sbt @@ -14,7 +14,7 @@ val FlywayVersion = "10.21.0" (ThisBuild / libraryDependencies) ++= Seq( "jakarta.inject" % "jakarta.inject-api" % "2.0.1", - "com.google.inject" % "guice" % "6.0.0" + "com.google.inject" % "guice" % "7.0.0" ) (ThisBuild / crossScalaVersions) := Seq("2.13.16", "3.3.4") From a4c5810ba9661e309f520e55c4b9db6e9a7a9010 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 5 May 2024 22:22:39 +0000 Subject: [PATCH 09/12] scala-guice 7.0.0 (was 6.0.0) --- scala/rest-api/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index 78ed7805d..ab33b09a2 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -17,7 +17,7 @@ lazy val root = (project in file(".")) guice, "net.logstash.logback" % "logstash-logback-encoder" % "7.3", "io.lemonlabs" %% "scala-uri" % "4.0.3", - "net.codingwell" %% "scala-guice" % "6.0.0", + "net.codingwell" %% "scala-guice" % "7.0.0", "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test ), scalacOptions ++= Seq( From af34e6cf392b26066737e5303ab016b4f3ef70d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 16:21:09 +0000 Subject: [PATCH 10/12] Update `net.codingwell:scala-guice_2.13` to `v7` (was `6.0.0`) --- scala/rest-api/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala/rest-api/gradle/libs.versions.toml b/scala/rest-api/gradle/libs.versions.toml index 4ab2c8db5..ec792e009 100644 --- a/scala/rest-api/gradle/libs.versions.toml +++ b/scala/rest-api/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" -scala-guice = "6.0.0" +scala-guice = "7.0.0" scala-uri = "4.0.3" scalatestplus = "3.2.19.1" scalatestplus-play = "7.0.1" From e9146a42b2d3966e7753de7f719070e1b8564650 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 27 Jan 2025 08:51:01 +0100 Subject: [PATCH 11/12] Dependencies with latest milestone that support jakarta.inject --- java/chatroom/build.sbt | 2 +- java/chatroom/gradle/libs.versions.toml | 2 +- java/ebean/gradle/libs.versions.toml | 4 ++-- java/ebean/project/plugins.sbt | 2 +- java/grpc/project/plugins.sbt | 2 +- java/jpa/gradle/libs.versions.toml | 2 +- java/rest-api/gradle/libs.versions.toml | 2 +- java/websocket/build.sbt | 2 +- java/websocket/gradle/libs.versions.toml | 4 ++-- scala/anorm/build.sbt | 2 +- scala/chatroom/build.sbt | 4 ++-- scala/chatroom/gradle/libs.versions.toml | 4 ++-- scala/compile-di/build.sbt | 2 +- scala/compile-di/gradle/libs.versions.toml | 2 +- scala/fileupload/build.sbt | 2 +- scala/fileupload/gradle/libs.versions.toml | 2 +- scala/forms/build.sbt | 2 +- scala/forms/gradle/libs.versions.toml | 2 +- scala/grpc/build.sbt | 2 +- scala/grpc/project/plugins.sbt | 2 +- scala/hello-world/build.sbt | 2 +- scala/hello-world/gradle/libs.versions.toml | 2 +- scala/isolated-slick/build.sbt | 2 +- scala/log4j2/build.sbt | 2 +- scala/log4j2/gradle/libs.versions.toml | 2 +- scala/macwire-di/build.sbt | 2 +- scala/macwire-di/gradle/libs.versions.toml | 2 +- scala/rest-api/build.sbt | 2 +- scala/rest-api/gradle/libs.versions.toml | 2 +- scala/secure-session/build.sbt | 2 +- scala/secure-session/gradle/libs.versions.toml | 2 +- scala/slick/build.sbt | 4 ++-- scala/starter/build.sbt | 2 +- scala/starter/gradle/libs.versions.toml | 2 +- scala/streaming/build.sbt | 2 +- scala/streaming/gradle/libs.versions.toml | 2 +- scala/tls/build.sbt | 2 +- scala/websocket/build.sbt | 4 ++-- scala/websocket/gradle/libs.versions.toml | 6 +++--- 39 files changed, 47 insertions(+), 47 deletions(-) diff --git a/java/chatroom/build.sbt b/java/chatroom/build.sbt index 52e0d62c1..9cd5e1493 100644 --- a/java/chatroom/build.sbt +++ b/java/chatroom/build.sbt @@ -9,7 +9,7 @@ lazy val root = (project in file(".")) crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( - "org.webjars" %% "webjars-play" % "3.0.1", + "org.webjars" %% "webjars-play" % "3.1.0-M1", "org.webjars" % "flot" % "0.8.3", "org.webjars" % "bootstrap" % "3.4.1", guice, diff --git a/java/chatroom/gradle/libs.versions.toml b/java/chatroom/gradle/libs.versions.toml index 40fa7637e..71ad3d43f 100644 --- a/java/chatroom/gradle/libs.versions.toml +++ b/java/chatroom/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" junit = "4.13.2" -webjars-play = "3.0.0" +webjars-play = "3.1.0-M1" flot = "0.8.3-1" bootstrap = "3.4.1" assertj = "3.27.2" diff --git a/java/ebean/gradle/libs.versions.toml b/java/ebean/gradle/libs.versions.toml index 0ca81e8a0..18f6ddcf9 100644 --- a/java/ebean/gradle/libs.versions.toml +++ b/java/ebean/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" -play-ebean = "8.3.0" -ebean = "15.1.0" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19 +play-ebean = "9.0.0-M1" +ebean = "15.8.1" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19 h2 = "2.3.232" junit = "4.13.2" assertj = "3.27.2" diff --git a/java/ebean/project/plugins.sbt b/java/ebean/project/plugins.sbt index ab069a8b4..5dc14aa4f 100644 --- a/java/ebean/project/plugins.sbt +++ b/java/ebean/project/plugins.sbt @@ -2,4 +2,4 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots") addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT") -addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.3.0") +addSbtPlugin("org.playframework" % "sbt-play-ebean" % "9.0.0-M1") diff --git a/java/grpc/project/plugins.sbt b/java/grpc/project/plugins.sbt index 1a8c5a349..a8e4ba9a2 100644 --- a/java/grpc/project/plugins.sbt +++ b/java/grpc/project/plugins.sbt @@ -1,5 +1,5 @@ enablePlugins(BuildInfoPlugin) -val playGrpcV = "0.12.1" +val playGrpcV = "0.13.0-M1" buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV) buildInfoPackage := "play.java.grpc.sample" diff --git a/java/jpa/gradle/libs.versions.toml b/java/jpa/gradle/libs.versions.toml index 139277367..6b98fe866 100644 --- a/java/jpa/gradle/libs.versions.toml +++ b/java/jpa/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" -play-ws = "3.0.0" +play-ws = "3.1.0-M4" node = "7.1.0" h2 = "2.3.232" hibernate = "6.6.4.Final" diff --git a/java/rest-api/gradle/libs.versions.toml b/java/rest-api/gradle/libs.versions.toml index 2839559b6..597f7aa64 100644 --- a/java/rest-api/gradle/libs.versions.toml +++ b/java/rest-api/gradle/libs.versions.toml @@ -7,7 +7,7 @@ h2 = "2.3.232" hibernate = "6.6.4.Final" metrics = "4.2.29" junit = "4.13.2" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] failsafe = { group = "net.jodah", name = "failsafe", version.ref = "failsafe" } diff --git a/java/websocket/build.sbt b/java/websocket/build.sbt index 357c61d95..f000aa797 100644 --- a/java/websocket/build.sbt +++ b/java/websocket/build.sbt @@ -11,7 +11,7 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( guice, ws, - "org.webjars" %% "webjars-play" % "3.0.1", + "org.webjars" %% "webjars-play" % "3.1.0-M1", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "3.3.7-1", "org.assertj" % "assertj-core" % "3.26.0" % Test, diff --git a/java/websocket/gradle/libs.versions.toml b/java/websocket/gradle/libs.versions.toml index 821e14303..e6ab69169 100644 --- a/java/websocket/gradle/libs.versions.toml +++ b/java/websocket/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" -play-ws = "3.0.0" +play-ws = "3.1.0-M4" node = "7.1.0" -webjars-play = "3.0.0" +webjars-play = "3.1.0-M1" flot = "0.8.3-1" bootstrap = "3.4.1" junit = "4.13.2" diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt index f853a22d6..7872e5c7d 100644 --- a/scala/anorm/build.sbt +++ b/scala/anorm/build.sbt @@ -14,7 +14,7 @@ lazy val root = (project in file(".")) evolutions, "com.h2database" % "h2" % "2.3.232", "org.playframework.anorm" %% "anorm" % "2.8.1", - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test, ), scalacOptions ++= List("-feature", "-Werror"), javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"), diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index 87c72dbcc..a450b451a 100644 --- a/scala/chatroom/build.sbt +++ b/scala/chatroom/build.sbt @@ -12,7 +12,7 @@ lazy val root = (project in file(".")) scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, - "org.webjars" %% "webjars-play" % "3.0.1", + "org.webjars" %% "webjars-play" % "3.1.0-M1", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "3.3.7-1", "net.logstash.logback" % "logstash-logback-encoder" % "7.3", @@ -21,7 +21,7 @@ lazy val root = (project in file(".")) "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion, "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test, "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), (Test / javaOptions) += "-Dtestserver.port=19001", scalacOptions ++= Seq( diff --git a/scala/chatroom/gradle/libs.versions.toml b/scala/chatroom/gradle/libs.versions.toml index 62fecfbdc..497a384b5 100644 --- a/scala/chatroom/gradle/libs.versions.toml +++ b/scala/chatroom/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" -webjars-play = "3.0.1" +webjars-play = "3.1.0-M1" jsoup = "1.18.3" flot = "0.8.3-1" bootstrap = "3.4.1" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" } diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt index e0bf94698..ca82e1cf8 100644 --- a/scala/compile-di/build.sbt +++ b/scala/compile-di/build.sbt @@ -8,7 +8,7 @@ lazy val root = (project in file(".")) version := "1.0-SNAPSHOT", crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, - libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1", + libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1", scalacOptions ++= List( //"-encoding", "utf8", // These three get set by Play automatically //"-deprecation", diff --git a/scala/compile-di/gradle/libs.versions.toml b/scala/compile-di/gradle/libs.versions.toml index 1134adc33..6c807bc98 100644 --- a/scala/compile-di/gradle/libs.versions.toml +++ b/scala/compile-di/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-10_2.13", version.ref = "scalatestplus" } diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt index 01e9a2800..cded8c395 100644 --- a/scala/fileupload/build.sbt +++ b/scala/fileupload/build.sbt @@ -11,7 +11,7 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( ws, guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/fileupload/gradle/libs.versions.toml b/scala/fileupload/gradle/libs.versions.toml index 1134adc33..6c807bc98 100644 --- a/scala/fileupload/gradle/libs.versions.toml +++ b/scala/fileupload/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-10_2.13", version.ref = "scalatestplus" } diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt index 3df650fa0..7bcff5b8f 100644 --- a/scala/forms/build.sbt +++ b/scala/forms/build.sbt @@ -10,7 +10,7 @@ lazy val root = (project in file(".")) scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/forms/gradle/libs.versions.toml b/scala/forms/gradle/libs.versions.toml index 1134adc33..6c807bc98 100644 --- a/scala/forms/gradle/libs.versions.toml +++ b/scala/forms/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-10_2.13", version.ref = "scalatestplus" } diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt index 0f1c3263b..63e68d4ea 100644 --- a/scala/grpc/build.sbt +++ b/scala/grpc/build.sbt @@ -69,7 +69,7 @@ val TestDeps = Seq( "org.playframework" %% "play-grpc-specs2" % BuildInfo.playGrpcVersion % Test, "org.playframework" %% "play-test" % playVersion % Test, "org.playframework" %% "play-specs2" % playVersion % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test, ) scalaVersion := "2.13.16" diff --git a/scala/grpc/project/plugins.sbt b/scala/grpc/project/plugins.sbt index 62ecf377e..df9505bce 100644 --- a/scala/grpc/project/plugins.sbt +++ b/scala/grpc/project/plugins.sbt @@ -1,5 +1,5 @@ enablePlugins(BuildInfoPlugin) -val playGrpcV = "0.12.1" +val playGrpcV = "0.13.0-M1" buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV) buildInfoPackage := "play.scala.grpc.sample" diff --git a/scala/hello-world/build.sbt b/scala/hello-world/build.sbt index feb66ac30..3080415da 100644 --- a/scala/hello-world/build.sbt +++ b/scala/hello-world/build.sbt @@ -11,7 +11,7 @@ lazy val root = (project in file(".")) scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/hello-world/gradle/libs.versions.toml b/scala/hello-world/gradle/libs.versions.toml index 1134adc33..6c807bc98 100644 --- a/scala/hello-world/gradle/libs.versions.toml +++ b/scala/hello-world/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-10_2.13", version.ref = "scalatestplus" } diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index 92ad000c1..0e8af52f6 100644 --- a/scala/isolated-slick/build.sbt +++ b/scala/isolated-slick/build.sbt @@ -97,7 +97,7 @@ lazy val root = (project in file(".")) ExclusionRule("com.fasterxml.jackson.dataformat"), ExclusionRule("com.fasterxml.jackson.datatype") ), - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), (Test / fork) := true ) diff --git a/scala/log4j2/build.sbt b/scala/log4j2/build.sbt index 76bf141f2..9c48d1a13 100644 --- a/scala/log4j2/build.sbt +++ b/scala/log4j2/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")) "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4jVersion, "org.apache.logging.log4j" % "log4j-api" % log4jVersion, "org.apache.logging.log4j" % "log4j-core" % log4jVersion, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/log4j2/gradle/libs.versions.toml b/scala/log4j2/gradle/libs.versions.toml index 4be7a6634..c2e591c6d 100644 --- a/scala/log4j2/gradle/libs.versions.toml +++ b/scala/log4j2/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" log4j = "2.23.1" [libraries] diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index 2b30bf3c4..ac16fc630 100644 --- a/scala/macwire-di/build.sbt +++ b/scala/macwire-di/build.sbt @@ -10,7 +10,7 @@ lazy val root = (project in file(".")) scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "com.softwaremill.macwire" %% "macros" % "2.6.5" % "provided", - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/macwire-di/gradle/libs.versions.toml b/scala/macwire-di/gradle/libs.versions.toml index a83b80c09..9cc5eb33f 100644 --- a/scala/macwire-di/gradle/libs.versions.toml +++ b/scala/macwire-di/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" macwire = "2.6.5" [libraries] diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index ab33b09a2..bba022c72 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -18,7 +18,7 @@ lazy val root = (project in file(".")) "net.logstash.logback" % "logstash-logback-encoder" % "7.3", "io.lemonlabs" %% "scala-uri" % "4.0.3", "net.codingwell" %% "scala-guice" % "7.0.0", - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/rest-api/gradle/libs.versions.toml b/scala/rest-api/gradle/libs.versions.toml index ec792e009..53a7ce42b 100644 --- a/scala/rest-api/gradle/libs.versions.toml +++ b/scala/rest-api/gradle/libs.versions.toml @@ -4,7 +4,7 @@ play = "3.1.0-2c77ebef-SNAPSHOT" scala-guice = "7.0.0" scala-uri = "4.0.3" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] logstash-logback-encoder = { group = "net.logstash.logback", name = "logstash-logback-encoder", version = "7.3" } diff --git a/scala/secure-session/build.sbt b/scala/secure-session/build.sbt index f79892030..9469e2fda 100644 --- a/scala/secure-session/build.sbt +++ b/scala/secure-session/build.sbt @@ -17,7 +17,7 @@ lazy val root = (project in file(".")) "com.github.jnr" % "jnr-ffi" % "2.2.16", "org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion, "org.apache.pekko" %% "pekko-cluster-typed" % pekkoVersion, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/secure-session/gradle/libs.versions.toml b/scala/secure-session/gradle/libs.versions.toml index 8b3f8aa8f..563ce72cf 100644 --- a/scala/secure-session/gradle/libs.versions.toml +++ b/scala/secure-session/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" pekko = "1.0.3" [libraries] diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt index 4d043329e..4a062d8c1 100644 --- a/scala/slick/build.sbt +++ b/scala/slick/build.sbt @@ -28,8 +28,8 @@ def sampleProject(name: String) = ), libraryDependencies ++= Seq( guice, - "org.playframework" %% "play-slick" % "6.1.0", - "org.playframework" %% "play-slick-evolutions" % "6.1.0", + "org.playframework" %% "play-slick" % "7.0.0-M1", + "org.playframework" %% "play-slick-evolutions" % "7.0.0-M1", "com.h2database" % "h2" % "2.2.224", specs2 % Test, ), diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt index 29fd3aa2e..8ea12f272 100644 --- a/scala/starter/build.sbt +++ b/scala/starter/build.sbt @@ -11,7 +11,7 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( guice, "com.h2database" % "h2" % "2.2.224", - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test, ), scalacOptions ++= Seq( "-feature", diff --git a/scala/starter/gradle/libs.versions.toml b/scala/starter/gradle/libs.versions.toml index 1134adc33..6c807bc98 100644 --- a/scala/starter/gradle/libs.versions.toml +++ b/scala/starter/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-10_2.13", version.ref = "scalatestplus" } diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt index ba0203b85..b09a01175 100644 --- a/scala/streaming/build.sbt +++ b/scala/streaming/build.sbt @@ -11,7 +11,7 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( guice, ws % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( "-feature", diff --git a/scala/streaming/gradle/libs.versions.toml b/scala/streaming/gradle/libs.versions.toml index 1134adc33..6c807bc98 100644 --- a/scala/streaming/gradle/libs.versions.toml +++ b/scala/streaming/gradle/libs.versions.toml @@ -2,7 +2,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-10_2.13", version.ref = "scalatestplus" } diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt index 9239b6aa5..6c87eee1b 100644 --- a/scala/tls/build.sbt +++ b/scala/tls/build.sbt @@ -35,7 +35,7 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( ws, guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test, ) ) .aggregate(one, two) diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt index 1085a9d99..4dcfa9269 100644 --- a/scala/websocket/build.sbt +++ b/scala/websocket/build.sbt @@ -11,10 +11,10 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( guice, ws, - "org.webjars" %% "webjars-play" % "3.0.1", + "org.webjars" %% "webjars-play" % "3.1.0-M1", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "3.3.7-1", - "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test, "org.awaitility" % "awaitility" % "4.2.1" % Test, ), TwirlKeys.templateImports ++= Seq( diff --git a/scala/websocket/gradle/libs.versions.toml b/scala/websocket/gradle/libs.versions.toml index d7f1ec17b..5c87c1215 100644 --- a/scala/websocket/gradle/libs.versions.toml +++ b/scala/websocket/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" -play-ws = "3.0.0" +play-ws = "3.1.0-M4" scalatestplus = "3.2.19.1" -scalatestplus-play = "7.0.1" +scalatestplus-play = "8.0.0-M1" flot = "0.8.3-1" bootstrap = "3.4.1" -webjars-play = "3.0.0" +webjars-play = "3.1.0-M1" awaitility = "4.2.2" node = "7.1.0" From 793b16e77d14e9fee3198d5a5a46344972ec170d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 27 Jan 2025 10:19:23 +0100 Subject: [PATCH 12/12] macwire 2.6.6 supports jakarta.inject now --- scala/macwire-di/build.sbt | 2 +- scala/macwire-di/gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index ac16fc630..02064f7d7 100644 --- a/scala/macwire-di/build.sbt +++ b/scala/macwire-di/build.sbt @@ -9,7 +9,7 @@ lazy val root = (project in file(".")) crossScalaVersions := Seq("2.13.16", "3.3.4"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( - "com.softwaremill.macwire" %% "macros" % "2.6.5" % "provided", + "com.softwaremill.macwire" %% "macros" % "2.6.6" % "provided", "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M1" % Test ), scalacOptions ++= Seq( diff --git a/scala/macwire-di/gradle/libs.versions.toml b/scala/macwire-di/gradle/libs.versions.toml index 9cc5eb33f..e7a53ca54 100644 --- a/scala/macwire-di/gradle/libs.versions.toml +++ b/scala/macwire-di/gradle/libs.versions.toml @@ -3,7 +3,7 @@ twirl = "2.0.7" play = "3.1.0-2c77ebef-SNAPSHOT" scalatestplus = "3.2.19.1" scalatestplus-play = "8.0.0-M1" -macwire = "2.6.5" +macwire = "2.6.6" [libraries] macwire = { group = "com.softwaremill.macwire", name = "macros_2.13", version.ref = "macwire" }