diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db0d89..eee99e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,10 +24,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] scala: [2.12.20] - java: [temurin@8, temurin@17] - exclude: - - java: temurin@8 - os: macos-latest + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -35,14 +32,6 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 8 - cache: sbt - - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' uses: actions/setup-java@v4 @@ -76,7 +65,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.20] - java: [temurin@8] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -84,14 +73,6 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 8 - cache: sbt - - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' uses: actions/setup-java@v4 diff --git a/build.sbt b/build.sbt index 0827cf9..fa051de 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ lazy val repoSlug = "sbt/flyway-sbt" -lazy val flywayVersion = "9.22.3" +lazy val flywayVersion = "10.21.0" lazy val scala212 = "2.12.20" lazy val scala3 = "3.3.4" @@ -88,9 +88,5 @@ ThisBuild / githubWorkflowPublish := Seq( ) ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest") ThisBuild / githubWorkflowJavaVersions := Seq( - JavaSpec.temurin("8"), JavaSpec.temurin("17") ) -ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq( - MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest")), -) diff --git a/src/sbt-test/flyway-sbt/test1/project/plugins.sbt b/src/sbt-test/flyway-sbt/test1/project/plugins.sbt index 1088043..9ca8ec3 100644 --- a/src/sbt-test/flyway-sbt/test1/project/plugins.sbt +++ b/src/sbt-test/flyway-sbt/test1/project/plugins.sbt @@ -3,3 +3,5 @@ sys.props.get("plugin.version") match { case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } + +libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0" diff --git a/src/sbt-test/flyway-sbt/test2/project/plugins.sbt b/src/sbt-test/flyway-sbt/test2/project/plugins.sbt index 1088043..9ca8ec3 100644 --- a/src/sbt-test/flyway-sbt/test2/project/plugins.sbt +++ b/src/sbt-test/flyway-sbt/test2/project/plugins.sbt @@ -3,3 +3,5 @@ sys.props.get("plugin.version") match { case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } + +libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0" diff --git a/src/sbt-test/flyway-sbt/test3/project/plugins.sbt b/src/sbt-test/flyway-sbt/test3/project/plugins.sbt index 1088043..9ca8ec3 100644 --- a/src/sbt-test/flyway-sbt/test3/project/plugins.sbt +++ b/src/sbt-test/flyway-sbt/test3/project/plugins.sbt @@ -3,3 +3,5 @@ sys.props.get("plugin.version") match { case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } + +libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0" diff --git a/src/sbt-test/flyway-sbt/test4/project/plugins.sbt b/src/sbt-test/flyway-sbt/test4/project/plugins.sbt index 1088043..9ca8ec3 100644 --- a/src/sbt-test/flyway-sbt/test4/project/plugins.sbt +++ b/src/sbt-test/flyway-sbt/test4/project/plugins.sbt @@ -3,3 +3,5 @@ sys.props.get("plugin.version") match { case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } + +libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0" diff --git a/src/sbt-test/flyway-sbt/test5/project/plugins.sbt b/src/sbt-test/flyway-sbt/test5/project/plugins.sbt index 1088043..9ca8ec3 100644 --- a/src/sbt-test/flyway-sbt/test5/project/plugins.sbt +++ b/src/sbt-test/flyway-sbt/test5/project/plugins.sbt @@ -3,3 +3,5 @@ sys.props.get("plugin.version") match { case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } + +libraryDependencies += "org.flywaydb" % "flyway-database-hsqldb" % "10.21.0"