flutter · collinjackson · May 7, 2019 · May 6, 2019 · May 6, 2019 · May 6, 2019
diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.11.0
+
+* Update Android dependencies to latest.
+
 ## 0.10.1
 
 * Support for `startAtDocument`, `startAfterDocument`, `endAtDocument`, `endBeforeDocument`.

diff --git a/packages/cloud_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
@@ -47,7 +47,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-firestore:18.2.0'
+        api 'com.google.firebase:firebase-firestore:19.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   cloud_firestore:
     path: ../
-  firebase_core: "^0.3.2"
+  firebase_core: "^0.4.0"
 
 dev_dependencies:
   flutter_driver:

diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
-version: 0.10.1
+version: 0.11.0
 
 flutter:
   plugin:
@@ -16,7 +16,7 @@ dependencies:
     sdk: flutter
   meta: "^1.0.5"
   collection: "^1.14.3"
-  firebase_core: "^0.3.0"
+  firebase_core: "^0.4.0"
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/cloud_functions/CHANGELOG.md b/packages/cloud_functions/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+* Update Android dependencies to latest.
+
 ## 0.2.0+1
 
 * Removed flaky timeout test.

diff --git a/packages/cloud_functions/android/build.gradle b/packages/cloud_functions/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-functions:16.3.0'
+        api 'com.google.firebase:firebase-functions:17.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
     }
 }
diff --git a/packages/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/example/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
   cupertino_icons: ^0.1.2
   cloud_functions:
     path: ..
-  firebase_core: ^0.3.1
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/cloud_functions/pubspec.yaml b/packages/cloud_functions/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cloud_functions
 description: Flutter plugin for Cloud Functions.
-version: 0.2.0+1
+version: 0.3.0
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
 
@@ -13,7 +13,7 @@ dependencies:
   meta: ^1.1.6
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.0
+
+* Update Android dependencies to latest.
+
 ## 0.8.0+4
 
 * Update documentation to add AdMob App ID in Info.plist

diff --git a/packages/firebase_admob/android/build.gradle b/packages/firebase_admob/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-ads:17.0.0'
+        api 'com.google.firebase:firebase-ads:17.2.0'
     }
 }
diff --git a/packages/firebase_admob/example/pubspec.yaml b/packages/firebase_admob/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_admob:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.8.0+4
+version: 0.9.0
 
 flutter:
   plugin:
@@ -20,7 +20,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"

diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Update Android dependencies to latest.
+
 ## 2.1.1+3
 
 * Added an initial integration test.

diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-analytics:16.0.4'
+        api 'com.google.firebase:firebase-analytics:16.5.0'
     }
 }
diff --git a/packages/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_analytics:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_analytics
-version: 2.1.1+3
+version: 3.0.0
 
 flutter:
   plugin:
@@ -21,7 +21,7 @@ dev_dependencies:
   mockito: 3.0.0
   flutter_test:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
   flutter_driver:
     sdk: flutter
 

diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.10.0
+
+* Update firebase_dynamic_links dependency.
+* Update Android dependencies to latest.
+
 ## 0.9.0
 
 * **Breaking change**: `PhoneVerificationCompleted` now provides an `AuthCredential` that can

diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle
@@ -46,7 +46,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-auth:16.0.5'
+        api 'com.google.firebase:firebase-auth:17.0.0'
         api 'com.google.code.gson:gson:2.8.5'
     }
 }
diff --git a/packages/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/example/pubspec.yaml
@@ -8,8 +8,8 @@ dependencies:
   firebase_auth:
     path: ../
   google_sign_in: ^4.0.0
-  firebase_core: ^0.3.0
-  firebase_dynamic_links: ^0.2.0+3
+  firebase_core: ^0.4.0
+  firebase_dynamic_links: ^0.3.0
 
 dev_dependencies:
   flutter_driver:

diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS
   like Google, Facebook and Twitter.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth
-version: "0.9.0"
+version: "0.10.0"
 
 flutter:
   plugin:
@@ -14,14 +14,14 @@ flutter:
 
 dependencies:
   meta: ^1.0.4
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
   flutter:
     sdk: flutter
 
 dev_dependencies:
   google_sign_in: ^3.0.4
-  firebase_dynamic_links: ^0.2.0+3
+  firebase_dynamic_links: ^0.3.0
   test: ^1.3.0
   flutter_test:
     sdk: flutter

diff --git a/packages/firebase_database/CHANGELOG.md b/packages/firebase_database/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Update Android dependencies to latest.
+
 ## 2.0.3
 
 * Provide a `toString` implementation for `DatabaseError`.

