Skip to content

Commit 0c30759

Browse files
committed
Update plugins
1 parent 3bc7eec commit 0c30759

File tree

2 files changed

+23
-47
lines changed

2 files changed

+23
-47
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,25 @@ jobs:
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- name: Checkout current branch (full)
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Setup Java (temurin@11)
3737
if: matrix.java == 'temurin@11'
38-
uses: actions/setup-java@v2
38+
uses: actions/setup-java@v3
3939
with:
4040
distribution: temurin
4141
java-version: 11
42+
cache: sbt
4243

4344
- name: Setup Java (temurin@17)
4445
if: matrix.java == 'temurin@17'
45-
uses: actions/setup-java@v2
46+
uses: actions/setup-java@v3
4647
with:
4748
distribution: temurin
4849
java-version: 17
49-
50-
- name: Cache sbt
51-
uses: actions/cache@v2
52-
with:
53-
path: |
54-
~/.sbt
55-
~/.ivy2/cache
56-
~/.coursier/cache/v1
57-
~/.cache/coursier/v1
58-
~/AppData/Local/Coursier/Cache/v1
59-
~/Library/Caches/Coursier/v1
60-
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
50+
cache: sbt
6151

6252
- name: Cache Redis
6353
uses: actions/cache@v2
@@ -80,16 +70,16 @@ jobs:
8070
run: ./install-redis.sh
8171

8272
- name: Check that workflows are up to date
83-
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
73+
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
8474

8575
- name: Build project
86-
run: sbt ++${{ matrix.scala }} test
76+
run: sbt '++ ${{ matrix.scala }}' test
8777

8878
- name: Compress target directories
8979
run: tar cf targets.tar macros/target core/js/target benchmark/js/target core/target benchmark/target spring/target analyzer/target mongo/target redis/target hocon/target .js/target target jetty/target .jvm/target mongo/js/target project/target
9080

9181
- name: Upload target directories
92-
uses: actions/upload-artifact@v2
82+
uses: actions/upload-artifact@v3
9383
with:
9484
name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
9585
path: targets.tar
@@ -106,38 +96,28 @@ jobs:
10696
runs-on: ${{ matrix.os }}
10797
steps:
10898
- name: Checkout current branch (full)
109-
uses: actions/checkout@v2
99+
uses: actions/checkout@v3
110100
with:
111101
fetch-depth: 0
112102

113103
- name: Setup Java (temurin@11)
114104
if: matrix.java == 'temurin@11'
115-
uses: actions/setup-java@v2
105+
uses: actions/setup-java@v3
116106
with:
117107
distribution: temurin
118108
java-version: 11
109+
cache: sbt
119110

120111
- name: Setup Java (temurin@17)
121112
if: matrix.java == 'temurin@17'
122-
uses: actions/setup-java@v2
113+
uses: actions/setup-java@v3
123114
with:
124115
distribution: temurin
125116
java-version: 17
126-
127-
- name: Cache sbt
128-
uses: actions/cache@v2
129-
with:
130-
path: |
131-
~/.sbt
132-
~/.ivy2/cache
133-
~/.coursier/cache/v1
134-
~/.cache/coursier/v1
135-
~/AppData/Local/Coursier/Cache/v1
136-
~/Library/Caches/Coursier/v1
137-
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
117+
cache: sbt
138118

139119
- name: Download target directories (2.13.11)
140-
uses: actions/download-artifact@v2
120+
uses: actions/download-artifact@v3
141121
with:
142122
name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}
143123

@@ -147,7 +127,7 @@ jobs:
147127
rm targets.tar
148128
149129
- name: Download target directories (2.12.18)
150-
uses: actions/download-artifact@v2
130+
uses: actions/download-artifact@v3
151131
with:
152132
name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
153133

@@ -161,4 +141,4 @@ jobs:
161141
PGP_SECRET: ${{ secrets.PGP_SECRET }}
162142
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
163143
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
164-
run: sbt ++${{ matrix.scala }} ci-release
144+
run: sbt ci-release

project/plugins.sbt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
val scalaJSVersion: String =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.1")
3-
41
logLevel := Level.Warn
52

63
addSbtPlugin("com.github.ghik" % "sbt-nosbt" % "0.2.1")
7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
85
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
9-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
10-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
11-
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
12-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2")
13-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.2")
14-
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8")
15-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
6+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
7+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
8+
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
9+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
10+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3")
11+
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.15.0")

0 commit comments

Comments
 (0)