diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle index e7e93e5f..60800e19 100644 --- a/packages/analytics/android/build.gradle +++ b/packages/analytics/android/build.gradle @@ -25,11 +25,11 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ - analytics: "16.0.6" + analytics: "16.3.0" ], ], ]) diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle index 6cc3acf9..79a43e1b 100644 --- a/packages/app/android/build.gradle +++ b/packages/app/android/build.gradle @@ -25,11 +25,11 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ - core: "16.0.6" + core: "16.0.7" ], ], ]) diff --git a/packages/app/android/expo.gradle b/packages/app/android/expo.gradle index 0a4333d1..5687e481 100644 --- a/packages/app/android/expo.gradle +++ b/packages/app/android/expo.gradle @@ -4,18 +4,13 @@ logger.log(LogLevel.WARN, " | WARNING REACT NATIVE FIREBASE logger.log(LogLevel.WARN, " ----------------------------------------------------------- ") logger.log(LogLevel.WARN, " | |") logger.log(LogLevel.WARN, " | It looks like you're using Expo; |") -logger.log(LogLevel.WARN, " | we no longer test for or support Expo - therefore we |") -logger.log(LogLevel.WARN, " | will not offer support or gurantee stability whilst |") -logger.log(LogLevel.WARN, " | using this library on their platform. |") +logger.log(LogLevel.WARN, " | we no longer test for / support Expo - therefore we |") +logger.log(LogLevel.WARN, " | can not offer support or gurantee stability whilst |") +logger.log(LogLevel.WARN, " | using this library in Expo. |") logger.log(LogLevel.WARN, " | |") logger.log(LogLevel.WARN, " | We recommend ejecting from Expo entirely should you |") logger.log(LogLevel.WARN, " | wish to continue using React Native Firebase or if |") logger.log(LogLevel.WARN, " | want to get official support for it from us. |") logger.log(LogLevel.WARN, " | |") -logger.log(LogLevel.WARN, " | NOTE: Expo's 'ExpoFirebase' is an outdated, unofficial, |") -logger.log(LogLevel.WARN, " | direct copy of our source code, should you wish to use |") -logger.log(LogLevel.WARN, " | Expo + 'ExpoFirebase' instead then you do so at your |") -logger.log(LogLevel.WARN, " | own risk without support from React Native Firebase. |") -logger.log(LogLevel.WARN, " | |") logger.log(LogLevel.WARN, " ----------------------------------------------------------- ") logger.log(LogLevel.WARN, "") \ No newline at end of file diff --git a/packages/config/android/build.gradle b/packages/config/android/build.gradle index defb23a9..f948fae7 100644 --- a/packages/config/android/build.gradle +++ b/packages/config/android/build.gradle @@ -25,11 +25,11 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ - config: "16.0.6" + config: "16.3.0" ], ], ]) diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle index 9dee65ac..8d4d4d5c 100644 --- a/packages/crashlytics/android/build.gradle +++ b/packages/crashlytics/android/build.gradle @@ -25,11 +25,11 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], - firebase : [ - crashlytics: "16.0.6" + fabric : [ + crashlytics: "2.9.9" ], ], ]) @@ -56,7 +56,7 @@ repositories { dependencies { api project(':@react-native-firebase/app') - implementation "com.google.firebase:firebase-crashlytics:${ReactNative.ext.getVersion("firebase", "crashlytics")}" + implementation "com.crashlytics.sdk.android:crashlytics:${ReactNative.ext.getVersion("fabric", "crashlytics")}" implementation "com.google.android.gms:play-services-base:${ReactNative.ext.getVersion("googlePlayServices", "base")}" } diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle index 2cdcf664..fa897caf 100644 --- a/packages/functions/android/build.gradle +++ b/packages/functions/android/build.gradle @@ -25,7 +25,7 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ diff --git a/packages/iid/android/build.gradle b/packages/iid/android/build.gradle index 7be5834b..7457f23e 100644 --- a/packages/iid/android/build.gradle +++ b/packages/iid/android/build.gradle @@ -25,11 +25,11 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ - iid: "16.0.6" + iid: "17.0.4" ], ], ]) diff --git a/packages/mlkit/android/build.gradle b/packages/mlkit/android/build.gradle index 1a000aed..0988397a 100644 --- a/packages/mlkit/android/build.gradle +++ b/packages/mlkit/android/build.gradle @@ -25,11 +25,13 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ - mlkit: "16.0.6" + mlkitVision: "19.0.2", + mlkitCommon: "16.2.1", + mlkitNaturalLanguage: "18.1.1", ], ], ]) @@ -56,7 +58,9 @@ repositories { dependencies { api project(':@react-native-firebase/app') - implementation "com.google.firebase:firebase-mlkit:${ReactNative.ext.getVersion("firebase", "mlkit")}" + implementation "com.google.firebase:firebase-ml-common:${ReactNative.ext.getVersion("firebase", "mlkitCommon")}" + implementation "com.google.firebase:firebase-ml-vision:${ReactNative.ext.getVersion("firebase", "mlkitVision")}" + implementation "com.google.firebase:firebase-ml-natural-language:${ReactNative.ext.getVersion("firebase", "mlkitNaturalLanguage")}" implementation "com.google.android.gms:play-services-base:${ReactNative.ext.getVersion("googlePlayServices", "base")}" } diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle index 97d30af4..6c48bf64 100644 --- a/packages/perf/android/build.gradle +++ b/packages/perf/android/build.gradle @@ -25,7 +25,7 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ diff --git a/packages/utils/android/build.gradle b/packages/utils/android/build.gradle index ee4cbb6b..33d802fb 100644 --- a/packages/utils/android/build.gradle +++ b/packages/utils/android/build.gradle @@ -25,11 +25,7 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", - ], - - firebase : [ - utils: "16.0.6" + base: "16.1.0", ], ], ]) @@ -56,7 +52,6 @@ repositories { dependencies { api project(':@react-native-firebase/app') - implementation "com.google.firebase:firebase-utils:${ReactNative.ext.getVersion("firebase", "utils")}" implementation "com.google.android.gms:play-services-base:${ReactNative.ext.getVersion("googlePlayServices", "base")}" } diff --git a/scripts/_TEMPLATE_/android/build.gradle b/scripts/_TEMPLATE_/android/build.gradle index 4701b6c8..db8669f2 100644 --- a/scripts/_TEMPLATE_/android/build.gradle +++ b/scripts/_TEMPLATE_/android/build.gradle @@ -25,7 +25,7 @@ project.ext { ], googlePlayServices: [ - base: "16.0.1", + base: "16.1.0", ], firebase : [ diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 0ad4b2fa..0143b6fa 100755 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -12,6 +12,17 @@ project.ext.react = [ apply from: "../../node_modules/react-native/react.gradle" def enableSeparateBuildPerCPUArchitecture = false +def firebasePackages = [ + 'app', + 'analytics', + 'config', + 'crashlytics', + 'functions', + 'iid', + 'mlkit', + 'perf', + 'utils' +] android { compileSdkVersion 28 @@ -91,12 +102,9 @@ dependencies { * REACT NATIVE FIREBASE * ---------------------------- */ - // Libraries as defined in settings.gradle - implementation project(path: ':@react-native-firebase/app') - implementation project(path: ':@react-native-firebase/analytics') - implementation project(path: ':@react-native-firebase/functions') - implementation project(path: ':@react-native-firebase/iid') - implementation project(path: ':@react-native-firebase/perf') + firebasePackages.each { firebasePackage -> + implementation project(path: ":@react-native-firebase/${firebasePackage}") + } /* ------------------------ * TESTING SDKS/LIBRARIES diff --git a/tests/android/app/src/main/java/com/invertase/testing/MainApplication.java b/tests/android/app/src/main/java/com/invertase/testing/MainApplication.java index 3a5fe4af..e9c511ee 100755 --- a/tests/android/app/src/main/java/com/invertase/testing/MainApplication.java +++ b/tests/android/app/src/main/java/com/invertase/testing/MainApplication.java @@ -12,12 +12,16 @@ import com.facebook.soloader.SoLoader; import java.util.Arrays; import java.util.List; +import io.invertase.firebase.analytics.ReactNativeFirebaseAnalyticsPackage; import io.invertase.firebase.app.ReactNativeFirebaseApp; import io.invertase.firebase.app.ReactNativeFirebaseAppPackage; -import io.invertase.firebase.iid.ReactNativeFirebaseIidPackage; -import io.invertase.firebase.perf.ReactNativeFirebasePerfPackage; +import io.invertase.firebase.config.ReactNativeFirebaseConfigPackage; +import io.invertase.firebase.crashlytics.ReactNativeFirebaseCrashlyticsPackage; import io.invertase.firebase.functions.ReactNativeFirebaseFunctionsPackage; -import io.invertase.firebase.analytics.ReactNativeFirebaseAnalyticsPackage; +import io.invertase.firebase.iid.ReactNativeFirebaseIidPackage; +import io.invertase.firebase.mlkit.ReactNativeFirebaseMlkitPackage; +import io.invertase.firebase.perf.ReactNativeFirebasePerfPackage; +import io.invertase.firebase.utils.ReactNativeFirebaseUtilsPackage; import io.invertase.jet.JetPackage; public class MainApplication extends Application implements ReactApplication { @@ -33,10 +37,14 @@ public class MainApplication extends Application implements ReactApplication { new MainReactPackage(), new JetPackage(), new ReactNativeFirebaseAppPackage(), + new ReactNativeFirebaseCrashlyticsPackage(), + new ReactNativeFirebaseConfigPackage(), + new ReactNativeFirebaseMlkitPackage(), new ReactNativeFirebaseAnalyticsPackage(), new ReactNativeFirebaseFunctionsPackage(), new ReactNativeFirebaseIidPackage(), - new ReactNativeFirebasePerfPackage() + new ReactNativeFirebasePerfPackage(), + new ReactNativeFirebaseUtilsPackage() ); } }; diff --git a/tests/android/settings.gradle b/tests/android/settings.gradle index 4b625c07..b966922f 100755 --- a/tests/android/settings.gradle +++ b/tests/android/settings.gradle @@ -1,23 +1,25 @@ rootProject.name = '@react-native-firebase/tests' +def firebasePackages = [ + 'app', + 'analytics', + 'config', + 'crashlytics', + 'functions', + 'iid', + 'mlkit', + 'perf', + 'utils' +] + +firebasePackages.each { firebasePackage -> + include ":@react-native-firebase/${firebasePackage}" + project(":@react-native-firebase/${firebasePackage}").projectDir = new File(rootProject.projectDir, "./../../packages/${firebasePackage}/android") +} + include ':jet' project(':jet').projectDir = new File(rootProject.projectDir, './../node_modules/jet/android') -include ':@react-native-firebase/app' -project(':@react-native-firebase/app').projectDir = new File(rootProject.projectDir, './../../packages/app/android') - -include ':@react-native-firebase/analytics' -project(':@react-native-firebase/analytics').projectDir = new File(rootProject.projectDir, './../../packages/analytics/android') - -include ':@react-native-firebase/functions' -project(':@react-native-firebase/functions').projectDir = new File(rootProject.projectDir, './../../packages/functions/android') - -include ':@react-native-firebase/iid' -project(':@react-native-firebase/iid').projectDir = new File(rootProject.projectDir, './../../packages/iid/android') - -include ':@react-native-firebase/perf' -project(':@react-native-firebase/perf').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-firebase/perf/android') - include ':detox' project(':detox').projectDir = new File(rootProject.projectDir, './../node_modules/detox/android/detox')