Skip to content

Commit 4c65f2b

Browse files
committed
signing
1 parent a957cd6 commit 4c65f2b

File tree

3 files changed

+11
-30
lines changed

3 files changed

+11
-30
lines changed

grpc-client-spring-boot-starter/build.gradle

+1-6
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,7 @@ publishing {
100100
}
101101

102102
signing {
103-
setRequired {
104-
// signing is required if this is a release version and the artifacts are to be published
105-
!version.toString().endsWith('-SNAPSHOT') && tasks.withType(PublishToMavenRepository).find {
106-
gradle.taskGraph.hasTask it
107-
}
108-
}
103+
required = { !version.toString().endsWith('-SNAPSHOT') && gradle.taskGraph.hasTask("publishToSonatype") }
109104
sign publishing.publications
110105
}
111106

grpc-spring-boot-starter-gradle-plugin/build.gradle

+1-9
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,7 @@ publishing {
139139
}
140140

141141
signing {
142-
setRequired {
143-
// signing is required if this is a release version and the artifacts are to be published
144-
!version.toString().endsWith('-SNAPSHOT') && (
145-
tasks.withType(PublishToMavenRepository).find {
146-
gradle.taskGraph.hasTask it
147-
}
148-
149-
)
150-
}
142+
required = { !version.toString().endsWith('-SNAPSHOT') && gradle.taskGraph.hasTask("publishToSonatype") }
151143
sign publishing.publications
152144
}
153145

grpc-spring-boot-starter/build.gradle

+9-15
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818

1919
}
2020
grpcSpringBoot {
21-
grpcSpringBootStarterVersion.set((String)null)
21+
grpcSpringBootStarterVersion.set((String) null)
2222
}
2323

2424
apply plugin: 'org.springframework.boot'
@@ -28,7 +28,7 @@ apply plugin: 'signing'
2828
apply plugin: "de.marcphilipp.nexus-publish"
2929
apply plugin: 'io.franzbecker.gradle-lombok'
3030

31-
configurations{
31+
configurations {
3232
testImplementation {
3333
exclude group: 'io.netty', module: 'netty-tcnative-boringssl-static'
3434
exclude group: 'io.grpc', module: 'grpc-netty-shaded'
@@ -73,7 +73,7 @@ def delombokOutputDir = file("$buildDir/delombok")
7373
task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
7474
outputs.dir(delombokOutputDir)
7575
for (srcDir in project.sourceSets.main.java.srcDirs) {
76-
if(srcDir.exists()) {
76+
if (srcDir.exists()) {
7777
inputs.dir(srcDir)
7878
args(srcDir, "-d", delombokOutputDir)
7979
}
@@ -132,8 +132,8 @@ configurations.testImplementation.setCanBeResolved(true)
132132

133133
task testDependencyFatJar(type: org.springframework.boot.gradle.tasks.bundling.BootJar) {
134134
targetJavaVersion = JavaVersion.VERSION_17
135-
dependsOn testClasses,classes
136-
mainClass = 'org.lognet.grpc.demo.DemoApp'
135+
dependsOn testClasses, classes
136+
mainClass = 'org.lognet.grpc.demo.DemoApp'
137137
setClasspath(configurations.testImplementation)
138138
doFirst {
139139
classpath sourceSets.getByName("test").java.classesDirectory
@@ -191,9 +191,9 @@ jar {
191191
.findAll { it.pattern.contains("org/lognet/springboot/grpc") }
192192

193193
def finalJson = new groovy.json.JsonBuilder()
194-
finalJson{
195-
resources{
196-
includes (filtered)
194+
finalJson {
195+
resources {
196+
includes(filtered)
197197
}
198198
}
199199
finalJson.writeTo(w)
@@ -206,7 +206,6 @@ jar {
206206
}
207207

208208

209-
210209
bootJar {
211210
enabled = false
212211
archiveClassifier.convention('boot')
@@ -258,12 +257,7 @@ publishing {
258257

259258

260259
signing {
261-
setRequired {
262-
// signing is required if this is a release version and the artifacts are to be published
263-
!version.toString().endsWith('-SNAPSHOT') && tasks.withType(PublishToMavenRepository).find {
264-
gradle.taskGraph.hasTask it
265-
}
266-
}
260+
required = { !version.toString().endsWith('-SNAPSHOT') && gradle.taskGraph.hasTask("publishToSonatype") }
267261
sign publishing.publications
268262
}
269263

0 commit comments

Comments
 (0)