diff --git a/aws-runtime/build.gradle.kts b/aws-runtime/build.gradle.kts index e2a0dfc59fa..7ccc3e3b243 100644 --- a/aws-runtime/build.gradle.kts +++ b/aws-runtime/build.gradle.kts @@ -2,7 +2,7 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import aws.sdk.kotlin.gradle.dsl.configureNexusPublishing +import aws.sdk.kotlin.gradle.dsl.configurePublishing import aws.sdk.kotlin.gradle.kmp.kotlin import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured import org.jetbrains.kotlin.gradle.dsl.JvmTarget @@ -33,7 +33,7 @@ subprojects { } // TODO Use configurePublishing when migrating to Sonatype Publisher API / JReleaser - configureNexusPublishing("aws-sdk-kotlin") + configurePublishing("aws-sdk-kotlin") kotlin { explicitApi() diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 31b714c675f..ddca2b748b7 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -2,7 +2,7 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import aws.sdk.kotlin.gradle.dsl.configureNexusPublishing +import aws.sdk.kotlin.gradle.dsl.configurePublishing import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinTarget @@ -99,7 +99,7 @@ fun DependencyConstraintHandler.api(constraintNotation: Any) = createBomConstraintsAndVersionCatalog() // TODO Use configurePublishing when migrating to Sonatype Publisher API / JReleaser -configureNexusPublishing("aws-sdk-kotlin") +configurePublishing("aws-sdk-kotlin") publishing { publications { diff --git a/build.gradle.kts b/build.gradle.kts index 87a08af1de2..5afcc084642 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,8 @@ */ import aws.sdk.kotlin.gradle.dsl.configureLinting import aws.sdk.kotlin.gradle.dsl.configureMinorVersionStrategyRules -import aws.sdk.kotlin.gradle.dsl.configureNexus +import aws.sdk.kotlin.gradle.publishing.SonatypeCentralPortalPublishTask +import aws.sdk.kotlin.gradle.publishing.SonatypeCentralPortalWaitForPublicationTask import aws.sdk.kotlin.gradle.util.typedProp buildscript { @@ -22,7 +23,7 @@ buildscript { Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath: java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3) - FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix + FIXME: Figure out what broke our buildscript classpath, this is a temporary fix */ force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") } @@ -90,12 +91,6 @@ dependencies { dokka(project(":hll")) } -// Publishing -configureNexus( - nexusUrl = "https://aws.oss.sonatype.org/service/local/", - snapshotRepositoryUrl = "https://aws.oss.sonatype.org/content/repositories/snapshots/", -) - // Code Style val lintPaths = listOf( "**/*.{kt,kts}", @@ -108,3 +103,6 @@ val lintPaths = listOf( configureLinting(lintPaths) configureMinorVersionStrategyRules(lintPaths) + +tasks.register("publishToCentralPortal") { } +tasks.register("waitForCentralPortalPublication") { } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 944b2a0099e..15ce136fda5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.58" +aws-kotlin-repo-tools-version = "0.4.63" # libs coroutines-version = "1.10.2" diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 7b16a91885f..e6c5661b02a 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import aws.sdk.kotlin.gradle.dsl.configureNexusPublishing +import aws.sdk.kotlin.gradle.dsl.configurePublishing import aws.sdk.kotlin.gradle.kmp.kotlin import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured import org.jetbrains.kotlin.gradle.dsl.JvmTarget @@ -47,7 +47,7 @@ subprojects { group = "aws.sdk.kotlin" version = hllPreviewVersion // TODO Use configurePublishing when migrating to Sonatype Publisher API / JReleaser - configureNexusPublishing("aws-sdk-kotlin") + configurePublishing("aws-sdk-kotlin") } subprojects { diff --git a/services/build.gradle.kts b/services/build.gradle.kts index af781794fbe..dc72c6bebb4 100644 --- a/services/build.gradle.kts +++ b/services/build.gradle.kts @@ -2,7 +2,7 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import aws.sdk.kotlin.gradle.dsl.configureNexusPublishing +import aws.sdk.kotlin.gradle.dsl.configurePublishing import aws.sdk.kotlin.gradle.kmp.* import aws.sdk.kotlin.gradle.util.typedProp import org.jetbrains.kotlin.gradle.dsl.JvmTarget @@ -136,7 +136,7 @@ subprojects { } // TODO Use configurePublishing when migrating to Sonatype Publisher API / JReleaser - configureNexusPublishing("aws-sdk-kotlin") + configurePublishing("aws-sdk-kotlin") publishing { publications.all {