From 6208bf89a53ffe59cd44bb12ee9e6271b08e8cc9 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Ricau Date: Wed, 1 Nov 2023 20:39:29 -0700 Subject: [PATCH] fixing release --- RELEASING.md | 10 ++-------- build.gradle.kts | 8 ++++++++ buildSrc/src/main/java/Dependencies.kt | 2 +- gradle.properties | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index d590124..b744960 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -87,16 +87,10 @@ git push origin v{NEW_VERSION} * Upload the artifacts to Sonatype OSS Nexus ```bash -./gradlew uploadArchives --no-daemon --no-parallel +./gradlew publish --no-daemon --no-parallel && \ +./gradlew closeAndReleaseRepository ``` -* Release to Maven Central - * Login to Sonatype OSS Nexus: https://oss.sonatype.org/ - * Click on **Staging Repositories** - * Scroll to the bottom, you should see an entry named `comsquareup-XXXX` - * Check the box next to the `comsquareup-XXXX` entry, click **Close** then **Confirm** - * Wait a bit, hit **Refresh**, until the *Status* for that column changes to *Closed*. - * Check the box next to the `comsquareup-XXXX` entry, click **Release** then **Confirm** * Merge the release branch to main ```bash git checkout main diff --git a/build.gradle.kts b/build.gradle.kts index e8b6c44..50a081e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import com.vanniktech.maven.publish.MavenPublishBaseExtension +import com.vanniktech.maven.publish.SonatypeHost import kotlinx.validation.ApiValidationExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jlleitschuh.gradle.ktlint.KtlintExtension @@ -71,6 +73,12 @@ subprojects { apply(plugin = "org.jlleitschuh.gradle.ktlint") + plugins.withId("com.vanniktech.maven.publish.base") { + configure { + publishToMavenCentral(SonatypeHost.S01) + } + } + tasks.withType { kotlinOptions { // Allow warnings when running from IDE, makes it easier to experiment. diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index dd7599b..3914266 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -12,7 +12,7 @@ object Versions { object Dependencies { object Build { const val Android = "com.android.tools.build:gradle:8.1.2" - const val MavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.14.0" + const val MavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.25.3" val Kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KotlinCompiler}" const val Ktlint = "org.jlleitschuh.gradle:ktlint-gradle:11.6.1" const val BinaryCompatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0" diff --git a/gradle.properties b/gradle.properties index e66e572..09e92aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ android.useAndroidX=true systemProp.org.gradle.internal.publish.checksums.insecure=true GROUP=com.squareup.radiography -VERSION_NAME=2.5.0-SNAPSHOT +VERSION_NAME=2.5 POM_DESCRIPTION=Pretty printing of view hierarchies