Publish to maven central (#951)

spekframework · Feb 14, 2021 · 4078fcd · 4078fcd
1 parent 1f58a57
commit 4078fcd
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 212 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,11 +15,11 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         include:
           - os: ubuntu-latest
-            arguments: spek-dsl:bintrayUpload spek-runtime:bintrayUpload spek-runner-junit5:bintrayUpload --stacktrace -PexcludeIdePlugins
+            arguments: spek-dsl:publish spek-runtime:publish spek-runner-junit5:publish --stacktrace -PexcludeIdePlugins
           - os: windows-latest
-            arguments: spek-dsl:bintrayUpload spek-runtime:bintrayUpload --stacktrace -PexcludeIdePlugins
+            arguments: spek-dsl:publish spek-runtime:publish --stacktrace -PexcludeIdePlugins
           - os: macos-latest
-            arguments: spek-dsl:bintrayUpload spek-runtime:bintrayUpload --stacktrace -PexcludeIdePlugins
+            arguments: spek-dsl:publish spek-runtime:publish --stacktrace -PexcludeIdePlugins
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -36,8 +36,10 @@ jobs:
         with:
           arguments: ${{ matrix.arguments }}
         env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_SIGNING_KEY: ${{ secrets.OSSRH_SIGNING_KEY }}
+          OSSRH_SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }}
 
   deploy_ij_plugin:
     strategy:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/spekframework/spek/CI?style=flat-square)](https://github.com/spekframework/spek/actions?query=workflow%3ACI)
-[ ![Download](https://img.shields.io/badge/dynamic/json.svg?label=stable&url=https%3A%2F%2Fapi.bintray.com%2Fpackages%2Fspekframework%2Fspek%2Fspek2%2Fversions%2F_latest&query=name&colorB=blue) ](https://bintray.com/spekframework/spek/spek2/_latestVersion)
-[ ![Download](https://img.shields.io/badge/dynamic/json.svg?label=dev&url=https%3A%2F%2Fapi.bintray.com%2Fpackages%2Fspekframework%2Fspek-dev%2Fspek2%2Fversions%2F_latest&query=name&colorB=blue) ](https://bintray.com/spekframework/spek-dev/spek2/_latestVersion)
+![Maven Central](https://img.shields.io/maven-central/v/org.spekframework.spek2/spek-dsl-jvm?style=flat-square)
+![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/org.spekframework.spek2/spek-dsl-jvm?server=https%3A%2F%2Foss.sonatype.org&style=flat-square)
 
 ![Spek Logo](spek-logo.png)
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,6 +27,8 @@ allprojects {
     var releaseMode = false
     if ("$version".matches(Regex("^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?"))) {
         releaseMode = true
+    } else {
+        version = "$version-SNAPSHOT"
     }
     project.extra["releaseMode"] = releaseMode
 

diff --git a/buildSrc/src/main/kotlin/publish.gradle.kts b/buildSrc/src/main/kotlin/publish.gradle.kts
@@ -1,42 +1,55 @@
 plugins {
-    id("com.jfrog.bintray")
-    `maven-publish` apply false
+    `maven-publish`
+    signing
 }
 
-val bintrayUser = propOrEnv("BINTRAY_USER")
-val bintrayApiKey = propOrEnv("BINTRAY_API_KEY")
-
 var bintrayRepo = "spek-dev"
 var doPublish = true
 
+var releaseMode = project.extra["releaseMode"] == true
+
 if (project.extra["releaseMode"] == true) {
     bintrayRepo = "spek"
     doPublish = false
 }
 
-val artifacts = project.extra["artifacts"] as Array<String>
-bintray {
-    user = bintrayUser
-    key = bintrayApiKey
-    publish = doPublish
-    with(pkg) {
-        repo = bintrayRepo
-        desc = "Test framework for Kotlin"
-        name = "spek2"
-        userOrg = "spekframework"
-        setLicenses("BSD New")
-        setLabels("kotlin", "testing")
-        vcsUrl = "https://github.com/spekframework/spek.git"
-        githubRepo = "spekframework/spek"
-        with(version) {
-            name = rootProject.version.toString()
+val artifacts = (project.extra["artifacts"] as Array<String>).toHashSet()
+
+tasks.withType<AbstractPublishToMaven>()
+    .configureEach {
+        onlyIf {
+            artifacts.contains(publication.name)
         }
     }
 
-    setPublications(*artifacts)
+signing {
+    val signingKey = propOrEnv("OSSRH_SIGNING_KEY")
+    val signingPassword = propOrEnv("OSSRH_SIGNING_PASSWORD")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    publishing.publications.all {
+        if (artifacts.contains(name)) {
+            sign(this)
+        }
+    }
 }
 
 publishing {
+    repositories {
+        maven {
+            val targetRepo = if (releaseMode) {
+                "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            } else {
+                "https://oss.sonatype.org/content/repositories/snapshots/"
+            }
+            setUrl(targetRepo)
+
+            credentials {
+                username = propOrEnv("OSSRH_USERNAME")
+                password = propOrEnv("OSSRH_PASSWORD")
+            }
+        }
+    }
+
     publications {
         all {
             if (this is MavenPublication) {

diff --git a/docs/index.md b/docs/index.md
@@ -1,6 +1,6 @@
-[ ![CI](https://travis-ci.com/spekframework/spek.svg?branch=2.x) ](https://travis-ci.com/spekframework/spek)
-[ ![Download](https://img.shields.io/badge/dynamic/json.svg?label=stable&url=https%3A%2F%2Fapi.bintray.com%2Fpackages%2Fspekframework%2Fspek%2Fspek2%2Fversions%2F_latest&query=name&colorB=blue) ](https://bintray.com/spekframework/spek/spek2/_latestVersion)
-[ ![Download](https://img.shields.io/badge/dynamic/json.svg?label=dev&url=https%3A%2F%2Fapi.bintray.com%2Fpackages%2Fspekframework%2Fspek-dev%2Fspek2%2Fversions%2F_latest&query=name&colorB=blue) ](https://bintray.com/spekframework/spek-dev/spek2/_latestVersion)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/spekframework/spek/CI?style=flat-square)](https://github.com/spekframework/spek/actions?query=workflow%3ACI)
+![Maven Central](https://img.shields.io/maven-central/v/org.spekframework.spek2/spek-dsl-jvm?style=flat-square)
+![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/org.spekframework.spek2/spek-dsl-jvm?server=https%3A%2F%2Foss.sonatype.org&style=flat-square)
 
 Spek `2.x` is a complete rewrite of Spek with Kotlin multiplatform support in mind. The DSL is also reworked into
 two distinct styles: [specification](specification.md) and [gherkin](gherkin.md).

diff --git a/gradle/common/dependencies.gradle b/gradle/common/dependencies.gradle
diff --git a/gradle/common/idea-plugin.gradle b/gradle/common/idea-plugin.gradle
diff --git a/gradle/common/kotlin-common.gradle b/gradle/common/kotlin-common.gradle
diff --git a/gradle/common/kotlin-jvm.gradle b/gradle/common/kotlin-jvm.gradle
diff --git a/gradle/common/publish-plugin.gradle b/gradle/common/publish-plugin.gradle
diff --git a/gradle/common/publish.gradle b/gradle/common/publish.gradle
diff --git a/gradle/common/versioning.gradle b/gradle/common/versioning.gradle
diff --git a/spek-ide-plugin-intellij-idea/build.gradle.kts b/spek-ide-plugin-intellij-idea/build.gradle.kts
@@ -14,14 +14,14 @@ val buildMatrix = mapOf(
         arrayOf("java", "org.jetbrains.kotlin:1.3.50-release-IJ2019.2-1")
     ),
     "IJ201" to ij.BuildConfig(
-        "201-EAP-SNAPSHOT",
+        "201.8743.12",
         "IJ2020.1",
         "IJ183",
         ij.VersionRange("201.1", "201.*"),
         arrayOf("java", "org.jetbrains.kotlin:1.3.61-release-IJ2019.3-1")
     ),
     "IJ202" to ij.BuildConfig(
-        "202-EAP-SNAPSHOT",
+        "202.8194.7",
         "IJ2020.2",
         "IJ183",
         ij.VersionRange("202.1", "202.*"),