Update protobuf plugin dependency and fix build.

Alexander Litus · Alexander Litus · commit 970e17d8f1b5 · 2016-04-19T15:42:09.000+03:00
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
     dependencies {
-        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.2', changing: true
+        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.3.1', changing: true
     }
 }
 
@@ -16,4 +16,16 @@ dependencies {
     compile project(path: ':server');
 }
 
+protobuf {
+    generateProtoTasks {
+        all().each { final task ->
+            task.plugins {
+                task.generateDescriptorSet = true
+                task.descriptorSetOptions.path = "${projectDir}/build/descriptors/${task.sourceSet.name}.desc"
+                task.descriptorSetOptions.includeImports = true
+            }
+        }
+    }
+}
+
 apply plugin: 'org.spine3.tools.protobuf-plugin';
diff --git a/server/build.gradle b/server/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
     dependencies {
-        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.2', changing: true
+        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.3.1', changing: true
     }
 }
 
@@ -36,9 +36,10 @@ protobuf {
     generateProtoTasks {
         all().each { final task ->
             task.plugins {
-                grpc {
-//                    option 'nano=true'
-                }
+                grpc {}
+                task.generateDescriptorSet = true
+                task.descriptorSetOptions.path = "${projectDir}/build/descriptors/${task.sourceSet.name}.desc"
+                task.descriptorSetOptions.includeImports = true
             }
         }
     }
diff --git a/values/build.gradle b/values/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
     dependencies {
-        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.2', changing: true
+        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.3.1', changing: true
     }
 }
 
@@ -36,9 +36,10 @@ protobuf {
     generateProtoTasks {
         all().each { final task ->
             task.plugins {
-                grpc {
-//                    option 'nano=true'
-                }
+                grpc {}
+                task.generateDescriptorSet = true
+                task.descriptorSetOptions.path = "${projectDir}/build/descriptors/${task.sourceSet.name}.desc"
+                task.descriptorSetOptions.includeImports = true
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ buildscript {`
`3`	`3`	`resolutionStrategy.cacheChangingModulesFor 0, 'seconds'`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.2', changing: true`
	`6`	`+ classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.3.1', changing: true`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`@@ -16,4 +16,16 @@ dependencies {`
`16`	`16`	`compile project(path: ':server');`
`17`	`17`	`}`
`18`	`18`
	`19`	`+protobuf {`
	`20`	`+ generateProtoTasks {`
	`21`	`+ all().each { final task ->`
	`22`	`+ task.plugins {`
	`23`	`+ task.generateDescriptorSet = true`
	`24`	`+ task.descriptorSetOptions.path = "${projectDir}/build/descriptors/${task.sourceSet.name}.desc"`
	`25`	`+ task.descriptorSetOptions.includeImports = true`
	`26`	`+ }`
	`27`	`+ }`
	`28`	`+ }`
	`29`	`+}`
	`30`	`+`
`19`	`31`	`apply plugin: 'org.spine3.tools.protobuf-plugin';`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`resolutionStrategy.cacheChangingModulesFor 0, 'seconds'`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.2', changing: true`
	`7`	`+ classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.3.1', changing: true`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`@@ -36,9 +36,10 @@ protobuf {`
`36`	`36`	`generateProtoTasks {`
`37`	`37`	`all().each { final task ->`
`38`	`38`	`task.plugins {`
`39`		`- grpc {`
`40`		`-// option 'nano=true'`
`41`		`- }`
	`39`	`+ grpc {}`
	`40`	`+ task.generateDescriptorSet = true`
	`41`	`+ task.descriptorSetOptions.path = "${projectDir}/build/descriptors/${task.sourceSet.name}.desc"`
	`42`	`+ task.descriptorSetOptions.includeImports = true`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`