From 7ab4bd8005df2784d6a14be564ef50897639d1e1 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 10 Jan 2024 14:07:52 +0100 Subject: [PATCH] Re-enable sbt-rjs and disable http port an example --- play-java-jpa-example/project/plugins.sbt | 2 +- .../test/integration/GuiceOneHttpsServerPerTest.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/play-java-jpa-example/project/plugins.sbt b/play-java-jpa-example/project/plugins.sbt index c3f4a7c38..fe3f78964 100644 --- a/play-java-jpa-example/project/plugins.sbt +++ b/play-java-jpa-example/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.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 index 073831cb2..43da3a110 100644 --- 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 )