diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a2a0b24..554bc73 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,5 +14,9 @@ jobs: distribution: 'temurin' java-version: '17' - uses: coursier/cache-action@v6 - - run: | - sbt "+publishSigned; sonatypeReleaseAll" + - run: sbt ci-release + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/.gnupg/pubring.gpg b/.gnupg/pubring.gpg deleted file mode 100644 index 4f84f2d..0000000 Binary files a/.gnupg/pubring.gpg and /dev/null differ diff --git a/.gnupg/secring.gpg b/.gnupg/secring.gpg deleted file mode 100644 index 16bfbb6..0000000 Binary files a/.gnupg/secring.gpg and /dev/null differ diff --git a/README.md b/README.md index 52bdc49..9b2e812 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ create data structure visualizations with very little effort. There are a few ways you can use `reftree`: * [improving the documentation of your projects](https://stanch.github.io/zipper/); -* [live-coding demos and talks](https://stanch.github.io/reftree/Talks.html); +* [live-coding demos and talks](https://stanch.github.io/reftree/docs/talks); * exploring how things work; * anywhere you need diagrams of your Scala data structures. diff --git a/build.sbt b/build.sbt index 58442a3..f5d7936 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,6 @@ val commonSettings = Seq( scalaVersion := "2.13.14", crossScalaVersions := Seq("2.12.19", "2.13.14"), - version := "1.4.0", scalacOptions ++= { val commonScalacOptions = Seq("-feature", "-deprecation", "-Xlint", "-Xfatal-warnings") @@ -20,7 +19,7 @@ val commonSettings = Seq( } }, Compile / doc / scalacOptions += "-no-link-warnings" -) ++ metadata ++ publishing +) ++ metadata lazy val metadata = Seq( organization := "io.github.stanch", @@ -38,20 +37,6 @@ lazy val metadata = Seq( licenses := Seq(("GPL-3.0", url("http://www.gnu.org/licenses/gpl-3.0.en.html"))) ) -lazy val publishing = Seq( - usePgpKeyHex("8ED74E385203BEB1"), - pgpPublicRing := baseDirectory.value.getParentFile.getParentFile / ".gnupg" / "pubring.gpg", - pgpSecretRing := baseDirectory.value.getParentFile.getParentFile / ".gnupg" / "secring.gpg", - pgpPassphrase := sys.env.get("PGP_PASS").map(_.toArray), - credentials += Credentials( - "Sonatype Nexus Repository Manager", - "oss.sonatype.org", - sys.env.getOrElse("SONATYPE_USER", ""), - sys.env.getOrElse("SONATYPE_PASS", "") - ), - publishTo := Some(Opts.resolver.sonatypeStaging) -) - val core = crossProject(JSPlatform, JVMPlatform) .in(file("core")) .settings(commonSettings) @@ -128,7 +113,7 @@ val site = project.in(file("site-gen")) name := "reftree-site", moduleName := "reftree-site", mdocVariables := Map( - "VERSION" -> version.value + "VERSION" -> version.value.split('+').head ), (publish / skip) := true ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 353b845..be9eecc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,6 +8,4 @@ addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2") libraryDependencies += "net.exoego" %% "scalajs-env-jsdom-nodejs" % "2.1.0" -addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")