Skip to content

Commit

Permalink
Update sbt
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Quiroz <[email protected]>
  • Loading branch information
cquiroz committed Dec 27, 2021
1 parent 5214a05 commit bc498da
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.6.0
8 changes: 4 additions & 4 deletions sbt-tzdb/src/main/scala/io/github/sbt/tzdb/SbtTzdb.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object TzdbPlugin extends AutoPlugin {
)
override val projectSettings =
Seq(
sourceGenerators in Compile += Def.task {
Compile / sourceGenerators += Def.task {
tzdbCodeGen.value
},
tzdbCodeGen := {
Expand All @@ -57,16 +57,16 @@ 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,
jsOptimized = jsOptimized.value,
log = log
)
}
cachedActionFunction(Set((resourceManaged in Compile).value / "tzdb.tar.gz")).toSeq
cachedActionFunction(Set((Compile / resourceManaged).value / "tzdb.tar.gz")).toSeq
}
)

Expand Down

0 comments on commit bc498da

Please sign in to comment.