Skip to content

Commit

Permalink
Merge pull request #224 from theiterators/remove-scala-3.0.2
Browse files Browse the repository at this point in the history
Remove Scala 3.0.2 build. Update remaining Scala versions.
  • Loading branch information
pk044 committed Jul 2, 2022
2 parents 9b340f7 + 00f9b94 commit 51e6167
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.16, 2.13.8, 3.0.2, 3.1.1]
scala: [2.12.16, 2.13.8, 3.1.3]
java: [temurin@8, temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ pull_request_rules:
- status-success=Build and Test (ubuntu-latest, 2.12.16, temurin@17)
- status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@8)
- status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@17)
- status-success=Build and Test (ubuntu-latest, 3.1.0, temurin@8)
- status-success=Build and Test (ubuntu-latest, 3.1.0, temurin@17)
- status-success=Build and Test (ubuntu-latest, 3.1.3, temurin@8)
- status-success=Build and Test (ubuntu-latest, 3.1.3, temurin@17)
actions:
merge:
method: squash
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import sbt.librarymanagement.ConflictWarning

val scala_2_12 = "2.12.16"
val scala_2_13 = "2.13.8"
val scala_30 = "3.0.2"
val scala_31 = "3.1.2"
val scala_31 = "3.1.3"
val mainScalaVersion = scala_31
val supportedScalaVersions = Seq(scala_2_12, scala_2_13, scala_30, scala_31)
val supportedScalaVersions = Seq(scala_2_12, scala_2_13, scala_31)

ThisBuild / crossScalaVersions := supportedScalaVersions
ThisBuild / scalaVersion := mainScalaVersion
Expand Down

0 comments on commit 51e6167

Please sign in to comment.