diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index 55168ca14..da59a48f9 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -30,7 +30,7 @@ runs: - name: Publish Android/Java Packages to Maven shell: bash - run: ./gradlew publish -PisSnapshot=false --stacktrace + run: ./gradlew publishToSonatype -PisSnapshot=false --stacktrace env: MAVEN_USERNAME: ${{ inputs.ossr-username }} MAVEN_PASSWORD: ${{ inputs.ossr-token }} diff --git a/build.gradle b/build.gradle index 0fa5d020b..605efd891 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ buildscript { plugins { id 'org.jetbrains.dokka' version '1.9.20' + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } subprojects { diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle index 567e224c5..459dfc30e 100644 --- a/gradle/maven-publish.gradle +++ b/gradle/maven-publish.gradle @@ -14,8 +14,6 @@ task sourcesJar(type: Jar) { from android.sourceSets.main.java.source } -final releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" -final snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/" publishing { publications { @@ -69,13 +67,14 @@ publishing { } } } - repositories { - maven { - name = "sonatype" - url = version.endsWith('SNAPSHOT') ? snapshotRepositoryUrl : releaseRepositoryUrl - credentials { - username = System.getenv("MAVEN_USERNAME") - password = System.getenv("MAVEN_PASSWORD") + + nexusPublishing { + repositories { + sonatype{ + nexusUrl.set(uri('https://ossrh-staging-api.central.sonatype.com/service/local/')) + snapshotRepositoryUrl.set(uri('https://central.sonatype.com/repository/maven-snapshots/')) + username.set(System.getenv("MAVEN_USERNAME")) + password.set(System.getenv("MAVEN_PASSWORD")) } } }