Skip to content

Commit 17396a8

Browse files
satabinsatabin
authored
Merge branch 'main' into update/sbt-scalajs-1.13.0
2 parents 477e7e5 + f75ac7f commit 17396a8

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎.github/workflows/ci.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [2.12.17, 2.13.9, 3.2.2]
31+
scala: [2.12.17, 2.13.10, 3.2.2]
3232
java: [temurin@8]
3333
project: [rootJS, rootJVM, rootNative]
3434
runs-on: ${{ matrix.os }}
3535
steps:
3636
- name: Checkout current branch (full)
37-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
3838
with:
3939
fetch-depth: 0
4040

4141
- name: Download Java (temurin@8)
4242
id: download-java-temurin-8
4343
if: matrix.java == 'temurin@8'
44-
uses: typelevel/download-java@v1
44+
uses: typelevel/download-java@v2
4545
with:
4646
distribution: temurin
4747
java-version: 8
4848

4949
- name: Setup Java (temurin@8)
5050
if: matrix.java == 'temurin@8'
51-
uses: actions/setup-java@v2
51+
uses: actions/setup-java@v3
5252
with:
5353
distribution: jdkfile
5454
java-version: 8
5555
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
5656

5757
- name: Cache sbt
58-
uses: actions/cache@v2
58+
uses: actions/cache@v3
5959
with:
6060
path: |
6161
~/.sbt
@@ -70,27 +70,27 @@ jobs:
7070
run: sbt githubWorkflowCheck
7171

7272
- name: Check headers and formatting
73-
if: matrix.java == 'temurin@8'
74-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
73+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
74+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
7575

7676
- name: scalaJSLink
7777
if: matrix.project == 'rootJS'
78-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/scalaJSLinkerResult
78+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
7979

8080
- name: nativeLink
8181
if: matrix.project == 'rootNative'
82-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/nativeLink
82+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
8383

8484
- name: Test
85-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' test
85+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
8686

8787
- name: Check binary compatibility
88-
if: matrix.java == 'temurin@8'
89-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' mimaReportBinaryIssues
88+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
89+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
9090

9191
- name: Generate API documentation
92-
if: matrix.java == 'temurin@8'
93-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc
92+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
93+
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
9494

9595
- name: Make target directories
9696
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: Upload target directories
104104
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
105-
uses: actions/upload-artifact@v2
105+
uses: actions/upload-artifact@v3
106106
with:
107107
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
108108
path: targets.tar
@@ -114,33 +114,33 @@ jobs:
114114
strategy:
115115
matrix:
116116
os: [ubuntu-latest]
117-
scala: [2.13.9]
117+
scala: [2.13.10]
118118
java: [temurin@8]
119119
runs-on: ${{ matrix.os }}
120120
steps:
121121
- name: Checkout current branch (full)
122-
uses: actions/checkout@v2
122+
uses: actions/checkout@v3
123123
with:
124124
fetch-depth: 0
125125

126126
- name: Download Java (temurin@8)
127127
id: download-java-temurin-8
128128
if: matrix.java == 'temurin@8'
129-
uses: typelevel/download-java@v1
129+
uses: typelevel/download-java@v2
130130
with:
131131
distribution: temurin
132132
java-version: 8
133133

134134
- name: Setup Java (temurin@8)
135135
if: matrix.java == 'temurin@8'
136-
uses: actions/setup-java@v2
136+
uses: actions/setup-java@v3
137137
with:
138138
distribution: jdkfile
139139
java-version: 8
140140
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
141141

142142
- name: Cache sbt
143-
uses: actions/cache@v2
143+
uses: actions/cache@v3
144144
with:
145145
path: |
146146
~/.sbt
@@ -152,7 +152,7 @@ jobs:
152152
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
153153

154154
- name: Download target directories (2.12.17, rootJS)
155-
uses: actions/download-artifact@v2
155+
uses: actions/download-artifact@v3
156156
with:
157157
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS
158158

@@ -162,7 +162,7 @@ jobs:
162162
rm targets.tar
163163
164164
- name: Download target directories (2.12.17, rootJVM)
165-
uses: actions/download-artifact@v2
165+
uses: actions/download-artifact@v3
166166
with:
167167
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
168168

@@ -172,7 +172,7 @@ jobs:
172172
rm targets.tar
173173
174174
- name: Download target directories (2.12.17, rootNative)
175-
uses: actions/download-artifact@v2
175+
uses: actions/download-artifact@v3
176176
with:
177177
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative
178178

@@ -182,7 +182,7 @@ jobs:
182182
rm targets.tar
183183
184184
- name: Download target directories (2.13.9, rootJS)
185-
uses: actions/download-artifact@v2
185+
uses: actions/download-artifact@v3
186186
with:
187187
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.9-rootJS
188188

@@ -192,7 +192,7 @@ jobs:
192192
rm targets.tar
193193
194194
- name: Download target directories (2.13.9, rootJVM)
195-
uses: actions/download-artifact@v2
195+
uses: actions/download-artifact@v3
196196
with:
197197
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.9-rootJVM
198198

@@ -202,7 +202,7 @@ jobs:
202202
rm targets.tar
203203
204204
- name: Download target directories (2.13.9, rootNative)
205-
uses: actions/download-artifact@v2
205+
uses: actions/download-artifact@v3
206206
with:
207207
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.9-rootNative
208208

@@ -212,7 +212,7 @@ jobs:
212212
rm targets.tar
213213
214214
- name: Download target directories (3.2.2, rootJS)
215-
uses: actions/download-artifact@v2
215+
uses: actions/download-artifact@v3
216216
with:
217217
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS
218218

@@ -222,7 +222,7 @@ jobs:
222222
rm targets.tar
223223
224224
- name: Download target directories (3.2.2, rootJVM)
225-
uses: actions/download-artifact@v2
225+
uses: actions/download-artifact@v3
226226
with:
227227
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
228228

@@ -232,7 +232,7 @@ jobs:
232232
rm targets.tar
233233
234234
- name: Download target directories (3.2.2, rootNative)
235-
uses: actions/download-artifact@v2
235+
uses: actions/download-artifact@v3
236236
with:
237237
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative
238238

@@ -253,4 +253,4 @@ jobs:
253253
(echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
254254
255255
- name: Publish
256-
run: sbt '++${{ matrix.scala }}' tlRelease
256+
run: sbt '++ ${{ matrix.scala }}' tlRelease

‎build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import com.typesafe.tools.mima.core._
22

33
val scala212 = "2.12.17"
4-
val scala213 = "2.13.9"
4+
val scala213 = "2.13.10"
55
val scala3 = "3.2.2"
66

7-
val scalatestVersion = "3.2.13"
7+
val scalatestVersion = "3.2.15"
88
val scalacheckVersion = "1.17.0"
99

1010
ThisBuild / scalaVersion := scala213
@@ -41,7 +41,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
4141
name := "diffson-core",
4242
libraryDependencies ++= Seq(
4343
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.8.1",
44-
"org.typelevel" %%% "cats-core" % "2.8.0",
44+
"org.typelevel" %%% "cats-core" % "2.9.0",
4545
"org.scalatest" %%% "scalatest" % scalatestVersion % Test,
4646
"org.scalacheck" %%% "scalacheck" % scalacheckVersion % Test
4747
),

‎project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.7.3
1+
sbt.version=1.8.2

‎project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.14")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.18")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10")
44
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")

0 commit comments

Comments
 (0)