Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.13.11
Browse files Browse the repository at this point in the history
  • Loading branch information
johnynek committed Jun 25, 2023
2 parents 35b5493 + f8187ff commit 6cbcb32
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.11, 2.12.17, 3.3.0]
scala: [2.13.11, 2.12.18, 3.3.0]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -181,32 +181,32 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.17, rootJS)
- name: Download target directories (2.12.18, rootJS)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS

- name: Inflate target directories (2.12.17, rootJS)
- name: Inflate target directories (2.12.18, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.17, rootJVM)
- name: Download target directories (2.12.18, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM

- name: Inflate target directories (2.12.17, rootJVM)
- name: Inflate target directories (2.12.18, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.17, rootNative)
- name: Download target directories (2.12.18, rootNative)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative

- name: Inflate target directories (2.12.17, rootNative)
- name: Inflate target directories (2.12.18, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val Scala212 = "2.12.17"
val Scala212 = "2.12.18"
val Scala213 = "2.13.11"
val Scala3Version = "3.3.0"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
Expand Down

0 comments on commit 6cbcb32

Please sign in to comment.