Skip to content

misc: expand allow-list, apply signing plugin only when required #48

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 4 commits into from
Oct 1, 2024
Merged

misc: expand allow-list, apply signing plugin only when required #48

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efa4e0b
Expand allow-list, only apply signing plugin when required, add proje…
lauzadis Sep 25, 2024
2b240fc
ktlint
lauzadis Sep 26, 2024
1cf984c
Remove unnecessary publication
lauzadis Sep 26, 2024
01e9fff
Remove pluginMaven publication too
lauzadis Sep 26, 2024
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
12 changes: 10 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 @@ -34,6 +34,14 @@ private val ALLOWED_PUBLICATIONS = listOf(
"android", // aws-crt-kotlin
"codegen",
"codegen-testutils",

// aws-sdk-kotlin:hll
"hll-codegen",
"dynamodb-mapper-codegen",
"dynamodb-mapper-schema-generator-plugin",
"dynamodb-mapper-schema-codegen",
"pluginMaven",
"dynamodb-mapper-schema-generatorPluginMarkerMaven",
Copy link
Contributor

@ianbotsf ianbotsf Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: What are these two?

Copy link
Member Author

@lauzadis lauzadis Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are publications that I noticed weren't being configured (log.warn message), I believe they come from the gradle-plugin-publish plugin for the schema generator. dynamodb-mapper-schema-generatorPluginMarkerMaven was not necessary so I removed it, without pluginMaven the plugin is unaccessible though.

Copy link
Member Author

@lauzadis lauzadis Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I was just able to remove both of these. Not sure when this changed, but at some point these were required.

)

/**
Expand All @@ -51,7 +59,6 @@ fun Project.skipPublishing() {
fun Project.configurePublishing(repoName: String) {
val project = this
apply(plugin = "maven-publish")
apply(plugin = "signing")

// FIXME: create a real "javadoc" JAR from Dokka output
val javadocJar = tasks.register<Jar>("emptyJar") {
Expand Down Expand Up @@ -99,6 +106,7 @@ fun Project.configurePublishing(repoName: String) {
}

if (project.hasProperty(SIGNING_KEY_PROP) && project.hasProperty(SIGNING_PASSWORD_PROP)) {
apply(plugin = "signing")
extensions.configure<SigningExtension> {
useInMemoryPgpKeys(
project.property(SIGNING_KEY_PROP) as String,
Expand All @@ -119,7 +127,7 @@ fun Project.configurePublishing(repoName: String) {
onlyIf {
isAvailableForPublication(project, publication).also {
if (!it) {
logger.warn("Skipping publication, project=${project.name}; publication=${publication.name}")
logger.warn("Skipping publication, project=${project.name}; publication=${publication.name}; group=${publication.groupId}")
}
}
}
Expand Down
Loading