Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-typelevel-0.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
scala-steward committed Sep 26, 2023
2 parents 7bb60f9 + 53221b6 commit dc1da23
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 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.18, 3.3.1]
scala: [2.13.12, 2.12.18, 3.3.1]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -150,32 +150,32 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.11, rootJS)
- name: Download target directories (2.13.12, rootJS)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJS

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

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

- name: Inflate target directories (2.13.11, rootNative)
- name: Inflate target directories (2.13.12, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ThisBuild / startYear := Some(2017)

ThisBuild / tlSonatypeUseLegacyHost := false

val Scala213 = "2.13.11"
val Scala213 = "2.13.12"
ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.18", "3.3.1")
ThisBuild / scalaVersion := Scala213 // the default Scala
ThisBuild / tlJdkRelease := Some(8)
Expand All @@ -20,7 +20,7 @@ val CatsVersion = "2.10.0"
val CatsEffectVersion = "3.5.1"
val DisciplineVersion = "2.0.0-M3"
val ScalaCheckVersion = "1.17.0"
val MunitVersion = "1.0.0-M8"
val MunitVersion = "1.0.0-M10"
val MunitCatsEffectVersion = "2.0.0-M3"
val ScalacheckEffectVersion = "2.0.0-M2"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.4
sbt.version=1.9.6

0 comments on commit dc1da23

Please sign in to comment.