[All] Add keep annotation to Firebase registrar (firebase#1373)

* Add keep annotation to Firebase registrar
samnbd · Dec 12, 2019 · bd7bdcf · bd7bdcf
1 parent c8debc9
commit bd7bdcf
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 1 deletion.
diff --git a/...src/main/java/io/flutter/plugins/firebase/cloudfirestore/FlutterFirebaseAppRegistrar.java b/...src/main/java/io/flutter/plugins/firebase/cloudfirestore/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.cloudfirestore;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...src/main/java/io/flutter/plugins/firebase/cloudfunctions/FlutterFirebaseAppRegistrar.java b/...src/main/java/io/flutter/plugins/firebase/cloudfunctions/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.cloudfunctions;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle
@@ -34,6 +34,7 @@ android {
     dependencies {
         api 'com.google.firebase:firebase-analytics:16.5.0'
         implementation 'com.google.firebase:firebase-common:16.1.0'
+        implementation 'androidx.annotation:annotation:1.1.0'
     }
 }
 

diff --git a/...droid/src/main/java/io/flutter/plugins/firebaseanalytics/FlutterFirebaseAppRegistrar.java b/...droid/src/main/java/io/flutter/plugins/firebaseanalytics/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebaseanalytics;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...th/android/src/main/java/io/flutter/plugins/firebaseauth/FlutterFirebaseAppRegistrar.java b/...th/android/src/main/java/io/flutter/plugins/firebaseauth/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebaseauth;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle
@@ -33,6 +33,7 @@ android {
     }
     dependencies {
         implementation 'com.google.firebase:firebase-common:16.1.0'
+        implementation 'androidx.annotation:annotation:1.1.0'
     }
 }
 

diff --git a/...e/android/src/main/java/io/flutter/plugins/firebase/core/FlutterFirebaseAppRegistrar.java b/...e/android/src/main/java/io/flutter/plugins/firebase/core/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.core;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/packages/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/android/build.gradle
@@ -39,6 +39,7 @@ android {
 dependencies {
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
     implementation 'com.google.firebase:firebase-common:16.1.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
 }
 
 apply from: file("./user-agent.gradle")

diff --git a/...flutter/plugins/firebase/crashlytics/firebasecrashlytics/FlutterFirebaseAppRegistrar.java b/...flutter/plugins/firebase/crashlytics/firebasecrashlytics/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.crashlytics.firebasecrashlytics;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
@@ -34,6 +34,7 @@ android {
     dependencies {
         api 'com.google.firebase:firebase-database:17.0.0'
         implementation 'com.google.firebase:firebase-common:16.1.0'
+        implementation 'androidx.annotation:annotation:1.1.0'
     }
 }
 
@@ -62,4 +63,4 @@ afterEvaluate {
             }
         }
     }
-}
+}
diff --git a/...droid/src/main/java/io/flutter/plugins/firebase/database/FlutterFirebaseAppRegistrar.java b/...droid/src/main/java/io/flutter/plugins/firebase/database/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.database;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...id/src/main/java/io/flutter/plugins/firebasedynamiclinks/FlutterFirebaseAppRegistrar.java b/...id/src/main/java/io/flutter/plugins/firebasedynamiclinks/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebasedynamiclinks;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...droid/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseAppRegistrar.java b/...droid/src/main/java/io/flutter/plugins/firebasemessaging/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebasemessaging;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...ndroid/src/main/java/io/flutter/plugins/firebasemlvision/FlutterFirebaseAppRegistrar.java b/...ndroid/src/main/java/io/flutter/plugins/firebasemlvision/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebasemlvision;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/packages/firebase_performance/android/build.gradle b/packages/firebase_performance/android/build.gradle
@@ -34,6 +34,7 @@ android {
     dependencies {
         api 'com.google.firebase:firebase-perf:17.0.0'
         implementation 'com.google.firebase:firebase-common:16.1.0'
+        implementation 'androidx.annotation:annotation:1.1.0'
     }
 }
 

diff --git a/...oid/src/main/java/io/flutter/plugins/firebaseperformance/FlutterFirebaseAppRegistrar.java b/...oid/src/main/java/io/flutter/plugins/firebaseperformance/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebaseperformance;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...in/java/io/flutter/plugins/firebase/firebaseremoteconfig/FlutterFirebaseAppRegistrar.java b/...in/java/io/flutter/plugins/firebase/firebaseremoteconfig/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.firebaseremoteconfig;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {

diff --git a/...ndroid/src/main/java/io/flutter/plugins/firebase/storage/FlutterFirebaseAppRegistrar.java b/...ndroid/src/main/java/io/flutter/plugins/firebase/storage/FlutterFirebaseAppRegistrar.java
@@ -4,12 +4,14 @@
 
 package io.flutter.plugins.firebase.storage;
 
+import androidx.annotation.Keep;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Collections;
 import java.util.List;
 
+@Keep
 public class FlutterFirebaseAppRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ android { @@
         }
         dependencies {
             implementation 'com.google.firebase:firebase-common:16.1.0'
+            implementation 'androidx.annotation:annotation:1.1.0'
         }
     }
@@ Expand Down @@