Restructure Java staging clients #297

shinfan · 2017-05-11T21:16:50Z

The new structure will make the CI depend on the local proto and grpc clients instead of depending on Maven.

The new structure looks like:

root
- generated
  - java
    - settings.gradle
    - gradle wrapper
    - build.gradle
    - gapic-* clients
    - proto-* clients
      - build.gradle
    - grpc-* clients
      - build.gradle

In the root pom, the dependency configuration looks like this: (Use error reporting as an example)

project(':generated:java:gapic-google-cloud-error-reporting-v1beta1') {
  dependencies {
    compile project(':generated:java:proto-google-cloud-error-reporting-v1beta1')
    testCompile project(':generated:java:grpc-google-cloud-error-reporting-v1beta1')
  }
}

lukesneeringer · 2017-05-11T21:57:22Z

Can the gradle specific stuff live in generated/java/ and not in the shared area?

shinfan · 2017-05-11T23:21:22Z

@lukesneeringer I have moved the java stuff under generated/java and created an issue to move PHP stuff under generated/php. PTAL.

...beta1/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java

@@ -87,7 +87,7 @@
 * </pre>
 */
 @Generated("by GAPIC")
-@ExperimentalApi
+@BetaApi


lukesneeringer · 2017-05-15T14:26:48Z

@shinfan Thanks. :-)

shinfan · 2017-05-18T17:47:15Z

@garrettjonesgoogle PTAL

generated/java/proto-google-longrunning-v1/staging.gradle

+dependencies {
+  compile "com.google.protobuf:protobuf-java:3.2.0"
+  compile "com.google.api:api-common:1.0.0-rc1"
+  compile "com.google.api.grpc:proto-google-common-protos:0.1.9"


generated/java/proto-google-longrunning-v1/staging.gradle

+
+artifacts {
+  archives javadocJar, sourcesJar
+}


generated/java/proto-google-longrunning-v1/staging.gradle

+
+dependencies {
+  compile "com.google.protobuf:protobuf-java:3.2.0"
+  compile "com.google.api:api-common:1.0.0-rc1"


generated/java/proto-google-longrunning-v1/staging.gradle

@@ -0,0 +1,42 @@
+buildscript {


…o java

shinfan · 2017-05-18T20:15:16Z

@garrettjonesgoogle PTAL

generated/java/proto-google-longrunning-v1/build.gradle

+dependencies {
+  compile "com.google.protobuf:protobuf-java:3.2.0"
+  compile "com.google.api:api-common:1.1.0"
+  compile "com.google.api.grpc:proto-google-common-protos:0.1.11"


garrettjonesgoogle · 2017-05-18T21:35:58Z

LGTM after tests pass

shinfan requested review from lukesneeringer, garrettjonesgoogle, michaelbausor, vam-google and neozwu May 11, 2017 21:16

shinfan mentioned this pull request May 12, 2017

Update Java grpc metadata for new staging structure googleapis/gapic-generator#1265

Merged

garrettjonesgoogle reviewed May 13, 2017

View reviewed changes

...beta1/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java Outdated

@@ -87,7 +87,7 @@

* </pre>

*/

@Generated("by GAPIC")

@ExperimentalApi

@BetaApi

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

lukesneeringer approved these changes May 15, 2017

View reviewed changes

shinfan mentioned this pull request May 18, 2017

Refresh java clients #306

Merged

shinfan added 7 commits May 17, 2017 20:05

Restructure api-client-staging for Java

d4b4815

Move gradle under generated/java/

9202ce2

Fix circle CI

5ceac5f

Add staging.gradle

40cce4a

Update

88783bf

Add longrunning and common-protos

9ecf708

Add iam

1e3accd

shinfan force-pushed the java branch from 66de580 to 1e3accd Compare May 18, 2017 17:33

shinfan added 2 commits May 18, 2017 10:38

Fix tests

3dbf52b

Remove DLP

5459d3e

garrettjonesgoogle reviewed May 18, 2017

View reviewed changes

shinfan added 2 commits May 18, 2017 13:03

Remove staging.gradle

518deee

Merge branch 'master' of github.com:googleapis/api-client-staging int…

cece31a

…o java

garrettjonesgoogle reviewed May 18, 2017

View reviewed changes

shinfan added 2 commits May 18, 2017 13:59

Remove DLP from merge and add script for settings

27a068a

Use local common-protos and iam

2a481bd

update root build.gradle

69ac5cb

shinfan merged commit 755dfd6 into master May 18, 2017

shinfan deleted the java branch May 18, 2017 21:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Restructure Java staging clients #297

Restructure Java staging clients #297

shinfan commented May 11, 2017 •

edited

Loading

lukesneeringer commented May 11, 2017 •

edited

Loading

shinfan commented May 11, 2017

This comment was marked as spam.

This comment was marked as spam.

lukesneeringer commented May 15, 2017

shinfan commented May 18, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

shinfan commented May 18, 2017

This comment was marked as spam.

This comment was marked as spam.

garrettjonesgoogle commented May 18, 2017

Restructure Java staging clients #297

Restructure Java staging clients #297

Conversation

shinfan commented May 11, 2017 • edited Loading

lukesneeringer commented May 11, 2017 • edited Loading

shinfan commented May 11, 2017

This comment was marked as spam.

This comment was marked as spam.

lukesneeringer commented May 15, 2017

shinfan commented May 18, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

shinfan commented May 18, 2017

This comment was marked as spam.

This comment was marked as spam.

garrettjonesgoogle commented May 18, 2017

shinfan commented May 11, 2017 •

edited

Loading

lukesneeringer commented May 11, 2017 •

edited

Loading