Skip to content

Commit fdae22a

Browse files
mkurzmkurz
authored
Merge pull request #939 from mkurz/upgrades
Upgrades
2 parents 70155e2 + 57a88aa commit fdae22a

File tree

150 files changed

+381
-250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+381
-250
lines changed

‎.github/workflows/build-test.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
scala: 2.13.x, 3.x
7575
gradle-build-root: java/chatroom
7676
add-dimensions: >-
77-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
77+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
7878
cmd: |
7979
./test.sh --sample=java/chatroom --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
8080
@@ -88,7 +88,7 @@ jobs:
8888
scala: 2.13.x, 3.x
8989
gradle-build-root: java/compile-di
9090
add-dimensions: >-
91-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
91+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
9292
cmd: |
9393
./test.sh --sample=java/compile-di --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
9494
@@ -102,7 +102,7 @@ jobs:
102102
scala: 2.13.x, 3.x
103103
gradle-build-root: java/dagger2
104104
add-dimensions: >-
105-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
105+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
106106
cmd: |
107107
./test.sh --sample=java/dagger2 --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
108108
@@ -116,7 +116,7 @@ jobs:
116116
scala: 2.13.x, 3.x
117117
gradle-build-root: java/ebean
118118
add-dimensions: >-
119-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
119+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
120120
cmd: |
121121
./test.sh --sample=java/ebean --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
122122
@@ -130,7 +130,7 @@ jobs:
130130
scala: 2.13.x, 3.x
131131
gradle-build-root: java/fileupload
132132
add-dimensions: >-
133-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
133+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
134134
cmd: |
135135
./test.sh --sample=java/fileupload --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
136136
@@ -144,7 +144,7 @@ jobs:
144144
scala: 2.13.x, 3.x
145145
gradle-build-root: java/forms
146146
add-dimensions: >-
147-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
147+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
148148
cmd: |
149149
./test.sh --sample=java/forms --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
150150
@@ -172,7 +172,7 @@ jobs:
172172
scala: 2.13.x, 3.x
173173
gradle-build-root: java/hello-world
174174
add-dimensions: >-
175-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
175+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
176176
cmd: |
177177
./test.sh --sample=java/hello-world --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
178178
@@ -186,7 +186,7 @@ jobs:
186186
scala: 2.13.x, 3.x
187187
gradle-build-root: java/jpa
188188
add-dimensions: >-
189-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
189+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
190190
cmd: |
191191
./test.sh --sample=java/jpa --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
192192
@@ -200,7 +200,7 @@ jobs:
200200
scala: 2.13.x, 3.x
201201
gradle-build-root: java/pekko-cluster
202202
add-dimensions: >-
203-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
203+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
204204
cmd: |
205205
./test.sh --sample=java/pekko-cluster --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
206206
@@ -214,7 +214,7 @@ jobs:
214214
scala: 2.13.x, 3.x
215215
gradle-build-root: java/rest-api
216216
add-dimensions: >-
217-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
217+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
218218
cmd: |
219219
./test.sh --sample=java/rest-api --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
220220
@@ -228,7 +228,7 @@ jobs:
228228
scala: 2.13.x, 3.x
229229
gradle-build-root: java/starter
230230
add-dimensions: >-
231-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
231+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
232232
cmd: |
233233
./test.sh --sample=java/starter --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
234234
@@ -242,7 +242,7 @@ jobs:
242242
scala: 2.13.x, 3.x
243243
gradle-build-root: java/streaming
244244
add-dimensions: >-
245-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
245+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
246246
cmd: |
247247
./test.sh --sample=java/streaming --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
248248
@@ -256,7 +256,7 @@ jobs:
256256
scala: 2.13.x, 3.x
257257
gradle-build-root: java/websocket
258258
add-dimensions: >-
259-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
259+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
260260
cmd: |
261261
./test.sh --sample=java/websocket --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
262262
@@ -284,7 +284,7 @@ jobs:
284284
scala: 2.13.x, 3.x
285285
gradle-build-root: scala/chatroom
286286
add-dimensions: >-
287-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
287+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
288288
cmd: |
289289
./test.sh --sample=scala/chatroom --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
290290
@@ -298,7 +298,7 @@ jobs:
298298
scala: 2.13.x, 3.x
299299
gradle-build-root: scala/compile-di
300300
add-dimensions: >-
301-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
301+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
302302
cmd: |
303303
./test.sh --sample=scala/compile-di --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
304304
@@ -312,7 +312,7 @@ jobs:
312312
scala: 2.13.x, 3.x
313313
gradle-build-root: scala/fileupload
314314
add-dimensions: >-
315-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
315+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
316316
cmd: |
317317
./test.sh --sample=scala/fileupload --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
318318
@@ -326,7 +326,7 @@ jobs:
326326
scala: 2.13.x, 3.x
327327
gradle-build-root: scala/forms
328328
add-dimensions: >-
329-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
329+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
330330
cmd: |
331331
./test.sh --sample=scala/forms --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
332332
@@ -354,7 +354,7 @@ jobs:
354354
scala: 2.13.x, 3.x
355355
gradle-build-root: scala/hello-world
356356
add-dimensions: >-
357-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
357+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
358358
cmd: |
359359
./test.sh --sample=scala/hello-world --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
360360
@@ -382,7 +382,7 @@ jobs:
382382
scala: 2.13.x, 3.x
383383
gradle-build-root: scala/log4j2
384384
add-dimensions: >-
385-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
385+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
386386
cmd: |
387387
./test.sh --sample=scala/log4j2 --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
388388
@@ -396,7 +396,7 @@ jobs:
396396
scala: 2.13.x, 3.x
397397
gradle-build-root: scala/macwire-di
398398
add-dimensions: >-
399-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
399+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
400400
cmd: |
401401
./test.sh --sample=scala/macwire-di --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
402402
@@ -410,7 +410,7 @@ jobs:
410410
scala: 2.13.x, 3.x
411411
gradle-build-root: scala/rest-api
412412
add-dimensions: >-
413-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
413+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
414414
cmd: |
415415
./test.sh --sample=scala/rest-api --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
416416
@@ -424,7 +424,7 @@ jobs:
424424
scala: 2.13.x, 3.x
425425
gradle-build-root: scala/secure-session
426426
add-dimensions: >-
427-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
427+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
428428
cmd: |
429429
./test.sh --sample=scala/secure-session --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
430430
@@ -452,7 +452,7 @@ jobs:
452452
scala: 2.13.x, 3.x
453453
gradle-build-root: scala/starter
454454
add-dimensions: >-
455-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
455+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
456456
cmd: |
457457
./test.sh --sample=scala/starter --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
458458
@@ -466,7 +466,7 @@ jobs:
466466
scala: 2.13.x, 3.x
467467
gradle-build-root: scala/streaming
468468
add-dimensions: >-
469-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
469+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
470470
cmd: |
471471
./test.sh --sample=scala/streaming --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
472472
@@ -494,7 +494,7 @@ jobs:
494494
scala: 2.13.x, 3.x
495495
gradle-build-root: scala/websocket
496496
add-dimensions: >-
497-
{ "server": [ "pekko", "netty"], "build_tool": ["sbt", "gradle"] }
497+
{ "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
498498
cmd: |
499499
./test.sh --sample=scala/websocket --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
500500

‎java/chatroom/app/views/index.scala.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88

9-
@webJarsUtil.locate("bootstrap.min.css").css()
10-
@webJarsUtil.locate("bootstrap-theme.min.css").css()
9+
@webJarsUtil.locate("bootstrap", "css/bootstrap.min.css").css()
10+
@webJarsUtil.locate("bootstrap", "css/bootstrap-theme.min.css").css()
1111

1212
<link rel="stylesheet" media="screen" href="@routes.Assets.at("stylesheets/main.css")">
1313
<link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/favicon.png")">
@@ -46,7 +46,7 @@ <h1 class="">Chat Room</h1>
4646
</div>
4747
</div>
4848

49-
@webJarsUtil.locate("jquery.min.js").script()
49+
@webJarsUtil.locate("jquery", "jquery.min.js").script()
5050

5151
<script language="javascript">
5252
var $messages = $("#messages"),

‎java/chatroom/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ lazy val root = (project in file("."))
66
.settings(
77
name := """play-java-chatroom-example""",
88
version := "1.0-SNAPSHOT",
9-
crossScalaVersions := Seq("2.13.17", "3.3.7"),
9+
crossScalaVersions := Seq("2.13.18", "3.8.3"),
1010
scalaVersion := crossScalaVersions.value.head,
1111
libraryDependencies ++= Seq(
12-
"org.webjars" %% "webjars-play" % "3.1.0-M1",
12+
"org.webjars" %% "webjars-play" % "3.1.0-M5",
1313
"org.webjars" % "flot" % "0.8.3",
1414
"org.webjars" % "bootstrap" % "3.4.1",
1515
guice,

‎java/chatroom/gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
twirl = "2.1.0-M5"
3-
play = "3.1.0-M4"
2+
twirl = "2.1.0-M9"
3+
play = "3.1.0-M7"
44
junit = "4.13.2"
5-
webjars-play = "3.1.0-M1"
5+
webjars-play = "3.1.0-M5"
66
flot = "0.8.3-1"
77
bootstrap = "3.4.1"
88
assertj = "3.27.7"

‎java/chatroom/project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.3
1+
sbt.version=1.12.9

‎java/chatroom/project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// The Play plugin
22
resolvers += Resolver.sonatypeCentralSnapshots
3-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")
3+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M7")

‎java/compile-di/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version := "1.0-SNAPSHOT"
77
lazy val root = (project in file(".")).enablePlugins(PlayJava)
88
//.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
99

10-
crossScalaVersions := Seq("2.13.17", "3.3.7")
10+
crossScalaVersions := Seq("2.13.18", "3.8.3")
1111

1212
scalaVersion := crossScalaVersions.value.head
1313

‎java/compile-di/gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
play = "3.1.0-M4"
2+
play = "3.1.0-M7"
33
junit = "4.13.2"
44

55
[libraries]

‎java/compile-di/project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.3
1+
sbt.version=1.12.9

‎java/compile-di/project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
resolvers += Resolver.sonatypeCentralSnapshots
2-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")
2+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M7")

0 commit comments

Comments
 (0)