Skip to content

Commit 2943189

Browse files
authored
Merge pull request #422 from ptrdom/drop-appveyor
Drop AppVeyor
2 parents 8bd7b4f + b818fb9 commit 2943189

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ on:
88
- main
99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
os: [ubuntu-latest, windows-latest]
14+
runs-on: ${{ matrix.os }}
1215
steps:
1316
- uses: actions/checkout@v2
14-
- uses: olafurpg/setup-scala@v12
15-
with:
16-
java-version: "[email protected]"
1717
- uses: coursier/cache-action@v5
18+
- uses: coursier/setup-action@v1
19+
with:
20+
jvm: adopt:11
1821
- uses: actions/setup-node@v3
1922
with:
2023
node-version: 16.14.2

appveyor.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

sbt-web-scalajs-bundler/src/sbt-test/sbt-web-scalajs-bundler/play/build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ val client =
22
project.in(file("client"))
33
.enablePlugins(ScalaJSBundlerPlugin)
44
.settings(
5-
scalaVersion := "2.13.2",
5+
// Required to solve https://github.com/scala/bug/issues/11955
6+
scalaVersion := "2.13.4",
67
scalaJSUseMainModuleInitializer := true,
78
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.0.0",
89
npmDependencies in Compile ++= Seq(
@@ -18,7 +19,8 @@ val server =
1819
.enablePlugins(PlayScala, WebScalaJSBundlerPlugin)
1920
.disablePlugins(PlayLayoutPlugin)
2021
.settings(
21-
scalaVersion := "2.13.2",
22+
// Required to solve https://github.com/scala/bug/issues/11955
23+
scalaVersion := "2.13.4",
2224
libraryDependencies ++= Seq(
2325
"com.vmunier" %% "scalajs-scripts" % "1.1.4",
2426
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test

0 commit comments

Comments
 (0)