diff --git a/packages/firebase_database/android/build.gradle b/packages/firebase_database/android/build.gradle
@@ -45,6 +45,6 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-database:16.0.3'
+        api 'com.google.firebase:firebase-database:17.0.0'
     }
 }
diff --git a/packages/firebase_database/example/pubspec.yaml b/packages/firebase_database/example/pubspec.yaml
@@ -6,7 +6,7 @@ dependencies:
     sdk: flutter
   firebase_database:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   flutter_driver:

diff --git a/packages/firebase_database/pubspec.yaml b/packages/firebase_database/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Database, a cloud-hosted NoSQL database
   with realtime data syncing across Android and iOS clients, and offline access.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_database
-version: 2.0.3
+version: 3.0.0
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 dev_dependencies:
   test: ^1.3.0

diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+* Update dependency on firebase_core to 0.4.0.
+
 ## 0.3.0.
 
 * Update Android dependencies to 16.1.7.

diff --git a/packages/firebase_dynamic_links/example/pubspec.yaml b/packages/firebase_dynamic_links/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
 
   firebase_dynamic_links:
     path: ../
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
   url_launcher: ^4.2.0
 

diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.3.0
+version: 0.4.0
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links
@@ -14,7 +14,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   url_launcher: ^4.2.0
-  firebase_core: ^0.3.0
+  firebase_core: ^0.4.0
 
 flutter:
   plugin:

diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.0
+
+* Update Android dependencies to latest.
+
 ## 4.0.0+4
 
 * Remove obsolete `use_frameworks!` instruction.

diff --git a/packages/firebase_messaging/android/build.gradle b/packages/firebase_messaging/android/build.gradle
@@ -45,7 +45,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        api 'com.google.firebase:firebase-messaging:17.3.3'
+        api 'com.google.firebase:firebase-messaging:18.0.0'
         implementation 'androidx.annotation:annotation:1.0.0'
         implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     }

diff --git a/packages/firebase_messaging/android/src/main/AndroidManifest.xml b/packages/firebase_messaging/android/src/main/AndroidManifest.xml
@@ -2,11 +2,6 @@
   package="io.flutter.plugins.firebasemessaging">
 
   <application>
-    <service android:name=".FlutterFirebaseInstanceIDService">
-      <intent-filter>
-        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-      </intent-filter>
-    </service>
     <service android:name=".FlutterFirebaseMessagingService">
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT"/>

diff --git a/...g/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/...g/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -52,7 +52,7 @@ private FirebaseMessagingPlugin(Registrar registrar, MethodChannel channel) {
     FirebaseApp.initializeApp(registrar.context());
 
     IntentFilter intentFilter = new IntentFilter();
-    intentFilter.addAction(FlutterFirebaseInstanceIDService.ACTION_TOKEN);
+    intentFilter.addAction(FlutterFirebaseMessagingService.ACTION_TOKEN);
     intentFilter.addAction(FlutterFirebaseMessagingService.ACTION_REMOTE_MESSAGE);
     LocalBroadcastManager manager = LocalBroadcastManager.getInstance(registrar.context());
     manager.registerReceiver(this, intentFilter);
@@ -67,8 +67,8 @@ public void onReceive(Context context, Intent intent) {
       return;
     }
 
-    if (action.equals(FlutterFirebaseInstanceIDService.ACTION_TOKEN)) {
-      String token = intent.getStringExtra(FlutterFirebaseInstanceIDService.EXTRA_TOKEN);
+    if (action.equals(FlutterFirebaseMessagingService.ACTION_TOKEN)) {
+      String token = intent.getStringExtra(FlutterFirebaseMessagingService.EXTRA_TOKEN);
       channel.invokeMethod("onToken", token);
     } else if (action.equals(FlutterFirebaseMessagingService.ACTION_REMOTE_MESSAGE)) {
       RemoteMessage message =
@@ -100,7 +100,20 @@ private Map<String, Object> parseRemoteMessage(RemoteMessage message) {
   @Override
   public void onMethodCall(final MethodCall call, final Result result) {
     if ("configure".equals(call.method)) {
-      FlutterFirebaseInstanceIDService.broadcastToken(registrar.context());
+      FirebaseInstanceId.getInstance()
+          .getInstanceId()
+          .addOnCompleteListener(
+              new OnCompleteListener<InstanceIdResult>() {
+                @Override
+                public void onComplete(@NonNull Task<InstanceIdResult> task) {
+                  if (!task.isSuccessful()) {
+                    Log.w(TAG, "getToken, error fetching instanceID: ", task.getException());
+                    result.success(null);
+                    return;
+                  }
+                  channel.invokeMethod("onToken", task.getResult().getToken());
+                }
+              });
       if (registrar.activity() != null) {
         sendMessageFromIntent("onLaunch", registrar.activity().getIntent());
       }