Merge pull request #493 from playframework/mergify/bp/2.9.x/pr-352

[2.9.x] Re-enable sbt-rjs and disable http port in an example (backport #352) by @mkurz
playframework · Jan 10, 2024 · 413a8cd · 413a8cd
2 parents 9d48c6a + 6b382e5
commit 413a8cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/play-java-jpa-example/project/plugins.sbt b/play-java-jpa-example/project/plugins.sbt
@@ -5,7 +5,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-jshint" % "1.0.6")
-// addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.10")
+addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.10")
 addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4")
 addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.1.2")
 addSbtPlugin("io.github.irundaia" % "sbt-sassify" % "1.5.2")
diff --git a/play-scala-tls-example/test/integration/GuiceOneHttpsServerPerTest.scala b/play-scala-tls-example/test/integration/GuiceOneHttpsServerPerTest.scala
@@ -45,7 +45,7 @@ trait GuiceOneHttpsServerPerTest extends TestSuiteMixin with ServerProvider with
     synchronized { privateApp = newAppForTest(test) }
 
     val testServer = new TestServer(
-      ServerConfig(port = Some(0), sslPort = Some(httpsPort), mode = Mode.Test, rootDir = app.path),
+      ServerConfig(port = None, sslPort = Some(httpsPort), mode = Mode.Test, rootDir = app.path),
       app,
       None
     )