From 08e5b8b56e121e54de9cf15ae232adf943b684ba Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Wed, 15 Nov 2023 21:24:34 +0900 Subject: [PATCH] fix build error --- .github/workflows/ci.yml | 5 +++-- build.sbt | 4 ---- .../sbt-web-scalajs-bundler/play/project/plugins.sbt | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f31bbf2..51d7259d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,10 @@ jobs: steps: - uses: actions/checkout@v2 - uses: coursier/cache-action@v5 - - uses: coursier/setup-action@v1 + - uses: actions/setup-java@v3 with: - jvm: adopt:11 + java-version: "11" + distribution: "adopt" - uses: actions/setup-node@v3 with: node-version: 16.14.2 diff --git a/build.sbt b/build.sbt index 8e4a6041..d4d56680 100644 --- a/build.sbt +++ b/build.sbt @@ -32,8 +32,6 @@ val `sbt-web-scalajs-bundler` = .settings(commonSettings) .settings( // sbt-web-scalajs does not support sbt 1.2.x - crossSbtVersions := List("1.3.0"), - sbtVersion in pluginCrossBuild := "1.3.0", scriptedDependencies := { val () = scriptedDependencies.value val () = publishLocal.value @@ -121,8 +119,6 @@ lazy val commonSettings = List( "-Dsbt.execute.extrachecks=true" // Avoid any deadlocks. ), scriptedBufferLog := false, - crossSbtVersions := List("1.2.8"), - sbtVersion in pluginCrossBuild := "1.2.8", ) lazy val noPublishSettings = diff --git a/sbt-web-scalajs-bundler/src/sbt-test/sbt-web-scalajs-bundler/play/project/plugins.sbt b/sbt-web-scalajs-bundler/src/sbt-test/sbt-web-scalajs-bundler/play/project/plugins.sbt index 8d066330..ac035823 100644 --- a/sbt-web-scalajs-bundler/src/sbt-test/sbt-web-scalajs-bundler/play/project/plugins.sbt +++ b/sbt-web-scalajs-bundler/src/sbt-test/sbt-web-scalajs-bundler/play/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler" % scalaJSBundlerVersion) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")