Restructure Java staging clients

.circleci/config.yml

@@ -108,7 +108,7 @@ jobs:
       - run:
           name: Run GAPIC unit tests.
           command: |
-            ./gradlew clean test
+            ./generated/java/gradlew -p ./generated/java clean test
     working_directory: /var/code/googleapis/
 
   openjdk8:
@@ -121,7 +121,7 @@ jobs:
       - run:
           name: Run GAPIC unit tests.
           command: |
-            ./gradlew clean test
+            ./generated/java/gradlew -p ./generated/java clean test
     working_directory: /var/code/googleapis/
 
   sync_to_private:

generated/java/build.gradle

@@ -73,27 +73,6 @@ subprojects {
 
   check.dependsOn jacocoTestReport
 
-  // Source jar
-  // ----------
-
-  task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-  }
-
-  // JavaDoc
-  // -------
-
-  task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
-  }
-
-  javadoc.options {
-    encoding = 'UTF-8'
-    links 'https://docs.oracle.com/javase/7/docs/api/'
-  }
-
   // Test Logging
   // ------------
 
@@ -118,94 +97,94 @@ subprojects {
   }
 }
 
-project(':generated:java:google-cloud-dlp-v2beta1') {
+project(':gapic-google-cloud-error-reporting-v1beta1') {
   dependencies {
-    compile 'com.google.api:gax:1.1.0'
-    compile 'com.google.api:gax-grpc:0.17.0'
-    compile 'com.google.api.grpc:grpc-google-cloud-dlp-v2beta1:0.1.10'
+    compile project(':proto-google-cloud-error-reporting-v1beta1')
+    testCompile project(':grpc-google-cloud-error-reporting-v1beta1')
   }
 }
 
-project(':generated:java:google-cloud-error-reporting-v1beta1') {
+project(':gapic-google-cloud-language-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-error-reporting-v1beta1:' + generated_grpc_version
+    compile project(':proto-google-cloud-language-v1')
+    testCompile project(':grpc-google-cloud-language-v1')
   }
 }
 
-project(':generated:java:google-cloud-language-v1') {
+project(':gapic-google-cloud-language-v1beta2') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-language-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-language-v1beta2')
+    testCompile project(':grpc-google-cloud-language-v1beta2')
   }
 }
 
-project(':generated:java:google-cloud-language-v1beta2') {
+project(':gapic-google-cloud-logging-v2') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-language-v1beta2:' + generated_grpc_version
+    compile project(':proto-google-cloud-logging-v2')
+    testCompile project(':grpc-google-cloud-logging-v2')
   }
 }
 
-project(':generated:java:google-cloud-logging-v2') {
+project(':gapic-google-cloud-monitoring-v3') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-logging-v2:' + generated_grpc_version
+    compile project(':proto-google-cloud-monitoring-v3')
+    testCompile project(':grpc-google-cloud-monitoring-v3')
   }
 }
 
-project(':generated:java:google-cloud-monitoring-v3') {
+project(':gapic-google-cloud-pubsub-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-monitoring-v3:' + generated_grpc_version
-  }
-}
-
-project(':generated:java:google-cloud-pubsub-v1') {
-  dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-pubsub-v1:' + generated_grpc_version
-  }
-}
-
-project(':generated:java:google-cloud-spanner-v1') {
-  dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-spanner-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-pubsub-v1')
+    testCompile project(':grpc-google-cloud-pubsub-v1'),
+      libraries.iam
   }
 }
 
-project(':generated:java:google-cloud-spanner-admin-database-v1') {
+project(':gapic-google-cloud-spanner-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-spanner-v1')
+    testCompile project(':grpc-google-cloud-spanner-v1')
   }
 }
 
-project(':generated:java:google-cloud-spanner-admin-instance-v1') {
+project(':gapic-google-cloud-spanner-admin-database-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-spanner-admin-database-v1')
+    testCompile project(':grpc-google-cloud-spanner-admin-database-v1')
   }
 }
 
-project(':generated:java:google-cloud-speech-v1') {
+project(':gapic-google-cloud-spanner-admin-instance-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-speech-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-spanner-admin-instance-v1')
+    testCompile project(':grpc-google-cloud-spanner-admin-instance-v1')
   }
 }
 
-project(':generated:java:google-cloud-speech-v1beta1') {
+project(':gapic-google-cloud-speech-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-speech-v1beta1:' + generated_grpc_version
+    compile project(':proto-google-cloud-speech-v1')
+    testCompile project(':grpc-google-cloud-speech-v1')
   }
 }
 
-project(':generated:java:google-cloud-trace-v1') {
+project(':gapic-google-cloud-speech-v1beta1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-trace-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-speech-v1beta1')
+    testCompile project(':grpc-google-cloud-speech-v1beta1')
   }
 }
 
-project(':generated:java:google-cloud-vision-v1') {
+project(':gapic-google-cloud-trace-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-cloud-vision-v1:' + generated_grpc_version
+    compile project(':proto-google-cloud-trace-v1')
+    testCompile project(':grpc-google-cloud-trace-v1')
   }
 }
 
-project(':generated:java:google-longrunning-v1') {
+project(':gapic-google-cloud-vision-v1') {
   dependencies {
-    compile 'com.google.api.grpc:grpc-google-common-protos:' + generated_grpc_version
+    compile project(':proto-google-cloud-vision-v1')
+    testCompile project(':grpc-google-cloud-vision-v1')
   }
 }