From 6b692f905a94e1f8581351f49581ef2c4fd71d03 Mon Sep 17 00:00:00 2001 From: Vincent Munier Date: Fri, 24 Nov 2023 12:39:54 +0000 Subject: [PATCH] Upgrade to latest libs (#153) --- .github/workflows/ci.yml | 4 ++-- build.sbt | 9 ++++++--- project/build.properties | 2 +- project/plugins.sbt | 8 ++++---- src/main/g8/build.sbt | 9 +++++---- src/main/g8/project/build.properties | 2 +- src/main/g8/project/plugins.sbt | 8 ++++---- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 421ed07..29a01a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - run: ./ci/checksourcemaps.sh diff --git a/build.sbt b/build.sbt index 27388e2..9db77f0 100644 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,12 @@ name := "akka-http-scalajs.g8" enablePlugins(ScriptedPlugin) +resolvers += "Akka library repository".at("https://repo.akka.io/maven") + // add the below dependencies in the template build, so that Scala Steward can update versions in the giter8 template libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-http" % "10.5.2", - "com.typesafe.akka" %% "akka-stream" % "2.8.5", - "org.scala-js" %%% "scalajs-dom" % "2.6.0" + "com.typesafe.akka" %% "akka-http" % "10.6.0", + "com.typesafe.akka" %% "akka-stream" % "2.9.0", + "com.vmunier" %% "scalajs-scripts" % "1.3.0", + "org.scala-js" %%% "scalajs-dom" % "2.8.0" ) diff --git a/project/build.properties b/project/build.properties index 2743082..e8a1e24 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.6 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index a132215..30b1db8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,10 +4,10 @@ addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } // add the below dependencies in the template build, so that Scala Steward can update versions in the giter8 template -addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.2.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") +addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") -addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1") +addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index d5b28c9..5c62978 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -11,10 +11,11 @@ lazy val server = project Assets / pipelineStages := Seq(scalaJSPipeline), // triggers scalaJSPipeline when using compile or continuous compilation Compile / compile := ((Compile / compile) dependsOn scalaJSPipeline).value, + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-http" % "10.5.2", - "com.typesafe.akka" %% "akka-stream" % "2.8.5", - "com.vmunier" %% "scalajs-scripts" % "1.2.0" + "com.typesafe.akka" %% "akka-http" % "10.6.0", + "com.typesafe.akka" %% "akka-stream" % "2.9.0", + "com.vmunier" %% "scalajs-scripts" % "1.3.0" ), Assets / WebKeys.packagePrefix := "public/", Runtime / managedClasspath += (Assets / packageBin).value @@ -25,7 +26,7 @@ lazy val server = project lazy val client = project .settings( scalaJSUseMainModuleInitializer := true, - libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.6.0" + libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0" ) .enablePlugins(ScalaJSPlugin, ScalaJSWeb) .dependsOn(shared.js) diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 2743082..e8a1e24 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.6 +sbt.version=1.9.7 diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index 765e807..e45107e 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -1,7 +1,7 @@ -addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.2.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") +addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") -addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1") +addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")