Skip to content

Commit a9c904a

Browse files
committed
Fix gradle clean task
1 parent 04edde1 commit a9c904a

File tree

4 files changed

+8
-35
lines changed

4 files changed

+8
-35
lines changed

rsocket-rpc-core/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import static org.apache.tools.ant.taskdefs.condition.Os.*
22

33
plugins {
44
id 'io.spring.dependency-management' version '1.0.6.RELEASE'
5-
id 'com.google.protobuf' version '0.8.5'
5+
id 'com.google.protobuf' version '0.8.6'
66
}
77

88
description = 'RSocket RPC Library'
@@ -128,4 +128,8 @@ protobuf {
128128
}
129129
}
130130
}
131-
}
131+
}
132+
133+
clean {
134+
delete protobuf.generatedFilesBaseDir
135+
}

rsocket-rpc-metrics-idl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
2+
id 'com.google.protobuf' version '0.8.6'
33
}
44

55
description = 'RSocket RPC Metrics IDL'

rsocket-rpc-protobuf-idl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
2+
id 'com.google.protobuf' version '0.8.6'
33
}
44

55
description = 'RSocket RPC Protobf IDL'

rsocket-rpc-protobuf/build.gradle

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id 'cpp'
3-
id 'com.google.protobuf' version '0.8.5'
43
}
54

65
description = 'RSocket RPC Protobuf Generator'
@@ -13,29 +12,6 @@ def pathToPlugin = "${artifactStagingPath.getPath()}/${pluginName}"
1312
sourceCompatibility = 1.8
1413
targetCompatibility = 1.8
1514

16-
protobuf {
17-
generatedFilesBaseDir = "${projectDir}/src/generated"
18-
19-
protoc {
20-
artifact = "com.google.protobuf:protoc"
21-
}
22-
plugins {
23-
rsocketRpc {
24-
path = pathToPlugin
25-
}
26-
}
27-
generateProtoTasks {
28-
all().each { task ->
29-
task.dependsOn ':rsocket-rpc-protobuf:java_pluginExecutable'
30-
task.inputs.file "$pathToPlugin"
31-
task.inputs.file "${rootProject.projectDir}/build.gradle"
32-
task.plugins {
33-
rsocketRpc {}
34-
}
35-
}
36-
}
37-
}
38-
3915
// Adds space-delimited arguments from the environment variable env to the
4016
// argList.
4117
def addEnvArgs = { env, argList ->
@@ -159,13 +135,6 @@ task buildArtifacts(type: Copy) {
159135
into artifactStagingPath
160136
}
161137

162-
compileJava.dependsOn ':rsocket-rpc-protobuf:buildArtifacts'
163-
compileJava.dependsOn ':rsocket-rpc-protobuf:generateProto'
164-
165-
clean {
166-
delete protobuf.generatedFilesBaseDir
167-
}
168-
169138
artifacts {
170139
archives("$pathToPlugin" as File) {
171140
classifier osdetector.os + "-" + osdetector.arch

0 commit comments

Comments
 (0)