@@ -14,7 +14,7 @@ plugins {
14
14
id ' com.diffplug.spotless' version ' 6.22.0'
15
15
id ' com.palantir.git-version' version ' 3.0.0'
16
16
id ' com.github.johnrengelman.shadow' version ' 8.1.1'
17
- id ' io.github.gradle-nexus.publish-plugin' version " 1.0 .0"
17
+ id ' io.github.gradle-nexus.publish-plugin' version " 1.1 .0"
18
18
}
19
19
20
20
wrapper {
@@ -86,17 +86,11 @@ signing {
86
86
required {
87
87
! version. toString(). contains(" SNAPSHOT" ) && (gradle. taskGraph. hasTask(" uploadArchives" ) || gradle. taskGraph. hasTask(" publish" ))
88
88
}
89
- def signingKey = providers
90
- .environmentVariable(" OSSRH_GPG_SECRET_KEY" )
91
- .forUseAtConfigurationTime()
92
- def signingPassphrase = providers
93
- .environmentVariable(" OSSRH_GPG_SECRET_KEY_PASSWORD" )
94
- .forUseAtConfigurationTime()
95
- if (signingKey. present && signingPassphrase. present) {
96
- useInMemoryPgpKeys(signingKey. get(), signingPassphrase. get())
97
- def extension = extensions. getByName(" publishing" ) as PublishingExtension
98
- sign(extension. publications)
99
- }
89
+ def signingKey = providers. environmentVariable(" OSSRH_GPG_SECRET_KEY" ). get()
90
+ def signingPassphrase = providers. environmentVariable(" OSSRH_GPG_SECRET_KEY_PASSWORD" ). get()
91
+ useInMemoryPgpKeys(signingKey, signingPassphrase)
92
+ def extension = extensions. getByName(" publishing" ) as PublishingExtension
93
+ sign(extension. publications)
100
94
}
101
95
102
96
publishing {
@@ -243,17 +237,8 @@ nexusPublishing {
243
237
sonatype {
244
238
nexusUrl = uri(" https://oss.sonatype.org/service/local/" )
245
239
snapshotRepositoryUrl = uri(" https://oss.sonatype.org/content/repositories/snapshots/" )
246
-
247
- def ossrhUsername = providers
248
- .environmentVariable(" OSSRH_USERNAME" )
249
- .forUseAtConfigurationTime()
250
- def ossrhPassword = providers
251
- .environmentVariable(" OSSRH_TOKEN" )
252
- .forUseAtConfigurationTime()
253
- if (ossrhUsername. present && ossrhPassword. present) {
254
- username = ossrhUsername. get()
255
- password = ossrhPassword. get()
256
- }
240
+ username = providers. environmentVariable(" OSSRH_USERNAME" ). get()
241
+ password = providers. environmentVariable(" OSSRH_TOKEN" ). get()
257
242
}
258
243
}
259
244
}
0 commit comments