Skip to content

Commit

Permalink
upgrade sbt-typelevel-sonatype-ci-release
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Jun 21, 2023
1 parent 43fba13 commit 7cf804b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
java: [zulu@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -124,7 +123,7 @@ jobs:

- name: sbt update
if: matrix.java == 'zulu@8' && steps.setup-java-zulu-8.outputs.cache-hit == 'false'
run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' reload +update
run: sbt -J-Xmx2G reload +update

- name: Setup Java (zulu@11)
id: setup-java-zulu-11
Expand All @@ -137,7 +136,7 @@ jobs:

- name: sbt update
if: matrix.java == 'zulu@11' && steps.setup-java-zulu-11.outputs.cache-hit == 'false'
run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' reload +update
run: sbt -J-Xmx2G reload +update

- name: Setup Java (zulu@17)
id: setup-java-zulu-17
Expand All @@ -150,7 +149,7 @@ jobs:

- name: sbt update
if: matrix.java == 'zulu@17' && steps.setup-java-zulu-17.outputs.cache-hit == 'false'
run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' reload +update
run: sbt -J-Xmx2G reload +update

- name: Download target directories (2.11)
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -198,4 +197,4 @@ jobs:
SONATYPE_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' ci-release
run: sbt -J-Xmx2G ci-release
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Compile / resourceGenerators += Def.task {

Test / parallelExecution := false

ThisBuild / tlSonatypeUseLegacyHost := true
ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G"
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"), JavaSpec(Zulu, "11"), JavaSpec(Zulu, "17"))
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "mimaReportBinaryIssues")))
Expand All @@ -149,7 +150,7 @@ ThisBuild / githubWorkflowPublish := Seq(

// site
enablePlugins(SiteScaladocPlugin)
enablePlugins(GhpagesPlugin)
//enablePlugins(GhpagesPlugin)
git.remoteRepo := "git@github.com:FasterXML/jackson-module-scala.git"

mimaBinaryIssueFilters ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.0
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
// For creating the github site
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
//addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")

addSbtPlugin("org.typelevel" % "sbt-typelevel-sonatype-ci-release" % "0.5.0-M9")
addSbtPlugin("org.typelevel" % "sbt-typelevel-sonatype-ci-release" % "0.5.0-RC1")

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")

0 comments on commit 7cf804b

Please sign in to comment.