From c4c2154e6006a9c6ab97e6dc3c3e938b49958008 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Thu, 21 Aug 2025 19:37:25 +0200 Subject: [PATCH] Switch to nmcp plugin --- build.gradle | 31 +++++++++++++------ .../orx-git-archiver-gradle/build.gradle.kts | 8 ++--- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index c656d16c..af373385 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ plugins { alias(libs.plugins.nebula.release) - alias(libs.plugins.gradle.nexus.publish) + //alias(libs.plugins.gradle.nexus.publish) + id("com.gradleup.nmcp.aggregation").version("1.1.0") + id("org.openrndr.extra.convention.dokka") } @@ -89,17 +91,28 @@ tasks.register('buildMainReadme') { } } group = "org.openrndr.extra" +nmcpAggregation { + centralPortal { + username.set(findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")) + password.set(findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")) -nexusPublishing { - repositories { - sonatype { - username.set(findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")) - password.set(findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")) - nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) - snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) - } + // publish manually from the portal + publishingType = "USER_MANAGED" } + + // Publish all projects that apply the 'maven-publish' plugin + publishAllProjectsProbablyBreakingProjectIsolation() } +//nexusPublishing { +// repositories { +// sonatype { +// username.set(findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")) +// password.set(findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")) +// nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) +// snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) +// } +// } +//} subprojects { // Equivalent Kotlin is: tasks.register("dependenciesAll") { ... diff --git a/orx-jvm/orx-git-archiver-gradle/build.gradle.kts b/orx-jvm/orx-git-archiver-gradle/build.gradle.kts index 483fd211..969d2947 100644 --- a/orx-jvm/orx-git-archiver-gradle/build.gradle.kts +++ b/orx-jvm/orx-git-archiver-gradle/build.gradle.kts @@ -48,9 +48,9 @@ publishing { } } } - tasks.findByName("publishPluginMavenPublicationToSonatypeRepository")!!.dependsOn("signMavenPublication") - tasks.findByName("publishPluginMavenPublicationToSonatypeRepository")!!.dependsOn("signPluginMavenPublication") - tasks.findByName("publishMavenPublicationToSonatypeRepository")!!.dependsOn("signPluginMavenPublication") - tasks.findByName("publishMavenPublicationToSonatypeRepository")!!.dependsOn("signMavenPublication") +// tasks.findByName("publishPluginMavenPublicationToSonatypeRepository")!!.dependsOn("signMavenPublication") +// tasks.findByName("publishPluginMavenPublicationToSonatypeRepository")!!.dependsOn("signPluginMavenPublication") +// tasks.findByName("publishMavenPublicationToSonatypeRepository")!!.dependsOn("signPluginMavenPublication") +// tasks.findByName("publishMavenPublicationToSonatypeRepository")!!.dependsOn("signMavenPublication") } }