Skip to content

Commit f07411f

Browse files
authored
Merge pull request #34 from scala-steward/update/sbt-spiewak-sonatype-0.23.0
2 parents 3949ce7 + 4ee334d commit f07411f

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
os: [ubuntu-latest]
2929
scala: [2.11.12, 2.12.14, 2.13.6, 3.0.2]
30-
java: [adopt@1.8]
30+
java: [temurin@11]
3131
ci: [ciNode, ciFirefox, ciChrome, ciJSDOMNodeJS]
3232
runs-on: ${{ matrix.os }}
3333
steps:
@@ -36,10 +36,12 @@ jobs:
3636
with:
3737
fetch-depth: 0
3838

39-
- name: Setup Java and Scala
40-
uses: olafurpg/setup-scala@v13
39+
- name: Setup Java (temurin@11)
40+
if: matrix.java == 'temurin@11'
41+
uses: actions/setup-java@v2
4142
with:
42-
java-version: ${{ matrix.java }}
43+
distribution: temurin
44+
java-version: 11
4345

4446
- name: Cache sbt
4547
uses: actions/cache@v2
@@ -76,18 +78,20 @@ jobs:
7678
matrix:
7779
os: [ubuntu-latest]
7880
scala: [3.0.2]
79-
java: [adopt@1.8]
81+
java: [temurin@11]
8082
runs-on: ${{ matrix.os }}
8183
steps:
8284
- name: Checkout current branch (full)
8385
uses: actions/checkout@v2
8486
with:
8587
fetch-depth: 0
8688

87-
- name: Setup Java and Scala
88-
uses: olafurpg/setup-scala@v13
89+
- name: Setup Java (temurin@11)
90+
if: matrix.java == 'temurin@11'
91+
uses: actions/setup-java@v2
8992
with:
90-
java-version: ${{ matrix.java }}
93+
distribution: temurin
94+
java-version: 11
9195

9296
- name: Cache sbt
9397
uses: actions/cache@v2

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
22
libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"
33

4-
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1")
4+
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0")
55
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
66
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")

0 commit comments

Comments
 (0)