Skip to content

Commit 7fce4f9

Browse files
authored
Merge pull request #460 from sjrd/prepare-for-scala-3.8
Prepare for Scala 3.8.
2 parents baf399c + 746da70 commit 7fce4f9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
- uses: actions/checkout@v3.0.2
1111
with:
1212
fetch-depth: 0
13-
- name: Set up JDK 8
13+
- name: Set up JDK 17
1414
uses: coursier/setup-action@v1
1515
with:
16-
jvm: temurin:1.8
16+
jvm: temurin:1.17
1717
apps: sbt
1818
- name: sbt ci-release
1919
run: sbt versionCheck ci-release

.github/workflows/scala.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
java: [ '8', '11', '17', '21' ]
13+
java: [ '17', '21' ]
1414

1515
runs-on: ubuntu-latest
1616

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.scalajs.jsenv.nodejs.NodeJSEnv
55

66
val usedScalaCompiler = "3.7.1"
77
val usedTastyRelease = usedScalaCompiler
8-
val scala2Version = "2.13.16"
8+
val scala2Version = "2.13.18"
99

1010
val SourceDeps = config("sourcedeps").hide
1111

@@ -37,7 +37,7 @@ inThisBuild(Def.settings(
3737
Developer("sjrd", "Sébastien Doeraene", "sjrdoeraene@gmail.com", url("https://github.com/sjrd/")),
3838
Developer("bishabosha", "Jamie Thompson", "bishbashboshjt@gmail.com", url("https://github.com/bishabosha")),
3939
),
40-
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
40+
versionPolicyIntention := Compatibility.BinaryCompatible,
4141
// Ignore dependencies to internal modules whose version is like `1.2.3+4...` (see https://github.com/scalacenter/sbt-version-policy#how-to-integrate-with-sbt-dynver)
4242
versionPolicyIgnoredInternalDependencyVersions := Some("^\\d+\\.\\d+\\.\\d+\\+\\d+".r)
4343
))

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.2")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4")
44

0 commit comments

Comments
 (0)