Skip to content

revert "misc: revert sonatype change (#1704)" #1705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2025
+15 −17
Merged

revert "misc: revert sonatype change (#1704)" #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aws-runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions bom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
14 changes: 6 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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")
}
Expand Down Expand Up @@ -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}",
Expand All @@ -108,3 +103,6 @@ val lintPaths = listOf(

configureLinting(lintPaths)
configureMinorVersionStrategyRules(lintPaths)

tasks.register<SonatypeCentralPortalPublishTask>("publishToCentralPortal") { }
tasks.register<SonatypeCentralPortalWaitForPublicationTask>("waitForCentralPortalPublication") { }
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hll/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions services/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
Loading