diff --git a/.buildscript/configure-maven-publish.gradle b/.buildscript/configure-maven-publish.gradle index 0f432b569e..42f6b1ca6f 100644 --- a/.buildscript/configure-maven-publish.gradle +++ b/.buildscript/configure-maven-publish.gradle @@ -2,3 +2,7 @@ apply plugin: 'com.vanniktech.maven.publish' group = GROUP version = VERSION_NAME + +mavenPublish { + sonatypeHost = "S01" +} diff --git a/RELEASING.md b/RELEASING.md index 150abd0acf..0d609c507c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -21,14 +21,13 @@ 1. Upload the kotlin artifacts: ```bash - ./gradlew clean build && ./gradlew uploadArchives --no-parallel + ./gradlew clean build && ./gradlew publish --no-parallel ``` Disabling parallelism and daemon sharing is required by the vanniktech maven publish plugin. Without those, the artifacts will be split across multiple (invalid) staging repositories. - (Note that `uploadArchives` is deprecated in favor of `publish`, but `publish` makes bad artifacts.) -1. Close and release the staging repository at https://oss.sonatype.org/#stagingRepositories. +1. Close and release the staging repository at https://s01.oss.sonatype.org/#stagingRepositories. 1. Bump the version - **Kotlin:** Update the `VERSION_NAME` property in `gradle.properties` to the new @@ -111,12 +110,11 @@ To build and install the current version to your local Maven repository (`~/.m2` #### Configuration -In order to deploy artifacts to a Maven repository, you'll need to set 4 properties in your private -Gradle properties file (`~/.gradle/gradle.properties`): +In order to deploy artifacts to `s01.oss.sonatype.org`, you'll need to provide +your credentials via these two properties in your private Gradle properties +file(`~/.gradle/gradle.properties`). ``` -RELEASE_REPOSITORY_URL= -SNAPSHOT_REPOSITORY_URL= mavenCentralPassword= ``` @@ -127,8 +125,8 @@ Double-check that `gradle.properties` correctly contains the `-SNAPSHOT` suffix, snapshot artifacts to Sonatype just like you would for a production release: ```bash -./gradlew clean build && ./gradlew uploadArchives --no-parallel +./gradlew clean build && ./gradlew publish --no-parallel ``` You can verify the artifacts are available by visiting -https://oss.sonatype.org/content/repositories/snapshots/com/squareup/workflow/. +https://s01.oss.sonatype.org/content/repositories/snapshots/com/squareup/workflow1/. diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index d36c6ba212..6205f14a35 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -108,7 +108,7 @@ object Dependencies { const val generator = "org.openjdk.jmh:jmh-generator-annprocess:1.32" } - const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.16.0" + const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:10.1.0" const val lanterna = "com.googlecode.lanterna:lanterna:3.1.1" const val okio = "com.squareup.okio:okio:2.10.0" diff --git a/gradle.properties b/gradle.properties index 712e74ef23..02c896ad0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,16 +10,18 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true GROUP=com.squareup.workflow1 VERSION_NAME=1.4.0-SNAPSHOT -POM_DESCRIPTION=Reactive workflows +POM_DESCRIPTION=Square Workflow POM_URL=https://github.com/square/workflow/ POM_SCM_URL=https://github.com/square/workflow/ POM_SCM_CONNECTION=scm:git:git://github.com/square/workflow.git POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/square/workflow.git -POM_LICENCE_NAME=The Apache Software License, Version 2.0 -POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt -POM_LICENCE_DIST=repo +POM_LICENSE_NAME=The Apache Software License, Version 2.0 +POM_LICENSE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENSE_DIST=repo POM_DEVELOPER_ID=square POM_DEVELOPER_NAME=Square, Inc. +POM_DEVELOPER_URL=https://github.com/square/ +SONATYPE_STAGING_PROFILE=com.squareup