Skip to content

Commit 477e7e5

Browse files
authored
Merge branch 'main' into update/sbt-scalajs-1.13.0
2 parents 1047147 + a436b81 commit 477e7e5

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [2.12.17, 2.13.9, 3.2.0]
31+
scala: [2.12.17, 2.13.9, 3.2.2]
3232
java: [temurin@8]
3333
project: [rootJS, rootJVM, rootNative]
3434
runs-on: ${{ matrix.os }}
@@ -211,32 +211,32 @@ jobs:
211211
tar xf targets.tar
212212
rm targets.tar
213213
214-
- name: Download target directories (3.2.0, rootJS)
214+
- name: Download target directories (3.2.2, rootJS)
215215
uses: actions/download-artifact@v2
216216
with:
217-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJS
217+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS
218218

219-
- name: Inflate target directories (3.2.0, rootJS)
219+
- name: Inflate target directories (3.2.2, rootJS)
220220
run: |
221221
tar xf targets.tar
222222
rm targets.tar
223223
224-
- name: Download target directories (3.2.0, rootJVM)
224+
- name: Download target directories (3.2.2, rootJVM)
225225
uses: actions/download-artifact@v2
226226
with:
227-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJVM
227+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
228228

229-
- name: Inflate target directories (3.2.0, rootJVM)
229+
- name: Inflate target directories (3.2.2, rootJVM)
230230
run: |
231231
tar xf targets.tar
232232
rm targets.tar
233233
234-
- name: Download target directories (3.2.0, rootNative)
234+
- name: Download target directories (3.2.2, rootNative)
235235
uses: actions/download-artifact@v2
236236
with:
237-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootNative
237+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative
238238

239-
- name: Inflate target directories (3.2.0, rootNative)
239+
- name: Inflate target directories (3.2.2, rootNative)
240240
run: |
241241
tar xf targets.tar
242242
rm targets.tar

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.6.1"
1+
version = "3.7.2"
22
maxColumn = 120
33
danglingParentheses.preset = false
44
align.preset = some

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.typesafe.tools.mima.core._
22

33
val scala212 = "2.12.17"
44
val scala213 = "2.13.9"
5-
val scala3 = "3.2.0"
5+
val scala3 = "3.2.2"
66

77
val scalatestVersion = "3.2.13"
88
val scalacheckVersion = "1.17.0"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.14")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
3+
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)