Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: 'sbt'
- uses: sbt/setup-sbt@v1
- run: sbt -v lint
test:
strategy:
fail-fast: false
matrix:
jdk: [ 11, 17, 19 ]
jdk: [ 17, 19 ]
scala: [ 2.12.19, 2.13.14, 3.3.1 ]
runs-on: ubuntu-latest
needs: lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: 'sbt'
- uses: olafurpg/setup-gpg@v3
- run: sbt -v ci-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: 'sbt'
- uses: olafurpg/setup-gpg@v3
- run: sbt -v ci-release
Expand Down
11 changes: 7 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ def crossScalacOptions(scalaVersion: String): Seq[String] = CrossVersion.partial
case Some((2L, scalaMajor)) if scalaMajor >= 12 =>
Seq(
"-Ydelambdafy:method",
"-target:jvm-1.8",
"-Yrangepos"
"-target:jvm-17",
"-Yrangepos",
"-release:17"
// "-Ywarn-unused"
)
}
Expand All @@ -29,6 +30,7 @@ lazy val baseSettings = Seq(
),
scalaVersion := Versions.scala3Version,
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version, Versions.scala3Version),
javacOptions ++= Seq("-source", "17", "-target", "17"),
scalacOptions ++= (Seq(
"-unchecked",
"-feature",
Expand Down Expand Up @@ -154,8 +156,9 @@ val `docker-controller-scala-flyway` = (project in file("docker-controller-scala
.settings(
name := "docker-controller-scala-flyway",
libraryDependencies ++= Seq(
"org.flywaydb" % "flyway-core" % "9.22.3",
"org.flywaydb" % "flyway-mysql" % "9.22.3",
"org.flywaydb" % "flyway-core" % "11.12.0",
"org.flywaydb" % "flyway-mysql" % "11.12.0",
"org.flywaydb" % "flyway-database-postgresql" % "11.12.0",
scalatest.scalatest % Test,
logback.classic % Test
)
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
java = "temurin-19"
java = "temurin-17"