Merge pull request #119 from mkurz/play-2-9-0-adjustments

Some adjustments

.travis.yml

@@ -5,7 +5,7 @@ scala:
 - 3.3.1
 
 env:
-  - TRAVIS_JDK=21
+  - TRAVIS_JDK=11
 
 before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
 install: jabba install $(jabba ls-remote "adopt@~1.$TRAVIS_JDK.0-0" --latest=patch) && jabba use "$_" && java -Xmx32m -version

code/build.sbt

@@ -2,8 +2,6 @@ name := "deadbolt-java"
 
 lazy val root = (project in file(".")).enablePlugins(PlayWeb).disablePlugins(PlayFilters, PlayLogback, PlayAkkaHttpServer)
 
-version := "2.9.0"
-
 crossScalaVersions := Seq("2.13.12", "3.3.1")
 
 scalaVersion := crossScalaVersions.value.head
@@ -22,12 +20,10 @@ releasePublishArtifactsAction := PgpKeys.publishSigned.value
 javacOptions += "-Xlint:deprecation"
 scalacOptions += "-deprecation"
 
-resolvers += Resolver.sonatypeRepo("snapshots")
-
 TwirlKeys.templateImports ++= Seq(
   "java.util.Optional"
 )
 Test / TwirlKeys.templateImports ++= Seq(
   "java.util.List",
   "play.core.j.PlayMagicForJava._",
-)
+)

code/project/plugins.sbt

@@ -1,7 +1,3 @@
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
-
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
-
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
-
-resolvers ++= Resolver.sonatypeOssRepos("snapshots")

code/version.sbt

@@ -1 +1 @@
-version in ThisBuild := "2.8.2-SNAPSHOT"
+version in ThisBuild := "2.9.0-SNAPSHOT"

test-app-filters/build.sbt

@@ -1,4 +1,3 @@
-
 name := """test-app-filters"""
 
 version := "2.9.0-SNAPSHOT"
@@ -15,7 +14,7 @@ scalacOptions += "-deprecation"
 
 libraryDependencies ++= Seq(
   guice,
-  "be.objectify" %% "deadbolt-java" % "2.9.0",
+  "be.objectify" %% "deadbolt-java" % "2.9.0-SNAPSHOT",
   "io.rest-assured" % "rest-assured" % "5.3.2" % Test
 )
 

test-app-filters/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("playTestVersion", "2.9.0"))
 
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")

test-app/build.sbt

@@ -14,7 +14,7 @@ scalacOptions += "-deprecation"
 
 libraryDependencies ++= Seq(
   guice,
-  "be.objectify" %% "deadbolt-java" % "2.9.0",
+  "be.objectify" %% "deadbolt-java" % "2.9.0-SNAPSHOT",
   "io.rest-assured" % "rest-assured" % "5.3.2" % Test
 )
 

test-app/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("playTestVersion", "2.9.0"))
 
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")