From c6d28a6a4de5f93b42706a39932d84027336228b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:30:21 +0000 Subject: [PATCH 01/21] chore: release 2.1.4-SNAPSHOT (#125) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-gsuite-addons-bom/pom.xml | 10 +++++----- google-cloud-gsuite-addons/pom.xml | 4 ++-- grpc-google-cloud-gsuite-addons-v1/pom.xml | 4 ++-- pom.xml | 10 +++++----- proto-google-apps-script-type-protos/pom.xml | 4 ++-- proto-google-cloud-gsuite-addons-v1/pom.xml | 4 ++-- versions.txt | 8 ++++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/google-cloud-gsuite-addons-bom/pom.xml b/google-cloud-gsuite-addons-bom/pom.xml index eac14829..c3eee2bb 100644 --- a/google-cloud-gsuite-addons-bom/pom.xml +++ b/google-cloud-gsuite-addons-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-gsuite-addons-bom - 2.1.3 + 2.1.4-SNAPSHOT pom com.google.cloud @@ -56,22 +56,22 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-gsuite-addons-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc proto-google-cloud-gsuite-addons-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc proto-google-apps-script-type-protos - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/google-cloud-gsuite-addons/pom.xml b/google-cloud-gsuite-addons/pom.xml index db43a995..fcc46694 100644 --- a/google-cloud-gsuite-addons/pom.xml +++ b/google-cloud-gsuite-addons/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-gsuite-addons - 2.1.3 + 2.1.4-SNAPSHOT jar Google Google Workspace Add-ons API https://github.com/googleapis/java-gsuite-addons @@ -11,7 +11,7 @@ com.google.cloud google-cloud-gsuite-addons-parent - 2.1.3 + 2.1.4-SNAPSHOT google-cloud-gsuite-addons diff --git a/grpc-google-cloud-gsuite-addons-v1/pom.xml b/grpc-google-cloud-gsuite-addons-v1/pom.xml index ef608b59..a05c7417 100644 --- a/grpc-google-cloud-gsuite-addons-v1/pom.xml +++ b/grpc-google-cloud-gsuite-addons-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-gsuite-addons-v1 - 2.1.3 + 2.1.4-SNAPSHOT grpc-google-cloud-gsuite-addons-v1 GRPC library for google-cloud-gsuite-addons com.google.cloud google-cloud-gsuite-addons-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0a09d02e..c579152b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-gsuite-addons-parent pom - 2.1.3 + 2.1.4-SNAPSHOT Google Google Workspace Add-ons API Parent https://github.com/googleapis/java-gsuite-addons @@ -60,22 +60,22 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc proto-google-apps-script-type-protos - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-gsuite-addons-v1 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api.grpc proto-google-cloud-gsuite-addons-v1 - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/proto-google-apps-script-type-protos/pom.xml b/proto-google-apps-script-type-protos/pom.xml index c8f4d220..b2abe7ba 100644 --- a/proto-google-apps-script-type-protos/pom.xml +++ b/proto-google-apps-script-type-protos/pom.xml @@ -5,13 +5,13 @@ com.google.cloud google-cloud-gsuite-addons-parent - 2.1.3 + 2.1.4-SNAPSHOT 4.0.0 com.google.api.grpc proto-google-apps-script-type-protos proto-google-apps-script-type-protos - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/proto-google-cloud-gsuite-addons-v1/pom.xml b/proto-google-cloud-gsuite-addons-v1/pom.xml index 7a8ad402..a3eda47a 100644 --- a/proto-google-cloud-gsuite-addons-v1/pom.xml +++ b/proto-google-cloud-gsuite-addons-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-gsuite-addons-v1 - 2.1.3 + 2.1.4-SNAPSHOT proto-google-cloud-gsuite-addons-v1 Proto library for google-cloud-gsuite-addons com.google.cloud google-cloud-gsuite-addons-parent - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 3ba1216c..a8d1f01c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-gsuite-addons:2.1.3:2.1.3 -grpc-google-cloud-gsuite-addons-v1:2.1.3:2.1.3 -proto-google-cloud-gsuite-addons-v1:2.1.3:2.1.3 -proto-google-apps-script-type-protos:2.1.3:2.1.3 +google-cloud-gsuite-addons:2.1.3:2.1.4-SNAPSHOT +grpc-google-cloud-gsuite-addons-v1:2.1.3:2.1.4-SNAPSHOT +proto-google-cloud-gsuite-addons-v1:2.1.3:2.1.4-SNAPSHOT +proto-google-apps-script-type-protos:2.1.3:2.1.4-SNAPSHOT From 769e5885939c2e9c65cabcec94fd0652a686944d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 23:38:37 +0000 Subject: [PATCH 02/21] chore(ruby): Re-enable bigquery-storage-v1 generation, which also required updating protobuf from 3.15.3 to 3.18.1 for codegen (#119) - [x] Regenerate this pull request now. PiperOrigin-RevId: 403132955 Source-Link: https://github.com/googleapis/googleapis/commit/d2977af9e9f1fc0c9dc8368352daa032471f3c63 Source-Link: https://github.com/googleapis/googleapis-gen/commit/99bb13c813c0e9c2682d03a8b3c3bcb382a909c9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTliYjEzYzgxM2MwZTljMjY4MmQwM2E4YjNjM2JjYjM4MmE5MDljOSJ9 --- .../v1/stub/GSuiteAddOnsStubSettings.java | 4 +++- .../google/cloud/gsuiteaddons/v1/Authorization.java | 12 ++++++------ .../gsuiteaddons/v1/CreateDeploymentRequest.java | 8 ++++---- .../gsuiteaddons/v1/DeleteDeploymentRequest.java | 8 ++++---- .../com/google/cloud/gsuiteaddons/v1/Deployment.java | 8 ++++---- .../gsuiteaddons/v1/GetAuthorizationRequest.java | 4 ++-- .../cloud/gsuiteaddons/v1/GetDeploymentRequest.java | 4 ++-- .../gsuiteaddons/v1/GetInstallStatusRequest.java | 4 ++-- .../gsuiteaddons/v1/InstallDeploymentRequest.java | 4 ++-- .../google/cloud/gsuiteaddons/v1/InstallStatus.java | 4 ++-- .../gsuiteaddons/v1/ListDeploymentsRequest.java | 8 ++++---- .../gsuiteaddons/v1/ListDeploymentsResponse.java | 4 ++-- .../gsuiteaddons/v1/UninstallDeploymentRequest.java | 4 ++-- 13 files changed, 39 insertions(+), 37 deletions(-) diff --git a/google-cloud-gsuite-addons/src/main/java/com/google/cloud/gsuiteaddons/v1/stub/GSuiteAddOnsStubSettings.java b/google-cloud-gsuite-addons/src/main/java/com/google/cloud/gsuiteaddons/v1/stub/GSuiteAddOnsStubSettings.java index b0c96797..21d0f228 100644 --- a/google-cloud-gsuite-addons/src/main/java/com/google/cloud/gsuiteaddons/v1/stub/GSuiteAddOnsStubSettings.java +++ b/google-cloud-gsuite-addons/src/main/java/com/google/cloud/gsuiteaddons/v1/stub/GSuiteAddOnsStubSettings.java @@ -250,7 +250,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Authorization.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Authorization.java index 50d337a4..f8717615 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Authorization.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Authorization.java @@ -294,13 +294,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getServiceAccountEmailBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, serviceAccountEmail_); } - if (!getOauthClientIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oauthClientId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, oauthClientId_); } unknownFields.writeTo(output); @@ -312,13 +312,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getServiceAccountEmailBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, serviceAccountEmail_); } - if (!getOauthClientIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oauthClientId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, oauthClientId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/CreateDeploymentRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/CreateDeploymentRequest.java index b3a32179..af0f034f 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/CreateDeploymentRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/CreateDeploymentRequest.java @@ -309,10 +309,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } - if (!getDeploymentIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deploymentId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, deploymentId_); } if (deployment_ != null) { @@ -327,10 +327,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } - if (!getDeploymentIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deploymentId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, deploymentId_); } if (deployment_ != null) { diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/DeleteDeploymentRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/DeleteDeploymentRequest.java index 5402c507..72c0041d 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/DeleteDeploymentRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/DeleteDeploymentRequest.java @@ -239,10 +239,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getEtagBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, etag_); } unknownFields.writeTo(output); @@ -254,10 +254,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getEtagBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, etag_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Deployment.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Deployment.java index 9785a6cf..4b5b12f4 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Deployment.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/Deployment.java @@ -379,7 +379,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } for (int i = 0; i < oauthScopes_.size(); i++) { @@ -388,7 +388,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (addOns_ != null) { output.writeMessage(3, getAddOns()); } - if (!getEtagBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, etag_); } unknownFields.writeTo(output); @@ -400,7 +400,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } { @@ -414,7 +414,7 @@ public int getSerializedSize() { if (addOns_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getAddOns()); } - if (!getEtagBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, etag_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetAuthorizationRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetAuthorizationRequest.java index b2cb449a..468f7b65 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetAuthorizationRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetAuthorizationRequest.java @@ -182,7 +182,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); } unknownFields.writeTo(output); @@ -194,7 +194,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetDeploymentRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetDeploymentRequest.java index f5ddd7e5..8e2ab510 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetDeploymentRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetDeploymentRequest.java @@ -180,7 +180,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -192,7 +192,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetInstallStatusRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetInstallStatusRequest.java index 44b008fc..29618913 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetInstallStatusRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GetInstallStatusRequest.java @@ -180,7 +180,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -192,7 +192,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallDeploymentRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallDeploymentRequest.java index 905f51c6..d6b2287e 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallDeploymentRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallDeploymentRequest.java @@ -180,7 +180,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -192,7 +192,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallStatus.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallStatus.java index c827536b..90626870 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallStatus.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/InstallStatus.java @@ -237,7 +237,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (installed_ != null) { @@ -252,7 +252,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (installed_ != null) { diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsRequest.java index 8542f437..dbaa563b 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsRequest.java @@ -269,13 +269,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } if (pageSize_ != 0) { output.writeInt32(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_); } unknownFields.writeTo(output); @@ -287,13 +287,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } if (pageSize_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsResponse.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsResponse.java index a61d8237..19d8c5b1 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsResponse.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/ListDeploymentsResponse.java @@ -265,7 +265,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < deployments_.size(); i++) { output.writeMessage(1, deployments_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } unknownFields.writeTo(output); @@ -280,7 +280,7 @@ public int getSerializedSize() { for (int i = 0; i < deployments_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, deployments_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/UninstallDeploymentRequest.java b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/UninstallDeploymentRequest.java index a8bf9fe5..5d042bb2 100644 --- a/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/UninstallDeploymentRequest.java +++ b/proto-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/UninstallDeploymentRequest.java @@ -180,7 +180,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -192,7 +192,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); From aa1e64d75c98e528b245cbff7f77e35d63eaa2ba Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 22 Oct 2021 00:20:23 +0200 Subject: [PATCH 03/21] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.0 (#129) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.1.0` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​120-httpswwwgithubcomgoogleapisjava-shared-configcomparev110v120-2021-10-21) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0) ##### Features - Introduce Native Image testing build script changes ([#​1240](https://www.togithub.com/googleapis/java-shared-config/issues/1240)) ([#​334](https://www.togithub.com/googleapis/java-shared-config/issues/334)) ([4643cf1](https://www.github.com/googleapis/java-shared-config/commit/4643cf15be0b37fa8fa905d544d438cda7ef2ecd)) ##### Bug Fixes - **java:** downgrade native maven plugin version ([#​335](https://www.togithub.com/googleapis/java-shared-config/issues/335)) ([5834284](https://www.github.com/googleapis/java-shared-config/commit/5834284176fb34713d10082ce04f3b6abba85ad8))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-gsuite-addons). --- README.md | 6 +++--- google-cloud-gsuite-addons-bom/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 05e5370f..365ebee9 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-gsuite-addons - 2.1.2 + 2.1.3 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-gsuite-addons:2.1.2' +implementation 'com.google.cloud:google-cloud-gsuite-addons:2.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-gsuite-addons" % "2.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-gsuite-addons" % "2.1.3" ``` ## Authentication diff --git a/google-cloud-gsuite-addons-bom/pom.xml b/google-cloud-gsuite-addons-bom/pom.xml index c3eee2bb..44f52596 100644 --- a/google-cloud-gsuite-addons-bom/pom.xml +++ b/google-cloud-gsuite-addons-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 Google Google Workspace Add-ons API BOM diff --git a/pom.xml b/pom.xml index c579152b..27cda2a1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 From 03cd51534a028fae48be50dae58949ee6c87cb7c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 22 Oct 2021 00:22:24 +0200 Subject: [PATCH 04/21] chore(deps): update dependency com.google.cloud:google-cloud-gsuite-addons to v2.1.3 (#128) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-gsuite-addons](https://togithub.com/googleapis/java-gsuite-addons) | `2.1.2` -> `2.1.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-gsuite-addons/2.1.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-gsuite-addons/2.1.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-gsuite-addons/2.1.3/compatibility-slim/2.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-gsuite-addons/2.1.3/confidence-slim/2.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-gsuite-addons ### [`v2.1.3`](https://togithub.com/googleapis/java-gsuite-addons/blob/master/CHANGELOG.md#​213-httpswwwgithubcomgoogleapisjava-gsuite-addonscomparev212v213-2021-10-19) [Compare Source](https://togithub.com/googleapis/java-gsuite-addons/compare/v2.1.2...v2.1.3)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-gsuite-addons). --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 01930acc..faf4f875 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.2 + 2.1.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a4321bf9..95e6febc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.2 + 2.1.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9f1bce75..2143948f 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.2 + 2.1.3 From dfb63fa7a1b202b19276b839670c922561d08420 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:37:41 -0700 Subject: [PATCH 05/21] fix(java): java 17 dependency arguments (#1266) (#130) Source-Link: https://github.com/googleapis/synthtool/commit/cb2755306975de4c54ea549c9deb25703b3731bb Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/dependencies.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dc53bbb5..0df65ebe 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 + digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7..d7476cfe 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) From 6a526d252d124d584288e8890ef68f5df4a7b200 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 27 Oct 2021 09:05:34 -0700 Subject: [PATCH 06/21] changes without context (#120) autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- .../apps/script/type/AddOnWidgetSet.java | 10 +-- .../apps/script/type/AddonWidgetSet.java | 72 +++++++++++++++++++ .../apps/script/type/ScriptManifest.java | 4 +- .../type/gmail/GmailAddOnManifestProto.java | 4 +- synth.metadata | 2 +- 5 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java index 03e3dc88..fac35977 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java @@ -119,14 +119,14 @@ private AddOnWidgetSet( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.apps.script.type.AddOnWidgetSetProto + return com.google.apps.script.type.AddonWidgetSet .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.apps.script.type.AddOnWidgetSetProto + return com.google.apps.script.type.AddonWidgetSet .internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable .ensureFieldAccessorsInitialized( com.google.apps.script.type.AddOnWidgetSet.class, @@ -689,14 +689,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(builder_implements:google.apps.script.type.AddOnWidgetSet) com.google.apps.script.type.AddOnWidgetSetOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.apps.script.type.AddOnWidgetSetProto + return com.google.apps.script.type.AddonWidgetSet .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.apps.script.type.AddOnWidgetSetProto + return com.google.apps.script.type.AddonWidgetSet .internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable .ensureFieldAccessorsInitialized( com.google.apps.script.type.AddOnWidgetSet.class, @@ -727,7 +727,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.google.apps.script.type.AddOnWidgetSetProto + return com.google.apps.script.type.AddonWidgetSet .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java new file mode 100644 index 00000000..ff74b79d --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java @@ -0,0 +1,72 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/apps/script/type/addon_widget_set.proto + +package com.google.apps.script.type; + +public final class AddonWidgetSet { + private AddonWidgetSet() {} + + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} + + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); + } + + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + return descriptor; + } + + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + + static { + java.lang.String[] descriptorData = { + "\n.google/apps/script/type/addon_widget_s" + + "et.proto\022\027google.apps.script.type\"\244\002\n\016Ad" + + "dOnWidgetSet\022H\n\014used_widgets\030\001 \003(\01622.goo" + + "gle.apps.script.type.AddOnWidgetSet.Widg" + + "etType\"\307\001\n\nWidgetType\022\033\n\027WIDGET_TYPE_UNS" + + "PECIFIED\020\000\022\017\n\013DATE_PICKER\020\001\022\022\n\016STYLED_BU" + + "TTONS\020\002\022\024\n\020PERSISTENT_FORMS\020\003\022\020\n\014FIXED_F" + + "OOTER\020\004\022!\n\035UPDATE_SUBJECT_AND_RECIPIENTS" + + "\020\005\022\017\n\013GRID_WIDGET\020\006\022\033\n\027ADDON_COMPOSE_UI_" + + "ACTION\020\007B\250\001\n\033com.google.apps.script.type" + + "P\001Z6google.golang.org/genproto/googleapi" + + "s/apps/script/type\252\002\027Google.Apps.Script." + + "Type\312\002\027Google\\Apps\\Script\\Type\352\002\032Google:" + + ":Apps::Script::Typeb\006proto3" + }; + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); + internal_static_google_apps_script_type_AddOnWidgetSet_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable = + new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_google_apps_script_type_AddOnWidgetSet_descriptor, + new java.lang.String[] { + "UsedWidgets", + }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java index 05553f41..6174baa6 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java @@ -81,7 +81,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(), + com.google.apps.script.type.AddonWidgetSet.getDescriptor(), com.google.apps.script.type.ExtensionPoint.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), }); @@ -116,7 +116,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "AuthorizationHeader", }); - com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(); + com.google.apps.script.type.AddonWidgetSet.getDescriptor(); com.google.apps.script.type.ExtensionPoint.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java index 850a0a07..6876cff1 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java @@ -94,7 +94,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(), + com.google.apps.script.type.AddonWidgetSet.getDescriptor(), com.google.apps.script.type.ExtensionPoint.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), }); @@ -140,7 +140,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_apps_script_type_gmail_UnconditionalTrigger_descriptor, new java.lang.String[] {}); - com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(); + com.google.apps.script.type.AddonWidgetSet.getDescriptor(); com.google.apps.script.type.ExtensionPoint.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); } diff --git a/synth.metadata b/synth.metadata index 7659da11..c7af78b6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-gsuite-addons.git", - "sha": "42017004ded7208095a9cd5fbd84a991f335431f" + "sha": "71a00376765c7db80add2671366984ec33ed9c0f" } }, { From 33dfd81a0306c4397b09534390a8999e9cc53ba3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 3 Nov 2021 14:48:26 -0700 Subject: [PATCH 07/21] chore: re-generated to pick up changes from googleapis (#121) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/fd74262d-5b42-4dbb-97c5-61dd9f1b3000/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) PiperOrigin-RevId: 403132955 Source-Link: https://github.com/googleapis/googleapis/commit/d2977af9e9f1fc0c9dc8368352daa032471f3c63 PiperOrigin-RevId: 374926588 Source-Link: https://github.com/googleapis/googleapis/commit/d606bb4a7852604e4045948d6340e73cb0d1d70b --- .../apps/script/type/CommonAddOnManifest.java | 8 ++++---- .../apps/script/type/HomepageExtensionPoint.java | 4 ++-- .../apps/script/type/LayoutProperties.java | 8 ++++---- .../apps/script/type/MenuItemExtensionPoint.java | 12 ++++++------ .../type/UniversalActionExtensionPoint.java | 4 ++-- .../type/calendar/CalendarAddOnManifest.java | 4 ++-- .../type/calendar/CalendarExtensionPoint.java | 4 ++-- .../script/type/calendar/ConferenceSolution.java | 16 ++++++++-------- .../script/type/docs/DocsExtensionPoint.java | 4 ++-- .../script/type/drive/DriveExtensionPoint.java | 4 ++-- .../script/type/gmail/ContextualTrigger.java | 4 ++-- .../script/type/gmail/GmailAddOnManifest.java | 4 ++-- .../apps/script/type/gmail/UniversalAction.java | 4 ++-- .../script/type/sheets/SheetsExtensionPoint.java | 4 ++-- .../script/type/slides/SlidesExtensionPoint.java | 4 ++-- synth.metadata | 6 +++--- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifest.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifest.java index 1c3c6785..08359d8e 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifest.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifest.java @@ -652,10 +652,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getLogoUrlBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logoUrl_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, logoUrl_); } if (layoutProperties_ != null) { @@ -685,10 +685,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getLogoUrlBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logoUrl_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, logoUrl_); } if (layoutProperties_ != null) { diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HomepageExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HomepageExtensionPoint.java index c4f6c2e8..051e7d6f 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HomepageExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HomepageExtensionPoint.java @@ -246,7 +246,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } if (enabled_ != null) { @@ -261,7 +261,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } if (enabled_ != null) { diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/LayoutProperties.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/LayoutProperties.java index 1b7e47d4..b19dc142 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/LayoutProperties.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/LayoutProperties.java @@ -243,10 +243,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getPrimaryColorBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(primaryColor_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, primaryColor_); } - if (!getSecondaryColorBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secondaryColor_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, secondaryColor_); } unknownFields.writeTo(output); @@ -258,10 +258,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getPrimaryColorBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(primaryColor_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, primaryColor_); } - if (!getSecondaryColorBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secondaryColor_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, secondaryColor_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/MenuItemExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/MenuItemExtensionPoint.java index dbef9d96..ac6fa0f9 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/MenuItemExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/MenuItemExtensionPoint.java @@ -295,13 +295,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } - if (!getLabelBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, label_); } - if (!getLogoUrlBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logoUrl_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, logoUrl_); } unknownFields.writeTo(output); @@ -313,13 +313,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } - if (!getLabelBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, label_); } - if (!getLogoUrlBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logoUrl_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, logoUrl_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/UniversalActionExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/UniversalActionExtensionPoint.java index 0a6550e7..f94ffc52 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/UniversalActionExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/UniversalActionExtensionPoint.java @@ -377,7 +377,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getLabelBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, label_); } if (actionTypeCase_ == 2) { @@ -395,7 +395,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getLabelBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, label_); } if (actionTypeCase_ == 2) { diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifest.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifest.java index ddfae3aa..aff796b2 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifest.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifest.java @@ -755,7 +755,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < conferenceSolution_.size(); i++) { output.writeMessage(3, conferenceSolution_.get(i)); } - if (!getCreateSettingsUrlFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(createSettingsUrlFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, createSettingsUrlFunction_); } if (homepageTrigger_ != null) { @@ -785,7 +785,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, conferenceSolution_.get(i)); } - if (!getCreateSettingsUrlFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(createSettingsUrlFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, createSettingsUrlFunction_); } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarExtensionPoint.java index be4257a5..80365d00 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarExtensionPoint.java @@ -176,7 +176,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } unknownFields.writeTo(output); @@ -188,7 +188,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/ConferenceSolution.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/ConferenceSolution.java index f582d300..57040b09 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/ConferenceSolution.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/ConferenceSolution.java @@ -353,16 +353,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getOnCreateFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onCreateFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, onCreateFunction_); } - if (!getIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, id_); } - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, name_); } - if (!getLogoUrlBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logoUrl_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 6, logoUrl_); } unknownFields.writeTo(output); @@ -374,16 +374,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getOnCreateFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onCreateFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, onCreateFunction_); } - if (!getIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, id_); } - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, name_); } - if (!getLogoUrlBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logoUrl_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, logoUrl_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsExtensionPoint.java index d186f961..c673d8fd 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsExtensionPoint.java @@ -174,7 +174,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } unknownFields.writeTo(output); @@ -186,7 +186,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveExtensionPoint.java index a343f85d..cc1f165e 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveExtensionPoint.java @@ -177,7 +177,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } unknownFields.writeTo(output); @@ -189,7 +189,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ContextualTrigger.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ContextualTrigger.java index 4b8cd0ab..d1d54d93 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ContextualTrigger.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ContextualTrigger.java @@ -296,7 +296,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (triggerCase_ == 1) { output.writeMessage(1, (com.google.apps.script.type.gmail.UnconditionalTrigger) trigger_); } - if (!getOnTriggerFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onTriggerFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, onTriggerFunction_); } unknownFields.writeTo(output); @@ -313,7 +313,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 1, (com.google.apps.script.type.gmail.UnconditionalTrigger) trigger_); } - if (!getOnTriggerFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onTriggerFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, onTriggerFunction_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifest.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifest.java index 76a8e372..543abb2c 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifest.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifest.java @@ -534,7 +534,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < universalActions_.size(); i++) { output.writeMessage(4, universalActions_.get(i)); } - if (!getAuthorizationCheckFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizationCheckFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, authorizationCheckFunction_); } if (composeTrigger_ != null) { @@ -559,7 +559,7 @@ public int getSerializedSize() { for (int i = 0; i < universalActions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, universalActions_.get(i)); } - if (!getAuthorizationCheckFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizationCheckFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, authorizationCheckFunction_); } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UniversalAction.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UniversalAction.java index 1188988f..c96eec7c 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UniversalAction.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UniversalAction.java @@ -384,7 +384,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getTextBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, text_); } if (actionTypeCase_ == 2) { @@ -402,7 +402,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getTextBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, text_); } if (actionTypeCase_ == 2) { diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsExtensionPoint.java index 98e928f9..fe10e860 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsExtensionPoint.java @@ -174,7 +174,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } unknownFields.writeTo(output); @@ -186,7 +186,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesExtensionPoint.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesExtensionPoint.java index 8b2eedbd..80a917f5 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesExtensionPoint.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesExtensionPoint.java @@ -174,7 +174,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, runFunction_); } unknownFields.writeTo(output); @@ -186,7 +186,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getRunFunctionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(runFunction_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, runFunction_); } size += unknownFields.getSerializedSize(); diff --git a/synth.metadata b/synth.metadata index c7af78b6..03dac515 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,15 +11,15 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "4bb4b761e40d74849b72f8af050f9b3c41cfee90", - "internalRef": "373700585" + "sha": "d2977af9e9f1fc0c9dc8368352daa032471f3c63", + "internalRef": "403132955" } } ], "generatedFiles": [ "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java", "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetOrBuilder.java", - "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetProto.java", "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifest.java", "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifestOrBuilder.java", "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ExtensionPoint.java", From 9aeace06a65ee8ee6e4062815d4f43e2069bd199 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 22:16:18 +0000 Subject: [PATCH 08/21] chore(java): remove pin on Apache Maven 3.8.1 from github actions (#1268) (#134) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 0df65ebe..5a79fcd5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 + digest: sha256:ed012741acaae5d03e011244585a1f0625a596d31568967d77772aa5a0a51d5e diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d723..d95a11a2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,9 +12,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -27,9 +24,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -45,9 +39,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -58,9 +49,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -73,9 +61,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -83,4 +68,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file From 98929554ecb105b09a70854e92d348dc8a676c7f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:22:31 +0000 Subject: [PATCH 09/21] Update ci.yaml (#1275) (#135) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5a79fcd5..994dd04b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:ed012741acaae5d03e011244585a1f0625a596d31568967d77772aa5a0a51d5e + digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d95a11a2..93b337c6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: @@ -68,4 +69,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr From c2c2eeddf50c9f8bafb4024e7dc74240be07c937 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 8 Nov 2021 15:16:37 -0500 Subject: [PATCH 10/21] chore: complete migration to owlbot (#136) --- .github/.OwlBot.yaml | 17 ++- .../apps/script/type/AddOnWidgetSet.java | 10 +- .../apps/script/type/AddonWidgetSet.java | 72 ---------- .../apps/script/type/ScriptManifest.java | 4 +- .../type/gmail/GmailAddOnManifestProto.java | 4 +- .../apps/script/type/addon_widget_set.proto | 58 ++++++++ .../calendar/calendar_addon_manifest.proto | 107 +++++++++++++++ .../type/docs/docs_addon_manifest.proto | 47 +++++++ .../type/drive/drive_addon_manifest.proto | 48 +++++++ .../apps/script/type/extension_point.proto | 77 +++++++++++ .../type/gmail/gmail_addon_manifest.proto | 128 ++++++++++++++++++ .../apps/script/type/script_manifest.proto | 105 ++++++++++++++ .../type/sheets/sheets_addon_manifest.proto | 47 +++++++ .../type/slides/slides_addon_manifest.proto | 47 +++++++ synth.py | 75 ---------- 15 files changed, 687 insertions(+), 159 deletions(-) delete mode 100644 proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/addon_widget_set.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/calendar/calendar_addon_manifest.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/docs/docs_addon_manifest.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/drive/drive_addon_manifest.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/extension_point.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/gmail/gmail_addon_manifest.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/script_manifest.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/sheets/sheets_addon_manifest.proto create mode 100644 proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/slides/slides_addon_manifest.proto delete mode 100644 synth.py diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 828a0731..6c1e0239 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -20,9 +20,6 @@ deep-remove-regex: - "/proto-google-.*/src" - "/google-.*/src" -deep-preserve-regex: -- "/proto-google-apps-script-type-protos" - deep-copy-regex: - source: "/google/cloud/gsuiteaddons/(v.*)/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/$1/proto-google-cloud-gsuite-addons-$1/src" @@ -30,3 +27,17 @@ deep-copy-regex: dest: "/owl-bot-staging/$1/grpc-google-cloud-gsuite-addons-$1/src" - source: "/google/cloud/gsuiteaddons/(v.*)/.*-java/gapic-google-.*/src" dest: "/owl-bot-staging/$1/google-cloud-gsuite-addons/src" +- source: "/google/apps/script/type/google-apps-script-type-java/proto-google-apps-script-type-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" +- source: "/google/apps/script/type/calendar/google-apps-script-type-calendar-java/proto-google-apps-script-type-calendar-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" +- source: "/google/apps/script/type/docs/google-apps-script-type-docs-java/proto-google-apps-script-type-docs-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" +- source: "/google/apps/script/type/drive/google-apps-script-type-drive-java/proto-google-apps-script-type-drive-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" +- source: "/google/apps/script/type/gmail/google-apps-script-type-gmail-java/proto-google-apps-script-type-gmail-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" +- source: "/google/apps/script/type/sheets/google-apps-script-type-sheets-java/proto-google-apps-script-type-sheets-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" +- source: "/google/apps/script/type/slides/google-apps-script-type-slides-java/proto-google-apps-script-type-slides-java/src" + dest: "/owl-bot-staging/v1/proto-google-apps-script-type-protos/src" diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java index fac35977..03e3dc88 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java @@ -119,14 +119,14 @@ private AddOnWidgetSet( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable .ensureFieldAccessorsInitialized( com.google.apps.script.type.AddOnWidgetSet.class, @@ -689,14 +689,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(builder_implements:google.apps.script.type.AddOnWidgetSet) com.google.apps.script.type.AddOnWidgetSetOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable .ensureFieldAccessorsInitialized( com.google.apps.script.type.AddOnWidgetSet.class, @@ -727,7 +727,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java deleted file mode 100644 index ff74b79d..00000000 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/apps/script/type/addon_widget_set.proto - -package com.google.apps.script.type; - -public final class AddonWidgetSet { - private AddonWidgetSet() {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); - } - - static final com.google.protobuf.Descriptors.Descriptor - internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; - static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { - return descriptor; - } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - - static { - java.lang.String[] descriptorData = { - "\n.google/apps/script/type/addon_widget_s" - + "et.proto\022\027google.apps.script.type\"\244\002\n\016Ad" - + "dOnWidgetSet\022H\n\014used_widgets\030\001 \003(\01622.goo" - + "gle.apps.script.type.AddOnWidgetSet.Widg" - + "etType\"\307\001\n\nWidgetType\022\033\n\027WIDGET_TYPE_UNS" - + "PECIFIED\020\000\022\017\n\013DATE_PICKER\020\001\022\022\n\016STYLED_BU" - + "TTONS\020\002\022\024\n\020PERSISTENT_FORMS\020\003\022\020\n\014FIXED_F" - + "OOTER\020\004\022!\n\035UPDATE_SUBJECT_AND_RECIPIENTS" - + "\020\005\022\017\n\013GRID_WIDGET\020\006\022\033\n\027ADDON_COMPOSE_UI_" - + "ACTION\020\007B\250\001\n\033com.google.apps.script.type" - + "P\001Z6google.golang.org/genproto/googleapi" - + "s/apps/script/type\252\002\027Google.Apps.Script." - + "Type\312\002\027Google\\Apps\\Script\\Type\352\002\032Google:" - + ":Apps::Script::Typeb\006proto3" - }; - descriptor = - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); - internal_static_google_apps_script_type_AddOnWidgetSet_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable = - new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_google_apps_script_type_AddOnWidgetSet_descriptor, - new java.lang.String[] { - "UsedWidgets", - }); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java index 6174baa6..05553f41 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java @@ -81,7 +81,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.apps.script.type.AddonWidgetSet.getDescriptor(), + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(), com.google.apps.script.type.ExtensionPoint.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), }); @@ -116,7 +116,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "AuthorizationHeader", }); - com.google.apps.script.type.AddonWidgetSet.getDescriptor(); + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(); com.google.apps.script.type.ExtensionPoint.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java index 6876cff1..850a0a07 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java @@ -94,7 +94,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.apps.script.type.AddonWidgetSet.getDescriptor(), + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(), com.google.apps.script.type.ExtensionPoint.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), }); @@ -140,7 +140,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_apps_script_type_gmail_UnconditionalTrigger_descriptor, new java.lang.String[] {}); - com.google.apps.script.type.AddonWidgetSet.getDescriptor(); + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(); com.google.apps.script.type.ExtensionPoint.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); } diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/addon_widget_set.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/addon_widget_set.proto new file mode 100644 index 00000000..477ff90f --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/addon_widget_set.proto @@ -0,0 +1,58 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type; + +option csharp_namespace = "Google.Apps.Script.Type"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type"; +option java_multiple_files = true; +option java_outer_classname = "AddOnWidgetSetProto"; +option java_package = "com.google.apps.script.type"; +option php_namespace = "Google\\Apps\\Script\\Type"; +option ruby_package = "Google::Apps::Script::Type"; + +// The widget subset used by an add-on. +message AddOnWidgetSet { + // The Widget type. DEFAULT is the basic widget set. + enum WidgetType { + // The default widget set. + WIDGET_TYPE_UNSPECIFIED = 0; + + // The date picker. + DATE_PICKER = 1; + + // Styled buttons include filled buttons and disabled buttons. + STYLED_BUTTONS = 2; + + // Persistent forms allow persisting form values during actions. + PERSISTENT_FORMS = 3; + + // Fixed footer in card. + FIXED_FOOTER = 4; + + // Update the subject and recipients of a draft. + UPDATE_SUBJECT_AND_RECIPIENTS = 5; + + // The grid widget. + GRID_WIDGET = 6; + + // A Gmail add-on action that applies to the addon compose UI. + ADDON_COMPOSE_UI_ACTION = 7; + } + + // The list of widgets used in an add-on. + repeated WidgetType used_widgets = 1; +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/calendar/calendar_addon_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/calendar/calendar_addon_manifest.proto new file mode 100644 index 00000000..3d21cd28 --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/calendar/calendar_addon_manifest.proto @@ -0,0 +1,107 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type.calendar; + +import "google/api/field_behavior.proto"; +import "google/apps/script/type/extension_point.proto"; + +option csharp_namespace = "Google.Apps.Script.Type.Calendar"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type/calendar"; +option java_multiple_files = true; +option java_outer_classname = "CalendarAddOnManifestProto"; +option java_package = "com.google.apps.script.type.calendar"; +option php_namespace = "Google\\Apps\\Script\\Type\\Calendar"; +option ruby_package = "Google::Apps::Script::Type::Calendar"; + +// Manifest section specific to Calendar Add-ons. + +// Calendar add-on manifest. +message CalendarAddOnManifest { + // An enum defining the level of data access event triggers require. + enum EventAccess { + // Default value when nothing is set for EventAccess. + UNSPECIFIED = 0; + + // METADATA gives event triggers the permission to access the metadata of + // events such as event id and calendar id. + METADATA = 1; + + // READ gives event triggers access to all provided event fields including + // the metadata, attendees, and conference data. + READ = 3; + + // WRITE gives event triggers access to the metadata of events and the + // ability to perform all actions, including adding attendees and setting + // conference data. + WRITE = 4; + + // READ_WRITE gives event triggers access to all provided event fields + // including the metadata, attendees, and conference data and the ability to + // perform all actions. + READ_WRITE = 5; + } + + // Defines an endpoint that will be executed contexts that don't + // match a declared contextual trigger. Any cards generated by this function + // will always be available to the user, but may be eclipsed by contextual + // content when this add-on declares more targeted triggers. + // + // If present, this overrides the configuration from + // `addOns.common.homepageTrigger`. + google.apps.script.type.HomepageExtensionPoint homepage_trigger = 6; + + // Defines conference solutions provided by this add-on. + repeated ConferenceSolution conference_solution = 3; + + // An endpoint to execute that creates a URL to the add-on's settings page. + string create_settings_url_function = 5; + + // An endpoint to trigger when an event is opened (viewed/edited). + CalendarExtensionPoint event_open_trigger = 10; + + // An endpoint to trigger when the open event is updated. + CalendarExtensionPoint event_update_trigger = 11; + + // Define the level of data access when an event addon is triggered. + EventAccess current_event_access = 12; +} + +// Defines conference related values. +message ConferenceSolution { + // Required. The endpoint to call when ConferenceData should be created. + string on_create_function = 1 [(google.api.field_behavior) = REQUIRED]; + + // Required. IDs should be unique across ConferenceSolutions within one + // add-on, but this is not strictly enforced. It is up to the add-on developer + // to assign them uniquely, otherwise the wrong ConferenceSolution may be + // used when the add-on is triggered. While the developer may change the + // display name of an add-on, the ID should not be changed. + string id = 4 [(google.api.field_behavior) = REQUIRED]; + + // Required. The display name of the ConferenceSolution. + string name = 5 [(google.api.field_behavior) = REQUIRED]; + + // Required. The URL for the logo image of the ConferenceSolution. + string logo_url = 6 [(google.api.field_behavior) = REQUIRED]; +} + +// Common format for declaring a calendar add-on's triggers. +message CalendarExtensionPoint { + // Required. The endpoint to execute when this extension point is + // activated. + string run_function = 1 [(google.api.field_behavior) = REQUIRED]; +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/docs/docs_addon_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/docs/docs_addon_manifest.proto new file mode 100644 index 00000000..395523be --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/docs/docs_addon_manifest.proto @@ -0,0 +1,47 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type.docs; + +import "google/api/field_behavior.proto"; +import "google/apps/script/type/extension_point.proto"; + +option csharp_namespace = "Google.Apps.Script.Type.Docs"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type/docs"; +option java_multiple_files = true; +option java_outer_classname = "DocsAddOnManifestProto"; +option java_package = "com.google.apps.script.type.docs"; +option php_namespace = "Google\\Apps\\Script\\Type\\Docs"; +option ruby_package = "Google::Apps::Script::Type::Docs"; + +// Manifest section specific to Docs Add-ons. + +// Docs add-on manifest. +message DocsAddOnManifest { + // If present, this overrides the configuration from + // `addOns.common.homepageTrigger`. + google.apps.script.type.HomepageExtensionPoint homepage_trigger = 1; + + // Endpoint to execute when file scope authorization is granted + // for this document/user pair. + DocsExtensionPoint on_file_scope_granted_trigger = 2; +} + +// Common format for declaring a Docs add-on's triggers. +message DocsExtensionPoint { + // Required. The endpoint to execute when this extension point is activated. + string run_function = 1 [(google.api.field_behavior) = REQUIRED]; +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/drive/drive_addon_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/drive/drive_addon_manifest.proto new file mode 100644 index 00000000..55da161c --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/drive/drive_addon_manifest.proto @@ -0,0 +1,48 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type.drive; + +import "google/apps/script/type/extension_point.proto"; + +option csharp_namespace = "Google.Apps.Script.Type.Drive"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type/drive"; +option java_multiple_files = true; +option java_outer_classname = "DriveAddOnManifestProto"; +option java_package = "com.google.apps.script.type.drive"; +option php_namespace = "Google\\Apps\\Script\\Type\\Drive"; +option ruby_package = "Google::Apps::Script::Type::Drive"; + +// Manifest section specific to Drive Add-ons. + +// Drive add-on manifest. +message DriveAddOnManifest { + // If present, this overrides the configuration from + // `addOns.common.homepageTrigger`. + google.apps.script.type.HomepageExtensionPoint homepage_trigger = 1; + + // Corresponds to behvior that should execute when items are selected + // in relevant Drive view (e.g. the My Drive Doclist). + DriveExtensionPoint on_items_selected_trigger = 2; +} + +// A generic extension point with common features, e.g. something that simply +// needs a corresponding run function to work. +message DriveExtensionPoint { + // Required. The endpoint to execute when this extension point is + // activated. + string run_function = 1; +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/extension_point.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/extension_point.proto new file mode 100644 index 00000000..f387c864 --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/extension_point.proto @@ -0,0 +1,77 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type; + +import "google/protobuf/wrappers.proto"; + +option csharp_namespace = "Google.Apps.Script.Type"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type"; +option java_multiple_files = true; +option java_package = "com.google.apps.script.type"; +option php_namespace = "Google\\Apps\\Script\\Type"; +option ruby_package = "Google::Apps::Script::Type"; + +// Common Manifest protos for G Suite extension-point configuration. + +// Common format for declaring a menu item, or button, that appears within a +// host app. +message MenuItemExtensionPoint { + // Required. The endpoint to execute when this extension point is + // activated. + string run_function = 1; + + // Required. User-visible text describing the action taken by activating this + // extension point. For example, "Insert invoice". + string label = 2; + + // The URL for the logo image shown in the add-on toolbar. + // + // If not set, defaults to the add-on's primary logo URL. + string logo_url = 3; +} + +// Common format for declaring an add-on's home-page view. +message HomepageExtensionPoint { + // Required. The endpoint to execute when this extension point is + // activated. + string run_function = 1; + + // Optional. If set to `false`, disable the home-page view in this context. + // + // Defaults to `true` if unset. + // + // If an add-ons custom home-page view is disabled, an autogenerated overview + // card will be provided for users instead. + google.protobuf.BoolValue enabled = 2; +} + +// Format for declaring a universal action menu item extension point. +message UniversalActionExtensionPoint { + // Required. User-visible text describing the action taken by activating this + // extension point, for example, "Add a new contact". + string label = 1; + + // Required. The action type supported on a universal action menu item. It + // could be either a link to open or an endpoint to execute. + oneof action_type { + // URL to be opened by the UniversalAction. + string open_link = 2; + + // Endpoint to be run by the UniversalAction. + string run_function = 3; + } +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/gmail/gmail_addon_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/gmail/gmail_addon_manifest.proto new file mode 100644 index 00000000..29389978 --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/gmail/gmail_addon_manifest.proto @@ -0,0 +1,128 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type.gmail; + +import "google/apps/script/type/addon_widget_set.proto"; +import "google/apps/script/type/extension_point.proto"; +import "google/protobuf/struct.proto"; + +option csharp_namespace = "Google.Apps.Script.Type.Gmail"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type/gmail"; +option java_multiple_files = true; +option java_outer_classname = "GmailAddOnManifestProto"; +option java_package = "com.google.apps.script.type.gmail"; +option php_namespace = "Google\\Apps\\Script\\Type\\Gmail"; +option ruby_package = "Google::Apps::Script::Type::Gmail"; + +// Properties customizing the appearance and execution of a Gmail add-on. +message GmailAddOnManifest { + // Defines an endpoint that will be executed in contexts that don't + // match a declared contextual trigger. Any cards generated by this function + // will always be available to the user, but may be eclipsed by contextual + // content when this add-on declares more targeted triggers. + // + // If present, this overrides the configuration from + // `addOns.common.homepageTrigger`. + google.apps.script.type.HomepageExtensionPoint homepage_trigger = 14; + + // Defines the set of conditions that trigger the add-on. + repeated ContextualTrigger contextual_triggers = 3; + + // Defines set of [universal + // actions](/gmail/add-ons/how-tos/universal-actions) for the add-on. The user + // triggers universal actions from the add-on toolbar menu. + repeated UniversalAction universal_actions = 4; + + // Defines the compose time trigger for a compose time add-on. This is the + // trigger that causes an add-on to take action when the user is composing an + // email. + // All compose time addons are required to have the + // gmail.addons.current.action.compose scope even though it might not edit the + // draft. + ComposeTrigger compose_trigger = 12; + + // The name of an endpoint that verifies that the add-on has + // all the required third-party authorizations, by probing the third-party + // APIs. If the probe fails, the function should throw an exception to + // initiate the authorization flow. This function is called before each + // invocation of the add-on, in order to ensure a smooth user experience. + string authorization_check_function = 7; +} + +// An action that is always available in the add-on toolbar menu regardless of +// message context. +message UniversalAction { + // Required. User-visible text describing the action, for example, "Add a new + // contact." + string text = 1; + + // The type of the action determines the behavior of Gmail when the user + // invokes the action. + oneof action_type { + // A link that is opened by Gmail when the user triggers the action. + string open_link = 2; + + // An endpoint that is called when the user triggers the + // action. See the [universal actions + // guide](/gmail/add-ons/how-tos/universal-actions) for details. + string run_function = 3; + } +} + +// A trigger that activates when user is composing an email. +message ComposeTrigger { + // An enum defining the level of data access this compose trigger requires. + enum DraftAccess { + // Default value when nothing is set for DraftAccess. + UNSPECIFIED = 0; + + // NONE means compose trigger won't be able to access any data of the draft + // when a compose addon is triggered. + NONE = 1; + + // METADATA gives compose trigger the permission to access the metadata of + // the draft when a compose addon is triggered. This includes the audience + // list (To/cc list) of a draft message. + METADATA = 2; + } + + // Defines the set of actions for compose time add-on. These are actions + // that user can trigger on a compose time addon. + repeated google.apps.script.type.MenuItemExtensionPoint actions = 5; + + // Define the level of data access when a compose time addon is triggered. + DraftAccess draft_access = 4; +} + +// Defines a trigger that fires when the open email meets a specific criteria. +// When the trigger fires, it executes a specific endpoint, usually +// in order to create new cards and update the UI. +message ContextualTrigger { + // The type of trigger determines the conditions Gmail uses to show the + // add-on. + oneof trigger { + // UnconditionalTriggers are executed when any mail message is opened. + UnconditionalTrigger unconditional = 1; + } + + // Required. The name of the endpoint to call when a message matches the + // trigger. + string on_trigger_function = 4; +} + +// A trigger that fires when any email message is opened. +message UnconditionalTrigger {} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/script_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/script_manifest.proto new file mode 100644 index 00000000..572d5da9 --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/script_manifest.proto @@ -0,0 +1,105 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type; + +import "google/apps/script/type/addon_widget_set.proto"; +import "google/apps/script/type/extension_point.proto"; +import "google/protobuf/struct.proto"; + +option csharp_namespace = "Google.Apps.Script.Type"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type"; +option java_multiple_files = true; +option java_package = "com.google.apps.script.type"; +option php_namespace = "Google\\Apps\\Script\\Type"; +option ruby_package = "Google::Apps::Script::Type"; + +// Add-on configuration that is shared across all add-on host applications. +message CommonAddOnManifest { + // Required. The display name of the add-on. + string name = 1; + + // Required. The URL for the logo image shown in the add-on toolbar. + string logo_url = 2; + + // Common layout properties for the add-on cards. + LayoutProperties layout_properties = 3; + + // The widgets used in the add-on. If this field is not specified, + // it indicates that default set is used. + AddOnWidgetSet add_on_widget_set = 4; + + // Whether to pass locale information from host app. + bool use_locale_from_app = 5; + + // Defines an endpoint that will be executed in any context, in + // any host. Any cards generated by this function will always be available to + // the user, but may be eclipsed by contextual content when this add-on + // declares more targeted triggers. + HomepageExtensionPoint homepage_trigger = 6; + + // Defines a list of extension points in the universal action menu which + // serves as a setting menu for the add-on. The extension point can be + // link URL to open or an endpoint to execute as a form + // submission. + repeated UniversalActionExtensionPoint universal_actions = 7; + + // An OpenLink action + // can only use a URL with an HTTPS, MAILTO or TEL scheme. For HTTPS links, + // the URL must also + // [match](/gmail/add-ons/concepts/manifests#whitelisting_urls) one of the + // prefixes specified in this whitelist. If the prefix omits the scheme, HTTPS + // is assumed. Notice that HTTP links are automatically rewritten to HTTPS + // links. + google.protobuf.ListValue open_link_url_prefixes = 8; +} + +// Card layout properties shared across all add-on host applications. +message LayoutProperties { + // The primary color of the add-on. It sets the color of toolbar. If no + // primary color is set explicitly, the default value provided by the + // framework is used. + string primary_color = 1; + + // The secondary color of the add-on. It sets the color of buttons. + // If primary color is set but no secondary color is set, the + // secondary color is the same as the primary color. If neither primary + // color nor secondary color is set, the default value provided by the + // framework is used. + string secondary_color = 2; +} + +// Options for sending requests to add-on HTTP endpoints +message HttpOptions { + // Configuration for the token sent in the HTTP Authorization header + HttpAuthorizationHeader authorization_header = 1; +} + +// Authorization header sent in add-on HTTP requests +enum HttpAuthorizationHeader { + // Default value, equivalent to `SYSTEM_ID_TOKEN` + HTTP_AUTHORIZATION_HEADER_UNSPECIFIED = 0; + + // Send an ID token for the project-specific Google Workspace Add-ons system + // service account (default) + SYSTEM_ID_TOKEN = 1; + + // Send an ID token for the end user + USER_ID_TOKEN = 2; + + // Do not send an Authentication header + NONE = 3; +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/sheets/sheets_addon_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/sheets/sheets_addon_manifest.proto new file mode 100644 index 00000000..c34bca71 --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/sheets/sheets_addon_manifest.proto @@ -0,0 +1,47 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type.sheets; + +import "google/api/field_behavior.proto"; +import "google/apps/script/type/extension_point.proto"; + +option csharp_namespace = "Google.Apps.Script.Type.Sheets"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type/sheets"; +option java_multiple_files = true; +option java_outer_classname = "SheetsAddOnManifestProto"; +option java_package = "com.google.apps.script.type.sheets"; +option php_namespace = "Google\\Apps\\Script\\Type\\Sheets"; +option ruby_package = "Google::Apps::Script::Type::Sheets"; + +// Manifest section specific to Sheets Add-ons. + +// Sheets add-on manifest. +message SheetsAddOnManifest { + // If present, this overrides the configuration from + // `addOns.common.homepageTrigger`. + google.apps.script.type.HomepageExtensionPoint homepage_trigger = 3; + + // Endpoint to execute when file scope authorization is granted + // for this document/user pair. + SheetsExtensionPoint on_file_scope_granted_trigger = 5; +} + +// Common format for declaring a Sheets add-on's triggers. +message SheetsExtensionPoint { + // Required. The endpoint to execute when this extension point is activated. + string run_function = 1 [(google.api.field_behavior) = REQUIRED]; +} diff --git a/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/slides/slides_addon_manifest.proto b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/slides/slides_addon_manifest.proto new file mode 100644 index 00000000..6a51bb2f --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/proto/google/apps/script/type/slides/slides_addon_manifest.proto @@ -0,0 +1,47 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.apps.script.type.slides; + +import "google/api/field_behavior.proto"; +import "google/apps/script/type/extension_point.proto"; + +option csharp_namespace = "Google.Apps.Script.Type.Slides"; +option go_package = "google.golang.org/genproto/googleapis/apps/script/type/slides"; +option java_multiple_files = true; +option java_outer_classname = "SlidesAddOnManifestProto"; +option java_package = "com.google.apps.script.type.slides"; +option php_namespace = "Google\\Apps\\Script\\Type\\Slides"; +option ruby_package = "Google::Apps::Script::Type::Slides"; + +// Manifest section specific to Slides Add-ons. + +// Slides add-on manifest. +message SlidesAddOnManifest { + // If present, this overrides the configuration from + // `addOns.common.homepageTrigger`. + google.apps.script.type.HomepageExtensionPoint homepage_trigger = 1; + + // Endpoint to execute when file scope authorization is granted + // for this document/user pair. + SlidesExtensionPoint on_file_scope_granted_trigger = 2; +} + +// Common format for declaring a Slides add-on's triggers. +message SlidesExtensionPoint { + // Required. The endpoint to execute when this extension point is activated. + string run_function = 1 [(google.api.field_behavior) = REQUIRED]; +} diff --git a/synth.py b/synth.py deleted file mode 100644 index 3681a3df..00000000 --- a/synth.py +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script is used to synthesize generated parts of this library.""" - -import os -from pathlib import Path -import tempfile -from typing import Union - -import synthtool as s -from synthtool.languages import java -from synthtool.sources import git -from synthtool import logger, shell - -GOOGLEAPIS_URL = git.make_repo_clone_url("googleapis/googleapis") - -logger.debug("Cloning googleapis.") -googleapis = git.clone(GOOGLEAPIS_URL) - -def bazel_build(target: str, cwd: Union[Path, str]) -> Path: - """Build a bazel target and return the output build directory.""" - old_cwd = os.getcwd() - os.chdir(str(cwd)) - - bazel_run_args = [ - "bazel", - "--max_idle_secs=240", - "build", - target, - ] - - logger.debug(f"Generating code for: {target}.") - shell.run(bazel_run_args) - - output_dir = Path(f"bazel-bin{os.path.sep}{target[2:].split(':')[0]}").resolve() - os.chdir(old_cwd) - - return output_dir - -def build_proto(target): - """Build a proto build target and copy all generate source files.""" - output = bazel_build( - target=target, - cwd=googleapis, - ) - - src_output = Path(tempfile.mkdtemp()) - for proto_jar in output.glob("*-speed-src.jar"): - logger.debug(f"unzipping: {os.path.basename(proto_jar)}") - shell.run(["unzip", "-o", proto_jar, "-d", src_output / "src"]) - - java.fix_proto_headers(src_output) - s.copy(src_output / "src/com", "proto-google-apps-script-type-protos/src/main/java/com") - -build_proto("//google/apps/script/type:type_java_proto") -build_proto("//google/apps/script/type/calendar:calendar_java_proto") -build_proto("//google/apps/script/type/docs:docs_java_proto") -build_proto("//google/apps/script/type/drive:drive_java_proto") -build_proto("//google/apps/script/type/gmail:gmail_java_proto") -build_proto("//google/apps/script/type/sheets:sheets_java_proto") -build_proto("//google/apps/script/type/slides:slides_java_proto") - -java.format_code("proto-google-apps-script-type-protos/src") From 11900927d603c0d33a50f6f2bf5df2af7fecfeb8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 23:16:15 +0000 Subject: [PATCH 11/21] chore: cleanup cloud RAD generation (#1269) (#137) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/release/publish_javadoc11.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 994dd04b..325daaa4 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c + digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 41c2dbc0..91ebf9a7 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-gsuite-addons export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml From d068a04f8b4d993f06b4e067d13db802d6b8fc8a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 16:16:21 +0000 Subject: [PATCH 12/21] chore: update jre to 11 for linter (#1278) (#139) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 325daaa4..886d0949 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa + digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c6..05de1f60 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: From 36dfc2ee901fba66e11783f9605987e0748623ac Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 10 Nov 2021 21:10:03 +0100 Subject: [PATCH 13/21] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.1 (#138) --- google-cloud-gsuite-addons-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-gsuite-addons-bom/pom.xml b/google-cloud-gsuite-addons-bom/pom.xml index 44f52596..845c1e59 100644 --- a/google-cloud-gsuite-addons-bom/pom.xml +++ b/google-cloud-gsuite-addons-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.0 + 1.2.1 Google Google Workspace Add-ons API BOM diff --git a/pom.xml b/pom.xml index 27cda2a1..30c9bac7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.0 + 1.2.1 From 78114ef119298b0766229a0938b6a5a853348f9c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 10 Nov 2021 12:52:37 -0800 Subject: [PATCH 14/21] [CHANGE ME] Re-generated to pick up changes from self. (#133) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/a13f3199-2423-4813-b6ba-40294c7762a5/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- synth.metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synth.metadata b/synth.metadata index 03dac515..e570d7d6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-gsuite-addons.git", - "sha": "71a00376765c7db80add2671366984ec33ed9c0f" + "sha": "33dfd81a0306c4397b09534390a8999e9cc53ba3" } }, { From 635fd57ffbd85cc02d8a98de0b2d52debbed4e4c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 21:08:13 +0000 Subject: [PATCH 15/21] chore: update Java and Python dependencies (#140) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 408420890 Source-Link: https://github.com/googleapis/googleapis/commit/2921f9fb3bfbd16f6b2da0104373e2b47a80a65e Source-Link: https://github.com/googleapis/googleapis-gen/commit/6598ca8cbbf5226733a099c4506518a5af6ff74c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjU5OGNhOGNiYmY1MjI2NzMzYTA5OWM0NTA2NTE4YTVhZjZmZjc0YyJ9 --- .../java/com/google/cloud/gsuiteaddons/v1/GSuiteAddOnsGrpc.java | 1 + 1 file changed, 1 insertion(+) diff --git a/grpc-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GSuiteAddOnsGrpc.java b/grpc-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GSuiteAddOnsGrpc.java index 03b3665d..956698a4 100644 --- a/grpc-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GSuiteAddOnsGrpc.java +++ b/grpc-google-cloud-gsuite-addons-v1/src/main/java/com/google/cloud/gsuiteaddons/v1/GSuiteAddOnsGrpc.java @@ -50,6 +50,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: google/cloud/gsuiteaddons/v1/gsuiteaddons.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class GSuiteAddOnsGrpc { private GSuiteAddOnsGrpc() {} From f5669a66943055a65c6c038237fa6ef2f70d3313 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 12 Nov 2021 17:14:12 +0000 Subject: [PATCH 16/21] chore: update minimum java version to java 8 (#1281) (#141) --- .github/.OwlBot.lock.yaml | 2 +- README.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 886d0949..5d788be0 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 + digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0 diff --git a/README.md b/README.md index 365ebee9..afc517ac 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Google Workspace Add-ons API uses gRPC for the transport layer. ## Supported Java Versions -Java 7 or above is required for using this client. +Java 8 or above is required for using this client. Google's Java client libraries, [Google Cloud Client Libraries][cloudlibs] @@ -150,7 +150,6 @@ Apache 2.0 - See [LICENSE][license] for more information. Java Version | Status ------------ | ------ -Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1] Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2] Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3] Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4] From 21d921b64455099175e3945fb132cf7f84a9f778 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 15 Nov 2021 17:18:30 +0100 Subject: [PATCH 17/21] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 (#142) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.4.0` -> `2.5.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.5.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​250-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare240v250-2021-11-12) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.4.0...v2.5.0) ##### Features - next release from main branch is 2.5.0 ([#​510](https://www.togithub.com/googleapis/java-shared-dependencies/issues/510)) ([ca9eb8a](https://www.github.com/googleapis/java-shared-dependencies/commit/ca9eb8a40ae81d69de0d82d9499ef21b0136ae49)) ##### Bug Fixes - dependencies.sh to work with Java 17 ([#​516](https://www.togithub.com/googleapis/java-shared-dependencies/issues/516)) ([8422c1d](https://www.github.com/googleapis/java-shared-dependencies/commit/8422c1d7e9ef479f348e63c530789050b5235426)) ##### Dependencies - update dependency com.google.api:api-common to v2.1.0 ([#​508](https://www.togithub.com/googleapis/java-shared-dependencies/issues/508)) ([ae32d16](https://www.github.com/googleapis/java-shared-dependencies/commit/ae32d1689c78fc1469206c8c0df0ebaca59edd2c)) - update dependency com.google.auth:google-auth-library-bom to v1.2.2 ([#​506](https://www.togithub.com/googleapis/java-shared-dependencies/issues/506)) ([b9a8209](https://www.github.com/googleapis/java-shared-dependencies/commit/b9a82098655f29e858bd0c7a9b1049a379e5062a)) - update dependency com.google.auth:google-auth-library-bom to v1.3.0 ([#​524](https://www.togithub.com/googleapis/java-shared-dependencies/issues/524)) ([fc07879](https://www.github.com/googleapis/java-shared-dependencies/commit/fc07879fa6531e39b21977fe77abc19354a1fd33)) - update dependency com.google.code.gson:gson to v2.8.9 ([#​509](https://www.togithub.com/googleapis/java-shared-dependencies/issues/509)) ([bece99b](https://www.github.com/googleapis/java-shared-dependencies/commit/bece99bb3e0365e60e7376ba18d046ab6436a235)) - update dependency com.google.errorprone:error_prone_annotations to v2.10.0 ([#​512](https://www.togithub.com/googleapis/java-shared-dependencies/issues/512)) ([c281f13](https://www.github.com/googleapis/java-shared-dependencies/commit/c281f137525e2111e97349657be578ed1fc832f2)) - update dependency com.google.protobuf:protobuf-bom to v3.19.1 ([#​505](https://www.togithub.com/googleapis/java-shared-dependencies/issues/505)) ([94cde96](https://www.github.com/googleapis/java-shared-dependencies/commit/94cde96069900f9f8c2ff9a522671d03b26828bd)) - update dependency io.grpc:grpc-bom to v1.42.1 ([#​513](https://www.togithub.com/googleapis/java-shared-dependencies/issues/513)) ([0d2b774](https://www.github.com/googleapis/java-shared-dependencies/commit/0d2b774287a132821cc6fe2789140086bc48d525)) - update dependency org.checkerframework:checker-qual to v3.19.0 ([#​501](https://www.togithub.com/googleapis/java-shared-dependencies/issues/501)) ([2b3e0b5](https://www.github.com/googleapis/java-shared-dependencies/commit/2b3e0b5ddc3a645b20a837f3123394f1ca114f08)) - update dependency org.threeten:threetenbp to v1.5.2 ([#​514](https://www.togithub.com/googleapis/java-shared-dependencies/issues/514)) ([4885f40](https://www.github.com/googleapis/java-shared-dependencies/commit/4885f402e2c70435cd10d4f1b893df9873808c56)) - update gax.version to v2.7.0 ([#​515](https://www.togithub.com/googleapis/java-shared-dependencies/issues/515)) ([567e728](https://www.github.com/googleapis/java-shared-dependencies/commit/567e728b0e59233a04e2d04183e6a0c36cca2437)) - update google.core.version to v2.3.0 ([#​530](https://www.togithub.com/googleapis/java-shared-dependencies/issues/530)) ([78e87e9](https://www.github.com/googleapis/java-shared-dependencies/commit/78e87e96befab34dc4a494e752aeb473cd14a156)) - update iam.version to v1.1.7 ([#​504](https://www.togithub.com/googleapis/java-shared-dependencies/issues/504)) ([63dd583](https://www.github.com/googleapis/java-shared-dependencies/commit/63dd583c80f35b01a66fd1908d41467468c66436))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-gsuite-addons). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30c9bac7..d06ddc01 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.5.0 pom import From dbd320bc77ede0675acc3be3de4d658fc25ba7fb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Nov 2021 19:46:43 +0100 Subject: [PATCH 18/21] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.2 (#143) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.1` -> `1.2.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/compatibility-slim/1.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/confidence-slim/1.2.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​122-httpswwwgithubcomgoogleapisjava-shared-configcomparev121v122-2021-11-16) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-gsuite-addons). --- google-cloud-gsuite-addons-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-gsuite-addons-bom/pom.xml b/google-cloud-gsuite-addons-bom/pom.xml index 845c1e59..c7d1ab74 100644 --- a/google-cloud-gsuite-addons-bom/pom.xml +++ b/google-cloud-gsuite-addons-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 Google Google Workspace Add-ons API BOM diff --git a/pom.xml b/pom.xml index d06ddc01..9d14308e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 From b6e00c01e9723c89283f1d5d504d907baa45eeb7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 18:34:31 +0000 Subject: [PATCH 19/21] chore: remove enable-samples profile (#1284) (#144) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 1 - CONTRIBUTING.md | 61 +++++---------------------------------- 3 files changed, 8 insertions(+), 56 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5d788be0..88d9b926 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0 + digest: sha256:5b8c790f57cca57e6b37ba25f79291265c218cea3e6ba9714b001910ab3f1419 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 8608eae3..3bb01c8a 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee0..b65dd279 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify ## Code Samples -Code Samples must be bundled in separate Maven modules, and guarded by a -Maven profile with the name `enable-samples`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 7 whereas samples have - a minimum Java version of Java 8. Due to this we need the ability to +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. Due to this we need the ability to selectively exclude samples from a build run. 2. Many code samples depend on external GCP services and need credentials to access the service. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn clean verify ``` Some samples require access to GCP services and require a service account: ```bash export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-samples clean verify +mvn clean verify ``` -### Profile Config - -1. To add samples in a profile to your Maven project, add the following to your -`pom.xml` - - ```xml - - [...] - - - enable-samples - - sample - - - - [...] - - ``` - -2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### Profile Activation - -To include code samples when building and testing the project, enable the -`enable-samples` Maven profile. - -#### Command line - -To activate the Maven profile on the command line add `-Penable-samples` to your -Maven command. - -#### Maven `settings.xml` - -To activate the Maven profile in your `~/.m2/settings.xml` add an entry of -`enable-samples` following the instructions in [Active Profiles][2]. - -This method has the benefit of applying to all projects you build (and is -respected by IntelliJ IDEA) and is recommended if you are going to be -contributing samples to several projects. - -#### IntelliJ IDEA - -To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in -[Activate Maven profiles][3] to activate `enable-samples`. - [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account [2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file From 5beb8fed596d7b112809a506d8f67f43705bf794 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 18:24:32 +0100 Subject: [PATCH 20/21] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 (#147) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.5.0` -> `2.5.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.5.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​251-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare250v251-2021-12-03) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.5.0...v2.5.1)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-gsuite-addons). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d14308e..7c764b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.0 + 2.5.1 pom import From 9eb7bf2f6a4eddf3758735fb157782fc05cc7d2d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 22:28:15 +0000 Subject: [PATCH 21/21] chore: release 2.1.4 (#131) :robot: I have created a release \*beep\* \*boop\* --- ### [2.1.4](https://www.github.com/googleapis/java-gsuite-addons/compare/v2.1.3...v2.1.4) (2021-12-03) ### Bug Fixes * **java:** java 17 dependency arguments ([#1266](https://www.github.com/googleapis/java-gsuite-addons/issues/1266)) ([#130](https://www.github.com/googleapis/java-gsuite-addons/issues/130)) ([dfb63fa](https://www.github.com/googleapis/java-gsuite-addons/commit/dfb63fa7a1b202b19276b839670c922561d08420)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#142](https://www.github.com/googleapis/java-gsuite-addons/issues/142)) ([21d921b](https://www.github.com/googleapis/java-gsuite-addons/commit/21d921b64455099175e3945fb132cf7f84a9f778)) * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#147](https://www.github.com/googleapis/java-gsuite-addons/issues/147)) ([5beb8fe](https://www.github.com/googleapis/java-gsuite-addons/commit/5beb8fed596d7b112809a506d8f67f43705bf794)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ google-cloud-gsuite-addons-bom/pom.xml | 10 +++++----- google-cloud-gsuite-addons/pom.xml | 4 ++-- grpc-google-cloud-gsuite-addons-v1/pom.xml | 4 ++-- pom.xml | 10 +++++----- proto-google-apps-script-type-protos/pom.xml | 4 ++-- proto-google-cloud-gsuite-addons-v1/pom.xml | 4 ++-- versions.txt | 8 ++++---- 8 files changed, 35 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b21873fd..3f4cc3df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [2.1.4](https://www.github.com/googleapis/java-gsuite-addons/compare/v2.1.3...v2.1.4) (2021-12-03) + + +### Bug Fixes + +* **java:** java 17 dependency arguments ([#1266](https://www.github.com/googleapis/java-gsuite-addons/issues/1266)) ([#130](https://www.github.com/googleapis/java-gsuite-addons/issues/130)) ([dfb63fa](https://www.github.com/googleapis/java-gsuite-addons/commit/dfb63fa7a1b202b19276b839670c922561d08420)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#142](https://www.github.com/googleapis/java-gsuite-addons/issues/142)) ([21d921b](https://www.github.com/googleapis/java-gsuite-addons/commit/21d921b64455099175e3945fb132cf7f84a9f778)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#147](https://www.github.com/googleapis/java-gsuite-addons/issues/147)) ([5beb8fe](https://www.github.com/googleapis/java-gsuite-addons/commit/5beb8fed596d7b112809a506d8f67f43705bf794)) + ### [2.1.3](https://www.github.com/googleapis/java-gsuite-addons/compare/v2.1.2...v2.1.3) (2021-10-19) diff --git a/google-cloud-gsuite-addons-bom/pom.xml b/google-cloud-gsuite-addons-bom/pom.xml index c7d1ab74..e27c53fb 100644 --- a/google-cloud-gsuite-addons-bom/pom.xml +++ b/google-cloud-gsuite-addons-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-gsuite-addons-bom - 2.1.4-SNAPSHOT + 2.1.4 pom com.google.cloud @@ -56,22 +56,22 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc grpc-google-cloud-gsuite-addons-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc proto-google-cloud-gsuite-addons-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc proto-google-apps-script-type-protos - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/google-cloud-gsuite-addons/pom.xml b/google-cloud-gsuite-addons/pom.xml index fcc46694..4ebc490b 100644 --- a/google-cloud-gsuite-addons/pom.xml +++ b/google-cloud-gsuite-addons/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-gsuite-addons - 2.1.4-SNAPSHOT + 2.1.4 jar Google Google Workspace Add-ons API https://github.com/googleapis/java-gsuite-addons @@ -11,7 +11,7 @@ com.google.cloud google-cloud-gsuite-addons-parent - 2.1.4-SNAPSHOT + 2.1.4 google-cloud-gsuite-addons diff --git a/grpc-google-cloud-gsuite-addons-v1/pom.xml b/grpc-google-cloud-gsuite-addons-v1/pom.xml index a05c7417..0879695d 100644 --- a/grpc-google-cloud-gsuite-addons-v1/pom.xml +++ b/grpc-google-cloud-gsuite-addons-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-gsuite-addons-v1 - 2.1.4-SNAPSHOT + 2.1.4 grpc-google-cloud-gsuite-addons-v1 GRPC library for google-cloud-gsuite-addons com.google.cloud google-cloud-gsuite-addons-parent - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/pom.xml b/pom.xml index 7c764b7a..f1353862 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-gsuite-addons-parent pom - 2.1.4-SNAPSHOT + 2.1.4 Google Google Workspace Add-ons API Parent https://github.com/googleapis/java-gsuite-addons @@ -60,22 +60,22 @@ com.google.cloud google-cloud-gsuite-addons - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc proto-google-apps-script-type-protos - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc grpc-google-cloud-gsuite-addons-v1 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api.grpc proto-google-cloud-gsuite-addons-v1 - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/proto-google-apps-script-type-protos/pom.xml b/proto-google-apps-script-type-protos/pom.xml index b2abe7ba..6c309203 100644 --- a/proto-google-apps-script-type-protos/pom.xml +++ b/proto-google-apps-script-type-protos/pom.xml @@ -5,13 +5,13 @@ com.google.cloud google-cloud-gsuite-addons-parent - 2.1.4-SNAPSHOT + 2.1.4 4.0.0 com.google.api.grpc proto-google-apps-script-type-protos proto-google-apps-script-type-protos - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/proto-google-cloud-gsuite-addons-v1/pom.xml b/proto-google-cloud-gsuite-addons-v1/pom.xml index a3eda47a..9fd40683 100644 --- a/proto-google-cloud-gsuite-addons-v1/pom.xml +++ b/proto-google-cloud-gsuite-addons-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-gsuite-addons-v1 - 2.1.4-SNAPSHOT + 2.1.4 proto-google-cloud-gsuite-addons-v1 Proto library for google-cloud-gsuite-addons com.google.cloud google-cloud-gsuite-addons-parent - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/versions.txt b/versions.txt index a8d1f01c..4e9edeec 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-gsuite-addons:2.1.3:2.1.4-SNAPSHOT -grpc-google-cloud-gsuite-addons-v1:2.1.3:2.1.4-SNAPSHOT -proto-google-cloud-gsuite-addons-v1:2.1.3:2.1.4-SNAPSHOT -proto-google-apps-script-type-protos:2.1.3:2.1.4-SNAPSHOT +google-cloud-gsuite-addons:2.1.4:2.1.4 +grpc-google-cloud-gsuite-addons-v1:2.1.4:2.1.4 +proto-google-cloud-gsuite-addons-v1:2.1.4:2.1.4 +proto-google-apps-script-type-protos:2.1.4:2.1.4