diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee40b7f..e3b7630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,4 +57,4 @@ jobs: - name: Scala 3 if: ${{ matrix.jobtype == 3 }} shell: bash - run: sbt -v '++ 3.3.4!' library/test scripted + run: sbt -v '++ 3.x' library/test scripted diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d64b36c..5ec2241 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,10 +20,6 @@ jobs: java-version: 8 cache: sbt - uses: sbt/setup-sbt@v1 - - name: Test - run: | - gpg --import test-key.gpg - sbt +test +packagedArtifacts - name: Release env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} @@ -31,6 +27,5 @@ jobs: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} CI_CLEAN: clean - CI_RELEASE: +publishSigned run: | sbt ci-release diff --git a/build.sbt b/build.sbt index 2628913..ce8eb93 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ ThisBuild / Compile / scalacOptions := Seq("-feature", "-deprecation", "-Xlint") // Because we're both a library and an sbt plugin, we use crossScalaVersions rather than crossSbtVersions for // cross building. So you can use commands like +scripted. lazy val scala212 = "2.12.15" -lazy val scala3 = "3.3.4" +lazy val scala3 = "3.6.2" ThisBuild / crossScalaVersions := Seq(scala212, scala3) ThisBuild / scalaVersion := scala212 @@ -48,7 +48,7 @@ lazy val plugin = (project in file("sbt-pgp")) (pluginCrossBuild / sbtVersion) := { scalaBinaryVersion.value match { case "2.12" => "1.5.8" - case _ => "2.0.0-M2" + case _ => "2.0.0-M3" } }, scriptedSbt := { diff --git a/project/plugins.sbt b/project/plugins.sbt index ef1f705..9dd6452 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") +evictionErrorLevel := Level.Info +addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")