Upgrade grpc from 1.16.1 to 1.21.0 for firestore (#465)

Author: rsgowman

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.groovy

@@ -23,6 +23,7 @@ import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.BSDLicens
 import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.CreativeCommonsLicenseFetcher
 import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.GnuClasspathLicenseFetcher
 import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.MITLicenseFetcher
+import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.YetAnotherApache2LicenseFetcher
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -50,8 +51,9 @@ class LicenseResolverPlugin implements Plugin<Project> {
     List<RemoteLicenseFetcher> remoteLicenseFetchers =
             [new AndroidSdkTermsFetcher(),
              new Apache2LicenseFetcher(),
-             new BSDLicenseFetcher(),
              new AnotherApache2LicenseFetcher(),
+             new YetAnotherApache2LicenseFetcher(),
+             new BSDLicenseFetcher(),
              new CreativeCommonsLicenseFetcher(), new MITLicenseFetcher(), new AnotherMITLicenseFetcher(), new GnuClasspathLicenseFetcher()]
     final static ANDROID_PLUGINS = ["com.android.application", "com.android.library",
                                     "com.android.test"]

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/license/RemoteLicenseFetcher.groovy

@@ -56,24 +56,24 @@ interface RemoteLicenseFetcher extends Serializable {
     }
   }
 
-  static final class BSDLicenseFetcher implements RemoteLicenseFetcher {
-    private URI BSD_LICENSE_URI = URI.create("http://www.opensource.org/licenses/bsd-license.php")
+  static final class AnotherApache2LicenseFetcher implements RemoteLicenseFetcher {
+    private URI APACHE_2_LICENSE_URI = URI.create("https://opensource.org/licenses/Apache-2.0")
 
     @Override
     URI getServiceUri() {
-      BSD_LICENSE_URI
+      APACHE_2_LICENSE_URI
     }
 
     @Override
     String get() {
-      def doc = Jsoup.connect(BSD_LICENSE_URI.toString()).get()
+      def doc = Jsoup.connect(APACHE_2_LICENSE_URI.toString()).get()
 
-      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper')[0])
+      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper'))
     }
   }
 
-  static final class AnotherApache2LicenseFetcher implements RemoteLicenseFetcher {
-    private URI APACHE_2_LICENSE_URI = URI.create("https://opensource.org/licenses/Apache-2.0")
+  static final class YetAnotherApache2LicenseFetcher implements RemoteLicenseFetcher {
+    private URI APACHE_2_LICENSE_URI = URI.create("http://www.apache.org/licenses/LICENSE-2.0")
 
     @Override
     URI getServiceUri() {
@@ -82,9 +82,23 @@ interface RemoteLicenseFetcher extends Serializable {
 
     @Override
     String get() {
-      def doc = Jsoup.connect(APACHE_2_LICENSE_URI.toString()).get()
+      APACHE_2_LICENSE_URI.toURL().getText()
+    }
+  }
 
-      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper'))
+  static final class BSDLicenseFetcher implements RemoteLicenseFetcher {
+    private URI BSD_LICENSE_URI = URI.create("http://www.opensource.org/licenses/bsd-license.php")
+
+    @Override
+    URI getServiceUri() {
+      BSD_LICENSE_URI
+    }
+
+    @Override
+    String get() {
+      def doc = Jsoup.connect(BSD_LICENSE_URI.toString()).get()
+
+      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper')[0])
     }
   }
 
@@ -151,4 +165,4 @@ interface RemoteLicenseFetcher extends Serializable {
       TEXT_FORMATTER.getPlainText(doc.select('body > table > tbody > tr:nth-child(2) > td:nth-child(2) > table > tbody > tr:nth-child(3) > td > en > blockquote'))
     }
   }
-}
+}

firebase-firestore/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Unreleased
+- [fixed] Updated gRPC to 1.21.0. A bug in the prior version would occasionally
+  cause a crash if a network state change occurred concurrently with an RPC.
+  (#428)
+
+# 19.0.1
 - [fixed] Fixed an issue that prevented schema migrations for clients with
   large offline datasets (#370).
 

firebase-firestore/firebase-firestore.gradle

@@ -30,7 +30,7 @@ protobuf {
     }
     plugins {
         grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.16.1'
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.21.0'
         }
         javalite {
             // The codegen for lite comes as a separate artifact
@@ -102,10 +102,10 @@ dependencies {
     //To provide @Generated annotations
     compileOnly 'javax.annotation:jsr250-api:1.0'
 
-    implementation 'io.grpc:grpc-stub:1.16.1'
-    implementation 'io.grpc:grpc-protobuf-lite:1.16.1'
-    implementation 'io.grpc:grpc-okhttp:1.16.1'
-    implementation 'io.grpc:grpc-android:1.16.1'
+    implementation 'io.grpc:grpc-stub:1.21.0'
+    implementation 'io.grpc:grpc-protobuf-lite:1.21.0'
+    implementation 'io.grpc:grpc-okhttp:1.21.0'
+    implementation 'io.grpc:grpc-android:1.21.0'
     implementation "com.google.android.gms:play-services-basement:$playServicesVersion"
     implementation "com.google.android.gms:play-services-tasks:$playServicesVersion"
     implementation "com.google.android.gms:play-services-base:$playServicesVersion"