Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9f83dab

Browse files
committedOct 13, 2024
Update Scala patch versions, sbt (1.2.8 -> 1.10.2) and plugins
1 parent 8dc20aa commit 9f83dab

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed
 

‎.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
scalaversion: ["2.11.12", "2.12.10", "2.13.1"]
15+
scalaversion: ["2.12.20", "2.13.15"]
1616
browser: ["chrome"]
1717
include:
18-
- scalaversion: "2.12.10"
18+
- scalaversion: "2.12.20"
1919
browser: "firefox"
2020
env:
2121
SJS_TEST_BROWSER: ${{ matrix.browser }}
@@ -29,10 +29,10 @@ jobs:
2929
run: >
3030
sbt "++${{ matrix.scalaversion }}"
3131
seleniumJSEnv/scalastyle
32-
seleniumJSEnv/test:scalastyle
32+
seleniumJSEnv/Test/scalastyle
3333
seleniumJSEnvTest/scalastyle
34-
seleniumJSHttpEnvTest/test:scalastyle
35-
seleniumJSEnvTest/test:scalastyle
34+
seleniumJSHttpEnvTest/Test/scalastyle
35+
seleniumJSEnvTest/Test/scalastyle
3636
- name: MiMa
3737
run: sbt "++${{ matrix.scalaversion }}" seleniumJSEnv/mimaReportBinaryIssues
3838
- name: Unit tests

‎build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ val newScalaBinaryVersionsInThisRelease: Set[String] =
1515
val commonSettings: Seq[Setting[_]] = Seq(
1616
version := "1.1.2-SNAPSHOT",
1717
organization := "org.scala-js",
18-
scalaVersion := "2.11.12",
19-
crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.1"),
18+
scalaVersion := "2.12.20",
19+
crossScalaVersions := Seq("2.12.20", "2.13.15"),
2020
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
2121

2222
homepage := Some(url("http://scala-js.org/")),
@@ -117,7 +117,7 @@ lazy val seleniumJSEnv: Project = project.
117117
pomIncludeRepository := { _ => false },
118118

119119
// The chrome driver seems to not deal with parallelism very well (#47).
120-
parallelExecution in Test := false
120+
(Test / parallelExecution) := false
121121
)
122122

123123
lazy val seleniumJSEnvTest: Project = 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.10.2

‎project/build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
22

3-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
3+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
44

55
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")
66

@@ -11,12 +11,12 @@ addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")
1111
libraryDependencies ~=
1212
("org.seleniumhq.selenium" % "selenium-server" % "3.141.59" +: _)
1313

14-
unmanagedSourceDirectories in Compile ++= {
14+
Compile / unmanagedSourceDirectories ++= {
1515
val root = baseDirectory.value.getParentFile
1616
Seq(root / "seleniumJSEnv/src/main/scala")
1717
}
1818

19-
sources in Compile += {
19+
Compile / sources += {
2020
val root = baseDirectory.value.getParentFile
2121
root / "seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/TestCapabilities.scala"
2222
}

0 commit comments

Comments
 (0)
Please sign in to comment.