Skip to content

Commit

Permalink
Merge pull request #55 from scala-steward/update/scala3-library-3.3.4
Browse files Browse the repository at this point in the history
Update scala3-library to 3.3.4
  • Loading branch information
dvgica authored Sep 30, 2024
2 parents 9482ffe + 02b4ed9 commit 44e3aa0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.15, 2.12.20, 3.3.3]
scala: [2.13.15, 2.12.20, 3.3.4]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -108,12 +108,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.3.3)
- name: Download target directories (3.3.4)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}

- name: Inflate target directories (3.3.3)
- name: Inflate target directories (3.3.4)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
queue_rules:
- name: dependency-update
conditions:
- check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@11)
- check-success=Build and Test (ubuntu-latest, 3.3.4, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.13.15, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.12.20, temurin@11)

pull_request_rules:
- name: Merge using the merge queue
conditions:
- base=main
- check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@11)
- check-success=Build and Test (ubuntu-latest, 3.3.4, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.13.15, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.12.20, temurin@11)
- author=scala-steward
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ inThisBuild(

val scala212Version = "2.12.20"
val scala213Version = "2.13.15"
val scala3Version = "3.3.3"
val scala3Version = "3.3.4"
val scalaVersions =
Seq(
scala213Version,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package ca.dvgi.periodic

import ca.dvgi.periodic.jdk._
import scala.concurrent.duration.FiniteDuration
import org.slf4j.LoggerFactory
import scala.concurrent.duration._
import scala.concurrent.Future
Expand Down

0 comments on commit 44e3aa0

Please sign in to comment.