From c59b3867328cbee9165853bb5f4ff166e38ea500 Mon Sep 17 00:00:00 2001 From: ramil Date: Fri, 18 Oct 2024 18:39:42 +0200 Subject: [PATCH] use sbt-ci-release --- .github/workflows/release.yml | 24 ++++++++++++++++++ build.sbt | 13 +++++++++- project/plugins.sbt | 4 +-- publish.sbt | 48 ----------------------------------- sonatype.sbt | 4 --- version.sbt | 1 - 6 files changed, 38 insertions(+), 56 deletions(-) create mode 100644 .github/workflows/release.yml delete mode 100644 sonatype.sbt delete mode 100644 version.sbt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..4038bd3 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,24 @@ +name: Release +on: + push: + branches: [master] + tags: ["*"] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 11 + cache: sbt + - uses: sbt/setup-sbt@v1 + - run: sbt ci-release + env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/build.sbt b/build.sbt index f8f6771..0b0fbc9 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,18 @@ lazy val nettyExclusions = Seq( "netty-codec-http" ).map(name => ExclusionRule(organization = "io.netty", name = name)) -ThisBuild / organization := "io.waylay.influxdb" +ThisBuild / organization := "io.waylay" +ThisBuild / homepage := Some(url("https://waylay.io")) +ThisBuild / developers := List( + Developer( + "ramazanyich", + "Ramil Israfilov", + "ramazanyich@gmail.com", + url("https://github.com/ramazanyich") + ), + Developer("brunoballekens", "Bruno Ballekens", "bruno@waylay.io", url("https://github.com/brunoballekens")) +) +ThisBuild / licenses := List("MIT License" -> url("http://www.opensource.org/licenses/mit-license.php")) lazy val root = (project in file(".")) .settings( diff --git a/project/plugins.sbt b/project/plugins.sbt index e74e22b..e8b8780 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.7.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.8.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") diff --git a/publish.sbt b/publish.sbt index 59b2bed..e4ee09d 100644 --- a/publish.sbt +++ b/publish.sbt @@ -1,51 +1,3 @@ -releasePublishArtifactsAction := PgpKeys.publishSigned.value - -publishMavenStyle := true - pomIncludeRepository := { _ => false } -publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") -} - updateOptions := updateOptions.value.withGigahorse(false) - -pomExtra := (https://github.com/waylayio/influxdb-scala - - - MIT License - http://www.opensource.org/licenses/mit-license.php - repo - - - - - francisdb - Francis De Brabandere - https://github.com/francisdb - - - thomastoye - Thomas Toye - https://github.com/thomastoye - - - brunoballekens - Bruno Ballekens - https://github.com/brunoballekens - - - gabrielreid - Gabriel Reid - https://github.com/gabrielreid - - - ramazanyich - Ramil Israfilov - https://github.com/ramazanyich - - ) diff --git a/sonatype.sbt b/sonatype.sbt deleted file mode 100644 index 735385f..0000000 --- a/sonatype.sbt +++ /dev/null @@ -1,4 +0,0 @@ -credentials ++= (for { - username <- Option(System.getenv().get("SONATYPE_USERNAME")) - password <- Option(System.getenv().get("SONATYPE_PASSWORD")) -} yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq diff --git a/version.sbt b/version.sbt deleted file mode 100644 index b78781c..0000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -ThisBuild / version := "4.1.1-SNAPSHOT"