Skip to content

Commit e912d3c

Browse files
authored
Merge pull request #467 from scala-js/topic/sbt15
Use sbt 1.5 on 1.x branch
2 parents cf3c530 + 4173c7d commit e912d3c

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/ci.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: CI
2+
23
on:
3-
push:
4-
branches:
5-
- master
64
pull_request:
7-
branches:
8-
- master
5+
push:
6+
tags-ignore:
7+
- v*
8+
99
jobs:
10+
1011
build:
1112
runs-on: ubuntu-latest
1213
strategy:
@@ -33,6 +34,7 @@ jobs:
3334
run: sbt "++${{ matrix.scalaversion }}" example/compile
3435
- name: scalafmt
3536
run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
37+
3638
readme:
3739
runs-on: ubuntu-latest
3840
steps:

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ lazy val root = project.in(file(".")).
55

66
name := "Scala.js DOM"
77

8-
crossScalaVersions in ThisBuild := {
8+
ThisBuild / crossScalaVersions := {
99
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
1010
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
1111
}
12-
scalaVersion in ThisBuild := crossScalaVersions.value.head
12+
ThisBuild / scalaVersion := crossScalaVersions.value.head
1313

1414
val commonSettings = Seq(
1515
version := "1.2.0-SNAPSHOT",
@@ -114,7 +114,7 @@ lazy val readme = ScalatexReadme(
114114
).settings(
115115
scalaVersion := "2.12.10",
116116
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
117-
(resources in Compile) += (fullOptJS in (example, Compile)).value.data
117+
(Compile / resources) += (example / Compile / fullOptJS).value.data
118118
)
119119

120120
lazy val example = project.

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.8
1+
sbt.version=1.5.5

0 commit comments

Comments
 (0)