Skip to content

Commit f2338e1

Browse files
committed
Update sbt-spiewak
1 parent aded1ab commit f2338e1

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,20 @@ jobs:
2727
matrix:
2828
os: [ubuntu-latest]
2929
scala: [2.13.6, 3.1.0, 2.12.14]
30-
30+
java: [temurin@11]
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- name: Checkout current branch (full)
3434
uses: actions/checkout@v2
3535
with:
3636
fetch-depth: 0
3737

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

4345
- name: Cache sbt
4446
uses: actions/cache@v2
@@ -77,18 +79,20 @@ jobs:
7779
matrix:
7880
os: [ubuntu-latest]
7981
scala: [2.13.6]
80-
82+
java: [temurin@11]
8183
runs-on: ${{ matrix.os }}
8284
steps:
8385
- name: Checkout current branch (full)
8486
uses: actions/checkout@v2
8587
with:
8688
fetch-depth: 0
8789

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

9397
- name: Cache sbt
9498
uses: actions/cache@v2
@@ -145,7 +149,7 @@ jobs:
145149
matrix:
146150
os: [ubuntu-latest]
147151
scala: [2.13.6]
148-
152+
java: [temurin@11]
149153
runs-on: ${{ matrix.os }}
150154
steps:
151155
- name: Download target directories (2.13.6)

build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ lazy val docs = project
7474
.dependsOn(core)
7575
.enablePlugins(MdocPlugin, NoPublishPlugin)
7676

77-
ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]")
78-
7977
ThisBuild / githubWorkflowBuildPostamble ++= List(
8078
WorkflowStep.Sbt(
8179
List("docs/mdoc"),

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1")
1+
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0")
22
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
33
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.23")

0 commit comments

Comments
 (0)