Updated to google-photos-library-client v1.2.0; gradle build script m…

…ade ready for nixos and gradle v6. TODO: Fix io.grpc.auth.GoogleAuthLibraryCallCredentials createJwtHelperOrNull WARNING: Failed to create JWT helper.

.gitlab-ci.yml

@@ -11,7 +11,7 @@ variables:
 
 before_script:
   - wget -qO - "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" | unzip -d /tmp -
-  - mkdir "${GRADLE_HOME%/*}" && mv "/tmp/gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" && chmod 755 "${GRADLE_HOME}/bin/gradle" && ln -vs "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
+  - mkdir -p "${GRADLE_HOME%/*}" && mv "/tmp/gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" && chmod 755 "${GRADLE_HOME}/bin/gradle" && ln -vs "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle
   - export GRADLE_USER_HOME=`pwd`/.gradle
   - apk add --no-cache git
 

build.gradle

@@ -1,4 +1,9 @@
 buildscript {
+    configure([buildscript.repositories, project.repositories]) {
+        // Use these repositories for resolving dependencies in both the buildscript and the project
+        // (defined here so we can replace them for both the buildscript and the project by an off-line repository in needed, e.g., in a nix derivation)
+        jcenter()
+    }
     dependencies {
         classpath 'com.pascalwelsch.gitversioner:gitversioner:0.4.1'
     }
@@ -53,33 +58,27 @@ publishing {
 }
 
 dependencies {
-    compile group: 'com.google.photos.library', name: 'google-photos-library-client', version: '1.1.0'
+    compile group: 'com.google.photos.library', name: 'google-photos-library-client', version: '1.2.0'
     // for com.google.photos.library.sample.factories.PhotosLibraryClientFactory
-    compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.27.0'
-    compile group: 'com.google.oauth-client', name: 'google-oauth-client-java6', version: '1.27.0'
-    compile (group: 'com.google.api-client', name: 'google-api-client', version: '1.27.0') {
+    compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.28.0'
+    compile group: 'com.google.oauth-client', name: 'google-oauth-client-java6', version: '1.28.0'
+    compile (group: 'com.google.api-client', name: 'google-api-client', version: '1.28.0') {
         exclude group: 'com.google.guava', module: 'guava-jdk5'
     }
     // for HTTPS communication, required by com.google.api.gax.(g)rpc.*
     compile group: 'io.grpc', name: 'grpc-netty', version: '1.15.1' // v1.16.1 breaks com.google.common.util.concurrent.Futures API
-    compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: '2.0.19.Final'
+    compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: '2.0.25.Final'
     // logging, CLI args, and ANSI colors
-    compile group: 'info.picocli', name: 'picocli', version: '3.8.0'
-    compile group: 'org.fusesource.jansi', name: 'jansi', version: '1.17.1'
+    compile group: 'info.picocli', name: 'picocli', version: '3.9.6'
+    compile group: 'org.fusesource.jansi', name: 'jansi', version: '1.18'
     // for additional Java utility classes, e.g., Pair, Tripple, RecursiveToStringStyle
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
     // source-code quality
-    compile group: 'org.jetbrains', name: 'annotations', version: '16.0.3'
+    compile group: 'org.jetbrains', name: 'annotations', version: '17.0.0'
     // Use JUnit test framework
     testCompile 'junit:junit:4.12'
 }
 
-// In this section you declare where to find the dependencies of your project
-repositories {
-    // Use jcenter for resolving dependencies
-    jcenter()
-}
-
 jar {
   manifest {
     attributes(

settings.gradle

@@ -1,2 +1 @@
 rootProject.name = externalProjectName
-enableFeaturePreview('STABLE_PUBLISHING')

src/main/java/io/gitlab/rychly/gphotos_uploader/GPhotosUploader.java

@@ -5,9 +5,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.photos.library.sample.factories.PhotosLibraryClientFactory;
 import com.google.photos.library.v1.PhotosLibraryClient;
-import com.google.photos.library.v1.proto.Album;
-import com.google.photos.library.v1.proto.MediaItem;
-import com.google.photos.library.v1.proto.SharedAlbumOptions;
+import com.google.photos.types.proto.Album;
+import com.google.photos.types.proto.MediaItem;
+import com.google.photos.types.proto.SharedAlbumOptions;
 import io.gitlab.rychly.gphotos_uploader.config.Config;
 import io.gitlab.rychly.gphotos_uploader.gphotos.GPhotos;
 import io.gitlab.rychly.gphotos_uploader.gphotos.MediaFile;

src/main/java/io/gitlab/rychly/gphotos_uploader/gphotos/GPhotos.java

@@ -3,10 +3,14 @@
 import com.google.common.collect.Lists;
 import com.google.photos.library.v1.PhotosLibraryClient;
 import com.google.photos.library.v1.internal.InternalPhotosLibraryClient;
-import com.google.photos.library.v1.proto.*;
+import com.google.photos.library.v1.proto.BatchCreateMediaItemsResponse;
+import com.google.photos.library.v1.proto.NewMediaItem;
+import com.google.photos.library.v1.proto.NewMediaItemResult;
 import com.google.photos.library.v1.upload.UploadMediaItemRequest;
 import com.google.photos.library.v1.upload.UploadMediaItemResponse;
 import com.google.photos.library.v1.util.NewMediaItemFactory;
+import com.google.photos.types.proto.Album;
+import com.google.photos.types.proto.MediaItem;
 import com.google.rpc.Code;
 import io.gitlab.rychly.gphotos_uploader.i18n.Messages;
 import io.gitlab.rychly.gphotos_uploader.i18n.ResourceBundleFactory;