chore(android): rely on single firestore-android-sdk version, bump annotations

Author: mikehardy

packages/firebase_core/firebase_core/android/build.gradle

@@ -36,7 +36,7 @@ android {
     }
     dependencies {
         implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrDefaultProperty("FirebaseSDKVersion")}")
-        implementation "com.google.firebase:firebase-core"
+        implementation "com.google.firebase:firebase-common"
 
         implementation 'androidx.annotation:annotation:1.1.0'
     }

packages/firebase_core/firebase_core/example/android/app/build.gradle

@@ -24,13 +24,6 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
-// Optionally override the Firebase BoM SDK version that FlutterFire uses.
-// rootProject.ext {
-//     set("FlutterFire", [
-//             FirebaseSDKVersion: "25.3.1",
-//     ])
-// }
-
 android {
     compileSdkVersion 29
 

packages/firebase_in_app_messaging/android/build.gradle

@@ -52,7 +52,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
 }
 
 // TODO(<github-username>): Remove this hack once androidx.lifecycle is included on stable. https://github.com/flutter/flutter/issues/42348

packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle

@@ -25,13 +25,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
-rootProject.ext {
-  set('FlutterFire', [
-    FirebaseSDKVersion: '25.12.0'
-  ])
-}
-
-
 android {
     compileSdkVersion 29
 

packages/firebase_ml_custom/android/build.gradle

@@ -21,6 +21,19 @@ rootProject.allprojects {
 
 apply plugin: 'com.android.library'
 
+def firebaseCoreProject = findProject(':firebase_core')
+if (firebaseCoreProject == null) {
+  throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?')
+} else if (!firebaseCoreProject.properties['FirebaseSDKVersion']) {
+  throw new GradleException('A newer version of the firebase_core FlutterFire plugin is required, please update your firebase_core pubspec dependency.')
+}
+
+def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
+  if (!rootProject.ext.has('FlutterFire')) return firebaseCoreProject.properties[name]
+  if (!rootProject.ext.get('FlutterFire')[name]) return firebaseCoreProject.properties[name]
+  return rootProject.ext.get('FlutterFire').get(name)
+}
+
 android {
     compileSdkVersion 29
 
@@ -32,9 +45,11 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-ml-model-interpreter:22.0.3'
-        implementation 'androidx.annotation:annotation:1.0.0'
-        implementation 'androidx.exifinterface:exifinterface:1.0.0'
+        api firebaseCoreProject
+        implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
+        api 'com.google.firebase:firebase-ml-model-interpreter'
+        implementation 'androidx.annotation:annotation:1.1.0'
+        implementation 'androidx.exifinterface:exifinterface:1.3.1'
     }
 }
 

packages/firebase_ml_vision/android/build.gradle

@@ -21,6 +21,19 @@ rootProject.allprojects {
 
 apply plugin: 'com.android.library'
 
+def firebaseCoreProject = findProject(':firebase_core')
+if (firebaseCoreProject == null) {
+  throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?')
+} else if (!firebaseCoreProject.properties['FirebaseSDKVersion']) {
+  throw new GradleException('A newer version of the firebase_core FlutterFire plugin is required, please update your firebase_core pubspec dependency.')
+}
+
+def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
+  if (!rootProject.ext.has('FlutterFire')) return firebaseCoreProject.properties[name]
+  if (!rootProject.ext.get('FlutterFire')[name]) return firebaseCoreProject.properties[name]
+  return rootProject.ext.get('FlutterFire').get(name)
+}
+
 android {
     compileSdkVersion 29
 
@@ -32,8 +45,9 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-ml-vision:20.0.0'
-        implementation 'com.google.firebase:firebase-common:16.1.0'
+        implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
+        implementation 'com.google.firebase:firebase-common'
+        api "com.google.firebase:firebase-ml-vision"
         implementation 'androidx.annotation:annotation:1.0.0'
         implementation 'androidx.exifinterface:exifinterface:1.0.0'
     }

packages/firebase_ml_vision/example/android/app/build.gradle

@@ -24,6 +24,19 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def firebaseCoreProject = findProject(':firebase_core')
+if (firebaseCoreProject == null) {
+  throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?')
+} else if (!firebaseCoreProject.properties['FirebaseSDKVersion']) {
+  throw new GradleException('A newer version of the firebase_core FlutterFire plugin is required, please update your firebase_core pubspec dependency.')
+}
+
+def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
+  if (!rootProject.ext.has('FlutterFire')) return firebaseCoreProject.properties[name]
+  if (!rootProject.ext.get('FlutterFire')[name]) return firebaseCoreProject.properties[name]
+  return rootProject.ext.get('FlutterFire').get(name)
+}
+
 android {
     compileSdkVersion 29
 

packages/firebase_performance/example/android/app/build.gradle

@@ -22,6 +22,7 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: "com.google.firebase.firebase-perf"
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {

packages/firebase_storage/firebase_storage/android/build.gradle

@@ -59,7 +59,7 @@ android {
         api firebaseCoreProject
         implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
         implementation 'com.google.firebase:firebase-storage'
-        implementation 'androidx.annotation:annotation:1.0.0'
+        implementation 'androidx.annotation:annotation:1.1.0'
     }
 }