Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to latest Play snapshot that upgrades to guice 7 #799

Merged
merged 12 commits into from
Jan 27, 2025
2 changes: 1 addition & 1 deletion java/chatroom/app/controllers/HomeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions java/chatroom/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ 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.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,
Expand Down
4 changes: 2 additions & 2 deletions java/chatroom/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[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"
webjars-play = "3.1.0-M1"
flot = "0.8.3-1"
bootstrap = "3.4.1"
assertj = "3.27.2"
Expand Down
2 changes: 1 addition & 1 deletion java/chatroom/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion java/chatroom/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion java/compile-di/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4")

scalaVersion := crossScalaVersions.value.head

Expand Down
2 changes: 1 addition & 1 deletion java/compile-di/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
play = "3.1.0-d1f1b9f8-SNAPSHOT"
play = "3.1.0-2c77ebef-SNAPSHOT"
junit = "4.13.2"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion java/compile-di/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion java/compile-di/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion java/dagger2/app/controllers/TimeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/dagger2/app/dagger/ApplicationComponent.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dagger;

import javax.inject.Singleton;
import jakarta.inject.Singleton;

/**
* The application component that specifies all the modules backing
Expand Down
2 changes: 1 addition & 1 deletion java/dagger2/app/dagger/MyComponentsFromContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/dagger2/app/filters/LoggingFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion java/dagger2/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies ++= Seq(
ws,
Expand Down
2 changes: 1 addition & 1 deletion java/dagger2/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion java/dagger2/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion java/dagger2/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion java/ebean/app/controllers/HomeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/ebean/app/repository/CompanyRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/ebean/app/repository/ComputerRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion java/ebean/app/repository/DatabaseExecutionContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion java/ebean/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies ++= Seq(
guice,
Expand Down
6 changes: 3 additions & 3 deletions java/ebean/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
twirl = "2.0.7"
play = "3.1.0-d1f1b9f8-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 = "3.1.0-2c77ebef-SNAPSHOT"
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"
Expand Down
2 changes: 1 addition & 1 deletion java/ebean/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
4 changes: 2 additions & 2 deletions java/ebean/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
addSbtPlugin("org.playframework" % "sbt-play-ebean" % "9.0.0-M1")
4 changes: 2 additions & 2 deletions java/fileupload/app/controllers/HomeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/fileupload/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies += guice,
testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
Expand Down
2 changes: 1 addition & 1 deletion java/fileupload/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion java/fileupload/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion java/fileupload/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
4 changes: 2 additions & 2 deletions java/forms/app/controllers/WidgetController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/forms/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4")

scalaVersion := crossScalaVersions.value.head

Expand Down
2 changes: 1 addition & 1 deletion java/forms/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion java/forms/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion java/forms/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion java/grpc/app/controllers/HomeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions java/grpc/app/routers/HelloWorldRouter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions java/grpc/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
2 changes: 1 addition & 1 deletion java/grpc/docs/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
paradoxTheme := Some(builtinParadoxTheme("generic"))

scalaVersion := "2.13.14"
scalaVersion := "2.13.16"

2 changes: 1 addition & 1 deletion java/grpc/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
4 changes: 2 additions & 2 deletions java/grpc/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(BuildInfoPlugin)
val playGrpcV = "0.12.1"
val playGrpcV = "0.13.0-M1"
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")

Expand Down
2 changes: 1 addition & 1 deletion java/hello-world/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4")

scalaVersion := crossScalaVersions.value.head

Expand Down
2 changes: 1 addition & 1 deletion java/hello-world/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion java/hello-world/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion java/hello-world/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion java/jpa/app/controllers/PersonController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion java/jpa/app/models/DatabaseExecutionContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion java/jpa/app/models/JPAPersonRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion java/jpa/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies ++= Seq(
guice,
Expand Down
4 changes: 2 additions & 2 deletions java/jpa/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
twirl = "2.0.7"
play = "3.1.0-d1f1b9f8-SNAPSHOT"
play-ws = "3.0.0"
play = "3.1.0-2c77ebef-SNAPSHOT"
play-ws = "3.1.0-M4"
node = "7.1.0"
h2 = "2.3.232"
hibernate = "6.6.4.Final"
Expand Down
Loading
Loading