diff options
| -rw-r--r-- | .github/workflows/publish.yml | 6 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/publishing-conventions.gradle.kts | 15 | ||||
| -rw-r--r-- | settings.gradle.kts | 12 |
3 files changed, 15 insertions, 18 deletions
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d076dc87..315ab9d4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -81,9 +81,9 @@ jobs: - name: Publish with Gradle uses: gradle/actions/setup-gradle@v3 with: - arguments: publish -Pversion="${{ steps.prep.outputs.version }}" + arguments: publishAggregationToCentralPortal -Pversion="${{ steps.prep.outputs.version }}" env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} - ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }} - ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_centralPortalUsername: ${{ secrets.CENTRAL_PORTAL_USERNAME }} + ORG_GRADLE_PROJECT_centralPortalPassword: ${{ secrets.CENTRAL_PORTAL_PASSWORD }} diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts index 3100412a..4616df36 100644 --- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts @@ -20,15 +20,11 @@ * SOFTWARE. */ -import org.gradle.api.credentials.PasswordCredentials - plugins { `maven-publish` signing } -val isSnapshot = project.version.toString().contains("SNAPSHOT") - // Ensure project is built successfully before publishing it tasks.withType<PublishToMavenRepository>().configureEach { dependsOn(tasks.assemble) @@ -82,15 +78,4 @@ publishing { } } } - - repositories { - maven { - val releasesRepoUrl = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") - val snapshotsRepoUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") - - name = "ossrh" - url = if (isSnapshot) snapshotsRepoUrl else releasesRepoUrl - credentials(PasswordCredentials::class) - } - } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 38478afe..c75f183d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,8 +19,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +plugins { + id("com.gradleup.nmcp.settings").version("1.4.4") +} + rootProject.name = "opendc" +nmcpSettings { + centralPortal { + username = providers.gradleProperty("centralPortalUsername").orNull + password = providers.gradleProperty("centralPortalPassword").orNull + publishingType = "AUTOMATIC" + } +} + include(":opendc-common") include(":opendc-compute:opendc-compute-api") |