File tree Expand file tree Collapse file tree 4 files changed +8
-35
lines changed Expand file tree Collapse file tree 4 files changed +8
-35
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ import static org.apache.tools.ant.taskdefs.condition.Os.*
22
33plugins {
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
88description = ' RSocket RPC Library'
@@ -128,4 +128,8 @@ protobuf {
128128 }
129129 }
130130 }
131- }
131+ }
132+
133+ clean {
134+ delete protobuf. generatedFilesBaseDir
135+ }
Original file line number Diff line number Diff line change 11plugins {
2- id ' com.google.protobuf' version ' 0.8.5 '
2+ id ' com.google.protobuf' version ' 0.8.6 '
33}
44
55description = ' RSocket RPC Metrics IDL'
Original file line number Diff line number Diff line change 11plugins {
2- id ' com.google.protobuf' version ' 0.8.5 '
2+ id ' com.google.protobuf' version ' 0.8.6 '
33}
44
55description = ' RSocket RPC Protobf IDL'
Original file line number Diff line number Diff line change 11plugins {
22 id ' cpp'
3- id ' com.google.protobuf' version ' 0.8.5'
43}
54
65description = ' RSocket RPC Protobuf Generator'
@@ -13,29 +12,6 @@ def pathToPlugin = "${artifactStagingPath.getPath()}/${pluginName}"
1312sourceCompatibility = 1.8
1413targetCompatibility = 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.
4117def 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-
169138artifacts {
170139 archives(" $pathToPlugin " as File ) {
171140 classifier osdetector. os + " -" + osdetector. arch
You can’t perform that action at this time.
0 commit comments