Skip to content

misc: stop using JReleaser environment variables in configurePublishing #146

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 2 commits into from
Oct 1, 2025
Merged

misc: stop using JReleaser environment variables in configurePublishing #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e1b759
Stop using JReleaser environment variables in `configurePublishing`
lauzadis Oct 1, 2025
94679b7
Fix error in class generation:
lauzadis Oct 1, 2025
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
10 changes: 8 additions & 2 deletions build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/Publish.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ private const val SIGNING_PASSWORD_PROP = "signingPassword"
private const val SONATYPE_USERNAME_PROP = "sonatypeUsername"
private const val SONATYPE_PASSWORD_PROP = "sonatypePassword"

// TODO Remove JReleaser environment variables when smithy-kotlin + aws-crt-kotlin are migrated to custom Sonatype integration
private object EnvironmentVariables {
const val GROUP_ID = "JRELEASER_PROJECT_JAVA_GROUP_ID"
const val MAVEN_CENTRAL_USERNAME = "JRELEASER_MAVENCENTRAL_USERNAME"
Expand All @@ -42,6 +43,9 @@ private object EnvironmentVariables {
const val GENERIC_TOKEN = "JRELEASER_GENERIC_TOKEN"
}

private const val SIGNING_PUBLIC_KEY = "SIGNING_KEY"
private const val SIGNING_SECRET_KEY = "SIGNING_PASSWORD"

internal val ALLOWED_PUBLICATION_NAMES = setOf(
"common",
"jvm",
Expand Down Expand Up @@ -240,8 +244,8 @@ fun Project.configurePublishing(repoName: String, githubOrganization: String = "
}
}

val secretKey = System.getenv(EnvironmentVariables.GPG_SECRET_KEY)
val passphrase = System.getenv(EnvironmentVariables.GPG_PASSPHRASE)
val secretKey = System.getenv(SIGNING_PUBLIC_KEY)
val passphrase = System.getenv(SIGNING_SECRET_KEY)

if (!secretKey.isNullOrBlank() && !passphrase.isNullOrBlank()) {
apply(plugin = "signing")
Expand All @@ -255,6 +259,8 @@ fun Project.configurePublishing(repoName: String, githubOrganization: String = "
tasks.withType<AbstractPublishToMaven>().configureEach {
mustRunAfter(signingTasks)
}
} else {
logger.info("Skipping signing configuration, $SIGNING_PUBLIC_KEY or $SIGNING_SECRET_KEY are not set")
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...in/kotlin/aws/sdk/kotlin/gradle/publishing/SonatypeCentralPortalWaitForPublicationTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ abstract class SonatypeCentralPortalWaitForPublicationTask : DefaultTask() {
abstract val deploymentId: Property<String>

@Option(option = "deploymentId", description = "Deployment ID to wait for")
fun setDeploymentId(id: String) {
fun setDeploymentIdFromOption(id: String) {
deploymentId.set(id)
}

Expand Down
Loading