commit b22bcdfd18039c6b1bdfe6ae3e2541381acfb595
author Eric Anderson <ejona@google.com> Tue Mar 29 14:13:28 2016 -0700
committer Eric Anderson <ejona@google.com> Tue Mar 29 16:19:56 2016 -0700
tree 5ca3441e0182882bfb6c6ae97654e137a10bcdb3
parent 2d15af53c7a9129b53c6ac6ac510d38f23276117

Use lite argument in codegen instead of LITE_RUNTIME

This allows using the same proto file for both client and server without
forcing the server to use lite.

compiler/build.gradle

diff --git a/compiler/build.gradle b/compiler/build.gradle
index 740bf4b..b9e4173 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -109,17 +109,21 @@
 }
 
 configurations {
+  testLiteCompile
   testNanoCompile
 }
 
 dependencies {
   testCompile project(':grpc-protobuf'),
               project(':grpc-stub')
+  testLiteCompile project(':grpc-protobuf-lite'),
+                  project(':grpc-stub')
   testNanoCompile project(':grpc-protobuf-nano'),
                   project(':grpc-stub')
 }
 
 sourceSets {
+  testLite {}
   testNano {
     proto {
       setSrcDirs(['src/test/proto'])
@@ -127,7 +131,7 @@
   }
 }
 
-compileTestJava {
+compileTestLiteJava {
   // Protobuf-generated Lite produces quite a few warnings.
   it.options.compilerArgs.removeAll(["-Xlint:unchecked", "-Xlint:rawtypes"])
 }
@@ -150,6 +154,11 @@
     ofSourceSet('test')*.plugins {
       grpc {}
     }
+    ofSourceSet('testLite')*.plugins {
+      grpc {
+        option 'lite'
+      }
+    }
     ofSourceSet('testNano').each { task ->
       task.builtins {
         remove java
@@ -228,10 +237,8 @@
   }
 }
 
-test.dependsOn('testGolden', 'testLiteGolden', 'testNanoGolden')
-
-def configureTestTask(Task task, String suffix, String dep,
-    String extraPackage) {
+def configureTestTask(Task task, String dep, String extraPackage) {
+  test.dependsOn task
   task.dependsOn "generateTest${dep}Proto"
   if (osdetector.os != 'windows') {
     task.executable "diff"
@@ -241,12 +248,12 @@
   // File isn't found on Windows if last slash is forward-slash
   def slash = System.getProperty("file.separator")
   task.args "$buildDir/generated/source/proto/test${dep}/grpc/io/grpc/testing/integration${extraPackage}${slash}TestServiceGrpc.java",
-       "$projectDir/src/test/golden/TestService${suffix}.java.txt"
+       "$projectDir/src/test${dep}/golden/TestService.java.txt"
 }
 
 task testGolden(type: Exec)
 task testLiteGolden(type: Exec)
 task testNanoGolden(type: Exec)
-configureTestTask(testGolden, '', '', '')
-configureTestTask(testLiteGolden, 'Lite', '', '/lite')
-configureTestTask(testNanoGolden, 'Nano', 'Nano', '/nano')
+configureTestTask(testGolden, '', '')
+configureTestTask(testLiteGolden, 'Lite', '')
+configureTestTask(testNanoGolden, 'Nano', '/nano')