diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd03a18..bea142a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,13 +7,13 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: temurin - java-version: 8 + java-version: 17 cache: sbt - uses: sbt/setup-sbt@v1 - run: sbt ci-release diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml index 63d5460..2bf41ab 100644 --- a/.github/workflows/sbt.yml +++ b/.github/workflows/sbt.yml @@ -8,13 +8,13 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: - java-version: 11 + java-version: 17 distribution: temurin - name: Setup sbt launcher uses: sbt/setup-sbt@v1 @@ -29,5 +29,4 @@ jobs: path: ~/.sbt key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }} - name: Build - run: sbt compile - #run: sbt ^test ^scripted + run: sbt +test +scripted diff --git a/build.sbt b/build.sbt index 7ef33ca..52a9c51 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ specifications as part of your build. Other tasks are available as command line """ lazy val scala21220 = "2.12.20" -lazy val scala372 = "3.7.2" +lazy val scala384 = "3.8.4" onLoadMessage := s"Welcome to sbt-openapi-generator ${version.value}" //crossScalaVersions := Nil @@ -38,19 +38,18 @@ lazy val `sbt-openapi-generator` = (project in file(".")) ) ), moduleName := "sbt-openapi-generator", - crossScalaVersions := Seq(scala21220), - // crossScalaVersions := Seq(scala21220, scala372), + crossScalaVersions := Seq(scala21220, scala384), sbtPlugin := true, scalacOptions ++= { scalaBinaryVersion.value match { - case "2.12" => "-Xsource:3" :: Nil - case _ => Nil + case "2.12" => Seq("-Xsource:3", "-release:11") + case _ => Seq("-release:17") } }, (pluginCrossBuild / sbtVersion) := { scalaBinaryVersion.value match { - case "2.12" => "1.12.10" - case _ => "2.0.0-RC12" + case "2.12" => "1.12.11" + case _ => "2.0.0" } }, scriptedLaunchOpts := { diff --git a/project/build.properties b/project/build.properties index 6edd024..dabdb15 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.12.10 +sbt.version=1.12.11