Upgrading Firestore to 0.33.0-beta (firebase#129)

hiranya911 · web-flow · commit 9863326065a9 · 2018-01-22T11:05:22.000-08:00
* Firestore upgraded to 0.33.0-beta

* Upgraded google-cloud-storage and google-api-client; Fixing a flaky ADC test
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipUTs>${skipTests}</skipUTs>
-        <netty.version>4.1.14.Final</netty.version>
+        <netty.version>4.1.17.Final</netty.version>
     </properties>
 
     <scm>
@@ -375,7 +375,7 @@
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
-            <version>1.22.0</version>
+            <version>1.23.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>
@@ -386,12 +386,12 @@
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client-gson</artifactId>
-            <version>1.22.0</version>
+            <version>1.23.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
-            <version>1.22.0</version>
+            <version>1.23.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
@@ -406,12 +406,12 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>1.7.0</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-firestore</artifactId>
-            <version>0.25.0-beta</version>
+            <version>0.33.0-beta</version>
         </dependency>
 
         <!-- Utilities -->
diff --git a/src/test/java/com/google/firebase/auth/FirebaseAuthTest.java b/src/test/java/com/google/firebase/auth/FirebaseAuthTest.java
@@ -107,7 +107,7 @@ public static Collection<Object[]> data() throws Exception {
           },
           {
             new FirebaseOptions.Builder()
-                .setCredentials(createApplicationDefaultCredential())
+                .setCredentials(TestUtils.getApplicationDefaultCredentials())
                 .build(),
             /* isCertCredential */ false
           },
diff --git a/src/test/java/com/google/firebase/auth/FirebaseCredentialsTest.java b/src/test/java/com/google/firebase/auth/FirebaseCredentialsTest.java
@@ -16,27 +16,21 @@
 
 package com.google.firebase.auth;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import com.google.api.client.googleapis.testing.auth.oauth2.MockTokenServerTransport;
 import com.google.api.client.googleapis.util.Utils;
 import com.google.api.client.json.JsonFactory;
 import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.common.collect.ImmutableMap;
 import com.google.firebase.auth.internal.BaseCredential;
 import com.google.firebase.auth.internal.FirebaseCredentialsAdapter;
 import com.google.firebase.tasks.Task;
 import com.google.firebase.tasks.Tasks;
 import com.google.firebase.testing.ServiceAccount;
 import com.google.firebase.testing.TestUtils;
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintWriter;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public static Collection<Object[]> data() throws Exception {`
`107`	`107`	`},`
`108`	`108`	`{`
`109`	`109`	`new FirebaseOptions.Builder()`
`110`		`- .setCredentials(createApplicationDefaultCredential())`
	`110`	`+ .setCredentials(TestUtils.getApplicationDefaultCredentials())`
`111`	`111`	`.build(),`
`112`	`112`	`/* isCertCredential */ false`
`113`	`113`	`},`