diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md index 916da23a4332..effdcb72e905 100644 --- a/packages/firebase_remote_config/CHANGELOG.md +++ b/packages/firebase_remote_config/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.3.0 + +* Update Android Firebase Remote Config dependency to 19.0.3. +* Resolve an Android compiler warning due to deprecated API usage. +* Bump Gradle, AGP & Google Services plugin versions. + ## 0.2.1 * Support Android V2 embedding. diff --git a/packages/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/android/build.gradle index 71661657bcdf..f2b61f8aecb3 100644 --- a/packages/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.5.2' } } @@ -32,8 +32,8 @@ android { disable 'InvalidPackage' } dependencies { - api 'com.google.firebase:firebase-config:16.4.1' - implementation 'com.google.firebase:firebase-common:16.1.0' + api 'com.google.firebase:firebase-config:19.0.3' + implementation 'com.google.firebase:firebase-common:19.3.0' implementation 'androidx.annotation:annotation:1.0.0' } } diff --git a/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/MethodCallHandlerImpl.java b/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/MethodCallHandlerImpl.java index c377554a9733..ff7dfc80ca74 100644 --- a/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/MethodCallHandlerImpl.java +++ b/packages/firebase_remote_config/android/src/main/java/io/flutter/plugins/firebase/firebaseremoteconfig/MethodCallHandlerImpl.java @@ -102,11 +102,23 @@ public void onComplete(Task task) { } case "RemoteConfig#activate": { - boolean newConfig = FirebaseRemoteConfig.getInstance().activateFetched(); - Map properties = new HashMap<>(); - properties.put("parameters", getConfigParameters()); - properties.put("newConfig", newConfig); - result.success(properties); + FirebaseRemoteConfig.getInstance() + .activate() + .addOnCompleteListener( + new OnCompleteListener() { + @Override + public void onComplete(Task task) { + if (!task.isSuccessful()) { + String errorMessage = "Unable to complete activate."; + result.error("activateFailed", errorMessage, null); + } else { + Map properties = new HashMap<>(); + properties.put("parameters", getConfigParameters()); + properties.put("newConfig", task.getResult()); + result.success(properties); + } + } + }); break; } case "RemoteConfig#setDefaults": diff --git a/packages/firebase_remote_config/example/android/build.gradle b/packages/firebase_remote_config/example/android/build.gradle index 359119307d55..274a01b4340b 100644 --- a/packages/firebase_remote_config/example/android/build.gradle +++ b/packages/firebase_remote_config/example/android/build.gradle @@ -5,8 +5,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' - classpath 'com.google.gms:google-services:4.3.0' + classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.google.gms:google-services:4.3.2' } } diff --git a/packages/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1fd..60f7ae6cf36a 100644 --- a/packages/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Mon Nov 18 11:38:44 GMT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml index f448aedb32c0..8e3915e499f0 100644 --- a/packages/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application re-releasing. author: Flutter Team homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_remote_config -version: 0.2.1 +version: 0.3.0 dependencies: flutter: