Skip to content

Commit 2ca2c29

Browse files
authored
Merge pull request #108 from mkurz/flyway-10.21.0
Flyway 10.21.0 (help needed)
2 parents 9cc77b6 + b2675e6 commit 2ca2c29

File tree

7 files changed

+13
-26
lines changed

7 files changed

+13
-26
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,14 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest, macos-latest]
2626
scala: [2.12.20]
27-
java: [temurin@8, temurin@17]
28-
exclude:
29-
- java: temurin@8
30-
os: macos-latest
27+
java: [temurin@17]
3128
runs-on: ${{ matrix.os }}
3229
steps:
3330
- name: Checkout current branch (full)
3431
uses: actions/checkout@v4
3532
with:
3633
fetch-depth: 0
3734

38-
- name: Setup Java (temurin@8)
39-
if: matrix.java == 'temurin@8'
40-
uses: actions/setup-java@v4
41-
with:
42-
distribution: temurin
43-
java-version: 8
44-
cache: sbt
45-
4635
- name: Setup Java (temurin@17)
4736
if: matrix.java == 'temurin@17'
4837
uses: actions/setup-java@v4
@@ -76,22 +65,14 @@ jobs:
7665
matrix:
7766
os: [ubuntu-latest]
7867
scala: [2.12.20]
79-
java: [temurin@8]
68+
java: [temurin@17]
8069
runs-on: ${{ matrix.os }}
8170
steps:
8271
- name: Checkout current branch (full)
8372
uses: actions/checkout@v4
8473
with:
8574
fetch-depth: 0
8675

87-
- name: Setup Java (temurin@8)
88-
if: matrix.java == 'temurin@8'
89-
uses: actions/setup-java@v4
90-
with:
91-
distribution: temurin
92-
java-version: 8
93-
cache: sbt
94-
9576
- name: Setup Java (temurin@17)
9677
if: matrix.java == 'temurin@17'
9778
uses: actions/setup-java@v4

build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
lazy val repoSlug = "sbt/flyway-sbt"
2-
lazy val flywayVersion = "9.22.3"
2+
lazy val flywayVersion = "10.21.0"
33
lazy val scala212 = "2.12.20"
44
lazy val scala3 = "3.3.4"
55

@@ -88,9 +88,5 @@ ThisBuild / githubWorkflowPublish := Seq(
8888
)
8989
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest")
9090
ThisBuild / githubWorkflowJavaVersions := Seq(
91-
JavaSpec.temurin("8"),
9291
JavaSpec.temurin("17")
9392
)
94-
ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
95-
MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest")),
96-
)

src/sbt-test/flyway-sbt/test1/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ sys.props.get("plugin.version") match {
33
case _ => sys.error("""|The system property 'plugin.version' is not defined.
44
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
55
}
6+
7+
libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0"

src/sbt-test/flyway-sbt/test2/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ sys.props.get("plugin.version") match {
33
case _ => sys.error("""|The system property 'plugin.version' is not defined.
44
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
55
}
6+
7+
libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0"

src/sbt-test/flyway-sbt/test3/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ sys.props.get("plugin.version") match {
33
case _ => sys.error("""|The system property 'plugin.version' is not defined.
44
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
55
}
6+
7+
libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0"

src/sbt-test/flyway-sbt/test4/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ sys.props.get("plugin.version") match {
33
case _ => sys.error("""|The system property 'plugin.version' is not defined.
44
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
55
}
6+
7+
libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0"

src/sbt-test/flyway-sbt/test5/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ sys.props.get("plugin.version") match {
33
case _ => sys.error("""|The system property 'plugin.version' is not defined.
44
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
55
}
6+
7+
libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0"

0 commit comments

Comments
 (0)