Integrate sbt-typelevel-ci-release

RustedBones · Aug 12, 2023 · c94eb13 · c94eb13
1 parent 8adde92
commit c94eb13
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt +update
 
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
@@ -67,7 +67,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -128,7 +128,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
-        run: sbt reload +update
+        run: sbt +update
 
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
@@ -141,7 +141,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
-        run: sbt reload +update
+        run: sbt +update
 
       - name: Download target directories (3)
         uses: actions/download-artifact@v3
@@ -222,7 +222,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
-        run: sbt reload +update
+        run: sbt +update
 
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
@@ -235,7 +235,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
-        run: sbt reload +update
+        run: sbt +update
 
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2

diff --git a/build.sbt b/build.sbt
@@ -42,28 +42,9 @@ ThisBuild / tlJdkRelease    := Some(8)
 // mima
 ThisBuild / mimaBinaryIssueFilters ++= Seq()
 
-lazy val publishSettings = Seq(
-  publishMavenStyle             := true,
-  Test / publishArtifact        := false,
-  publishTo                     := {
-    if (isSnapshot.value) {
-      Resolver.sonatypeOssRepos("snapshots").headOption
-    } else {
-      Resolver.sonatypeOssRepos("releases").headOption
-    }
-  },
-  releaseCrossBuild             := true,
-  releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-  credentials ++= (for {
-    username <- sys.env.get("SONATYPE_USERNAME")
-    password <- sys.env.get("SONATYPE_PASSWORD")
-  } yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq
-)
-
 lazy val commonSettings = Defaults.itSettings ++
   headerSettings(IntegrationTest) ++
-  inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings) ++
-  publishSettings
+  inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings)
 
 lazy val `pekko-http-metrics` = (project in file("."))
   .aggregate(

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,3 @@
-addSbtPlugin("com.github.sbt" % "sbt-release"                  % "1.1.0")
-addSbtPlugin("com.github.sbt" % "sbt-pgp"                      % "2.2.1")
-addSbtPlugin("org.typelevel"  % "sbt-typelevel"                % "0.5.0-RC10")
-addSbtPlugin("org.typelevel"  % "sbt-typelevel-github-actions" % "0.5.0-RC10")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype"                 % "3.9.21")
+addSbtPlugin("org.typelevel" % "sbt-typelevel"                % "0.5.0-RC11")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release"     % "0.5.0-RC11")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.5.0-RC11")