Skip to content

Commit ccb78ad

Browse files
committed
upgrade sbt-typelevel-sonatype-ci-release
1 parent 7517e9c commit ccb78ad

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
strategy:
106106
matrix:
107107
os: [ubuntu-latest]
108-
scala: [2.13.10]
109108
java: [zulu@8]
110109
runs-on: ${{ matrix.os }}
111110
steps:
@@ -125,7 +124,7 @@ jobs:
125124

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

130129
- name: Setup Java (zulu@11)
131130
id: setup-java-zulu-11
@@ -138,7 +137,7 @@ jobs:
138137

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

143142
- name: Setup Java (zulu@17)
144143
id: setup-java-zulu-17
@@ -151,7 +150,7 @@ jobs:
151150

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

156155
- name: Download target directories (2.11)
157156
uses: actions/download-artifact@v3
@@ -199,4 +198,4 @@ jobs:
199198
SONATYPE_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
200199
SONATYPE_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
201200
PGP_SECRET: ${{ secrets.PGP_SECRET }}
202-
run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' ci-release
201+
run: sbt -J-Xmx2G ci-release

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ Compile / resourceGenerators += Def.task {
126126

127127
Test / parallelExecution := false
128128

129+
ThisBuild / tlSonatypeUseLegacyHost := true
129130
ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G"
130131
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"), JavaSpec(Zulu, "11"), JavaSpec(Zulu, "17"))
131132
ThisBuild / githubWorkflowPublishTargetBranches := Seq(
@@ -149,5 +150,5 @@ ThisBuild / githubWorkflowPublish := Seq(
149150

150151
// site
151152
enablePlugins(SiteScaladocPlugin)
152-
enablePlugins(GhpagesPlugin)
153+
//enablePlugins(GhpagesPlugin)
153154
git.remoteRepo := "git@github.com:FasterXML/jackson-module-scala.git"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.2
1+
sbt.version=1.9.0

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
44
// For creating the github site
55
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0")
66

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

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

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

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

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

0 commit comments

Comments
 (0)