Skip to content

Commit ec5a088

Browse files
committed
fix: Update release plugin config to use .set(...) for props and inject nexus creds via gradle props
1 parent c03db58 commit ec5a088

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ jobs:
109109
properties: |
110110
release=true
111111
centralPortalPublishingType=AUTOMATIC
112+
centralPortalUsername=${{ secrets.NEXUS_USERNAME }}
113+
centralPortalPassword=${{ secrets.NEXUS_PASSWORD }}
112114
env:
113-
CENTRAL_PORTAL_USERNAME: ${{ secrets.NEXUS_USERNAME }}
114-
CENTRAL_PORTAL_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
115115
SIGNING_PGP_PRIVATE_KEY: ${{ secrets.RELEASE_PGP_PRIVATE_KEY }}
116116
SIGNING_PGP_PASSPHRASE: ${{ secrets.RELEASE_PGP_PASSPHRASE }}
117117

build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ plugins {
77

88
nmcpAggregation {
99
centralPortal {
10-
username = providers.environmentVariable("CENTRAL_PORTAL_USERNAME")
11-
password = providers.environmentVariable("CENTRAL_PORTAL_PASSWORD")
12-
publishingType = buildParameters.centralPortal.publishingType.name
10+
username.set(providers.gradleProperty("centralPortalUsername")
11+
.orElse(providers.environmentVariable("CENTRAL_PORTAL_USERNAME")))
12+
password.set(providers.gradleProperty("centralPortalPassword")
13+
.orElse(providers.environmentVariable("CENTRAL_PORTAL_PASSWORD")))
14+
publishingType.set(buildParameters.centralPortal.publishingType.name)
1315
// WA for https://github.com/GradleUp/nmcp/issues/52
14-
publicationName = provider { "${project.name}-${project.version}.zip" }
15-
verificationTimeout = Duration.ofMinutes(buildParameters.centralPortal.verificationTimeout.toLong())
16+
publicationName.set(provider { "${project.name}-${project.version}.zip" })
17+
verificationTimeout.set(Duration.ofMinutes(buildParameters.centralPortal.verificationTimeout.toLong()))
1618
}
1719
}

0 commit comments

Comments
 (0)