diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88879d4..0a97d96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: - uses: olafurpg/setup-scala@v13 - uses: olafurpg/setup-gpg@v3 - name: Publish - run: csbt clean ci-release + run: sbt clean ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index b00ba34..cf3ce55 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -23,6 +23,6 @@ jobs: path: ~/.sbt key: sbt-${{ hashFiles('**/build.sbt') }} - name: Checking your code format - run: csbt scalafmtCheckAll + run: sbt scalafmtCheckAll - name: Run tests - run: csbt clean sbt-tzdb/scripted + run: sbt clean sbt-tzdb/scripted diff --git a/project/build.properties b/project/build.properties index dbae93b..1e70b0c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.6.0 diff --git a/sbt-tzdb/src/main/scala/io/github/sbt/tzdb/SbtTzdb.scala b/sbt-tzdb/src/main/scala/io/github/sbt/tzdb/SbtTzdb.scala index 9e68b85..1e853cf 100644 --- a/sbt-tzdb/src/main/scala/io/github/sbt/tzdb/SbtTzdb.scala +++ b/sbt-tzdb/src/main/scala/io/github/sbt/tzdb/SbtTzdb.scala @@ -46,7 +46,7 @@ object TzdbPlugin extends AutoPlugin { ) override val projectSettings = Seq( - sourceGenerators in Compile += Def.task { + Compile / sourceGenerators += Def.task { tzdbCodeGen.value }, tzdbCodeGen := { @@ -57,8 +57,8 @@ object TzdbPlugin extends AutoPlugin { inStyle = FilesInfo.hash ) { _ => tzdbCodeGenImpl( - sourceManaged = (sourceManaged in Compile).value, - resourcesManaged = (resourceManaged in Compile).value, + sourceManaged = (Compile / sourceManaged).value, + resourcesManaged = (Compile / resourceManaged).value, zonesFilter = zonesFilter.value, dbVersion = dbVersion.value, includeTTBP = includeTTBP.value, @@ -66,7 +66,7 @@ object TzdbPlugin extends AutoPlugin { log = log ) } - cachedActionFunction(Set((resourceManaged in Compile).value / "tzdb.tar.gz")).toSeq + cachedActionFunction(Set((Compile / resourceManaged).value / "tzdb.tar.gz")).toSeq } )