Update dependencies and regenerate library.

Due to changes in the gax dependencies, some additional grpc dependencies need to be specified on the `photoslibraryapi` project. Change-Id: I3d4f1ee9c63afd7a34730b244acd22d4530d7ff6
google · Jan 19, 2022 · c3a35d7 · c3a35d7
1 parent 25f0464
commit c3a35d7
Show file tree

Hide file tree

Showing 37 changed files with 137 additions and 129 deletions.
diff --git a/photoslibraryapi/build.gradle b/photoslibraryapi/build.gradle
@@ -47,20 +47,26 @@ compileJava.options.encoding = 'UTF-8'
 javadoc.options.encoding = 'UTF-8'
 
 dependencies {
-    api 'com.google.api:gax-grpc:2.3.0'
-    implementation 'com.google.api.grpc:proto-google-common-protos:2.0.1'
-    implementation 'com.google.api:api-common:2.0.1'
-    implementation 'com.google.api:gax:2.3.0'
-    implementation 'com.google.protobuf:protobuf-java:3.15.2'
-    implementation 'io.grpc:grpc-protobuf:1.37.0'
-    implementation 'io.grpc:grpc-stub:1.37.0'
+    api 'com.google.api:gax-grpc:2.7.1'
+    implementation 'com.google.api.grpc:proto-google-common-protos:2.4.1'
+    implementation 'com.google.api:api-common:2.0.5'
+    implementation 'com.google.api:gax:2.7.1'
+    implementation 'com.google.protobuf:protobuf-java:3.19.1'
+    implementation 'io.grpc:grpc-core:1.42.1'
+    implementation 'io.grpc:grpc-protobuf:1.42.1'
+    implementation 'io.grpc:grpc-stub:1.42.1'
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation 'com.google.api:gax-grpc:2.3.0:testlib'
-    testImplementation 'com.google.api:gax:1.50.1:testlib'
-    testImplementation 'io.grpc:grpc-netty-shaded:1.37.0'
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.10.0'
-    testImplementation 'org.mockito:mockito-inline:3.10.0'
+
+    // TODO: remove when dropping Java 8 support.
+    // https://github.com/googleapis/gapic-generator-java/issues/888
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
+
+    testImplementation 'com.google.api:gax-grpc:2.7.1:testlib'
+    testImplementation 'com.google.api:gax:2.7.1:testlib'
+    testImplementation 'io.grpc:grpc-netty-shaded:1.42.1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
+    testImplementation 'org.mockito:mockito-inline:3.12.4'
     testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
 }

diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java
@@ -347,10 +347,10 @@ public final ListSharedAlbumsPagedResponse listSharedAlbums() {
    * @param orderBy An optional field to specify the sort order of the search results. The `orderBy`
    *     field only works when a [dateFilter][google.photos.library.v1.DateFilter] is used. When
    *     this field is not specified, results are displayed newest first, oldest last by their
-   *     [creationTime][google.photos.types.MediaMetadata.creation_time]. Providing
-   *     {@link OrderBy#MEDIAMETADATA_CREATION_TIME} displays search results in the opposite order, oldest first
-   *     then newest last. To display results newest first then oldest last, include the `desc`
-   *     argument using {@link OrderBy#MEDIAMETADATA_CREATION_TIME_DESC}.
+   *     [creationTime][google.photos.types.MediaMetadata.creation_time]. Providing {@link
+   *     OrderBy#MEDIAMETADATA_CREATION_TIME} displays search results in the opposite order, oldest
+   *     first then newest last. To display results newest first then oldest last, include the
+   *     `desc` argument using {@link OrderBy#MEDIAMETADATA_CREATION_TIME_DESC}.
    *     <p>The only additional filters that can be used with this parameter are
    *     [includeArchivedMedia][google.photos.library.v1.Filters.include_archived_media] and
    *     [excludeNonAppCreatedData][google.photos.library.v1.Filters.exclude_non_app_created_data].

diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibrarySettings.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibrarySettings.java
@@ -37,11 +37,11 @@
 /**
  * Settings for a {@link PhotosLibraryClient} for interacting with the Google Photos Library API.
  *
- * Use the {@link Builder} to create an instance of this class. You can configure the retry
- * configuration for media upload requests using {@link UnaryCallSettings} through the
- * {@link Builder#uploadMediaItemSettingsBuilder}.
+ * <p>Use the {@link Builder} to create an instance of this class. You can configure the retry
+ * configuration for media upload requests using {@link UnaryCallSettings} through the {@link
+ * Builder#uploadMediaItemSettingsBuilder}.
  *
- * Note that this class is a wrapper of {@link InternalPhotosLibrarySettings} which should not be
+ * <p>Note that this class is a wrapper of {@link InternalPhotosLibrarySettings} which should not be
  * used directly. Instead, use this class and the {@link PhotosLibraryClient}.
  */
 public final class PhotosLibrarySettings extends InternalPhotosLibrarySettings {

diff --git a/...yapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java b/...yapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java
@@ -1866,8 +1866,8 @@ public final BatchRemoveMediaItemsFromAlbumResponse batchRemoveMediaItemsFromAlb
    * }</pre>
    *
    * @param album Required. The [Album][google.photos.types.Album] to update.
-   *     <p>The album?s `id` field is used to identify the album to be updated. The album?s `title`
-   *     field is used to set the new album title. The album?s `cover_photo_media_item_id` field is
+   *     <p>The album’s `id` field is used to identify the album to be updated. The album’s `title`
+   *     field is used to set the new album title. The album’s `cover_photo_media_item_id` field is
    *     used to set the new album cover photo.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -1894,8 +1894,8 @@ public final Album updateAlbum(Album album) {
    * }</pre>
    *
    * @param album Required. The [Album][google.photos.types.Album] to update.
-   *     <p>The album?s `id` field is used to identify the album to be updated. The album?s `title`
-   *     field is used to set the new album title. The album?s `cover_photo_media_item_id` field is
+   *     <p>The album’s `id` field is used to identify the album to be updated. The album’s `title`
+   *     field is used to set the new album title. The album’s `cover_photo_media_item_id` field is
    *     used to set the new album cover photo.
    * @param updateMask Required. Indicate what fields in the provided album to update. The only
    *     valid values are `title` and `cover_photo_media_item_id`.

diff --git a/...raryapi/src/main/java/com/google/photos/library/v1/proto/AddEnrichmentToAlbumRequest.java b/...raryapi/src/main/java/com/google/photos/library/v1/proto/AddEnrichmentToAlbumRequest.java
diff --git a/...pi/src/main/java/com/google/photos/library/v1/proto/BatchAddMediaItemsToAlbumRequest.java b/...pi/src/main/java/com/google/photos/library/v1/proto/BatchAddMediaItemsToAlbumRequest.java
diff --git a/...aryapi/src/main/java/com/google/photos/library/v1/proto/BatchCreateMediaItemsRequest.java b/...aryapi/src/main/java/com/google/photos/library/v1/proto/BatchCreateMediaItemsRequest.java
diff --git a/...c/main/java/com/google/photos/library/v1/proto/BatchRemoveMediaItemsFromAlbumRequest.java b/...c/main/java/com/google/photos/library/v1/proto/BatchRemoveMediaItemsFromAlbumRequest.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/EnrichmentItem.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/EnrichmentItem.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/GetAlbumRequest.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/GetAlbumRequest.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/GetMediaItemRequest.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/GetMediaItemRequest.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/GetSharedAlbumRequest.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/GetSharedAlbumRequest.java
diff --git a/...oslibraryapi/src/main/java/com/google/photos/library/v1/proto/JoinSharedAlbumRequest.java b/...oslibraryapi/src/main/java/com/google/photos/library/v1/proto/JoinSharedAlbumRequest.java
diff --git a/...slibraryapi/src/main/java/com/google/photos/library/v1/proto/LeaveSharedAlbumRequest.java b/...slibraryapi/src/main/java/com/google/photos/library/v1/proto/LeaveSharedAlbumRequest.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListAlbumsRequest.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListAlbumsRequest.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListAlbumsResponse.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListAlbumsResponse.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListMediaItemsRequest.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListMediaItemsRequest.java
diff --git a/...oslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListMediaItemsResponse.java b/...oslibraryapi/src/main/java/com/google/photos/library/v1/proto/ListMediaItemsResponse.java
diff --git a/...slibraryapi/src/main/java/com/google/photos/library/v1/proto/ListSharedAlbumsRequest.java b/...slibraryapi/src/main/java/com/google/photos/library/v1/proto/ListSharedAlbumsRequest.java
diff --git a/...libraryapi/src/main/java/com/google/photos/library/v1/proto/ListSharedAlbumsResponse.java b/...libraryapi/src/main/java/com/google/photos/library/v1/proto/ListSharedAlbumsResponse.java
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/Location.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/proto/Location.java