Skip to content

Commit 7cf804b

Browse files
committed
upgrade sbt-typelevel-sonatype-ci-release
1 parent 43fba13 commit 7cf804b

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
@@ -104,7 +104,6 @@ jobs:
104104
strategy:
105105
matrix:
106106
os: [ubuntu-latest]
107-
scala: [2.13.10]
108107
java: [zulu@8]
109108
runs-on: ${{ matrix.os }}
110109
steps:
@@ -124,7 +123,7 @@ jobs:
124123

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

129128
- name: Setup Java (zulu@11)
130129
id: setup-java-zulu-11
@@ -137,7 +136,7 @@ jobs:
137136

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

142141
- name: Setup Java (zulu@17)
143142
id: setup-java-zulu-17
@@ -150,7 +149,7 @@ jobs:
150149

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

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

build.sbt

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

126126
Test / parallelExecution := false
127127

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

150151
// site
151152
enablePlugins(SiteScaladocPlugin)
152-
enablePlugins(GhpagesPlugin)
153+
//enablePlugins(GhpagesPlugin)
153154
git.remoteRepo := "[email protected]:FasterXML/jackson-module-scala.git"
154155

155156
mimaBinaryIssueFilters ++= Seq(

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)