Skip to content

Commit

Permalink
Merge pull request #470 from xuwei-k/remove-coursier-setup-action
Browse files Browse the repository at this point in the history
fix build error
  • Loading branch information
sjrd authored Dec 4, 2023
2 parents 3d7106a + 08e5b8b commit 4b726fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

0 comments on commit 4b726fc

Please sign in to comment.