diff --git a/.spellcheck.dict.txt b/.spellcheck.dict.txt index 464720572b1..1174e5f9fcc 100644 --- a/.spellcheck.dict.txt +++ b/.spellcheck.dict.txt @@ -50,6 +50,7 @@ Firestore GDPR globals Gradle +gradle Hesp Homebrew HTTP diff --git a/docs/in-app-messaging/usage/index.md b/docs/in-app-messaging/usage/index.md index c0fec8f80e2..64a94a6105b 100644 --- a/docs/in-app-messaging/usage/index.md +++ b/docs/in-app-messaging/usage/index.md @@ -24,6 +24,8 @@ yarn add @react-native-firebase/in-app-messaging cd ios/ && pod install ``` +Note: in-app-messaging requires a minimum android gradle plugin version of 3.5.4 to compile or you will see `AAPT` errors regarding unexpected XML with `` elements. However, `react-native@0.63.4` still ships with a default of 3.5.3. If you have not already, you must update the line `classpath("com.android.tools.build:gradle:3.5.3")`in `android/build.gradle` to a minimum of `3.5.4` for android builds to work. + If you're using an older version of React Native without autolinking support, or wish to integrate into an existing project, you can follow the manual installation steps for [iOS](/in-app-messaging/usage/installation/ios) and [Android](/in-app-messaging/usage/installation/android). diff --git a/packages/auth/android/build.gradle b/packages/auth/android/build.gradle index b8ba4fed62b..f22a5e35e2b 100644 --- a/packages/auth/android/build.gradle +++ b/packages/auth/android/build.gradle @@ -81,10 +81,21 @@ repositories { jcenter() } +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + +def BROWSER_VERSION = safeExtGet('androidxBrowserVersion', '[1.0.0, 2.0.0)') + dependencies { api appProject implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}") implementation "com.google.firebase:firebase-auth" + + // This is needed for the reCAPTCHA flow but is incorrectly missing as a transitive dependency upstream + // https://github.com/invertase/react-native-firebase/issues/4744 + // https://github.com/firebase/firebase-android-sdk/issues/2164 + implementation "androidx.browser:browser:${BROWSER_VERSION}" } ReactNative.shared.applyPackageVersion() diff --git a/packages/ml/android/build.gradle b/packages/ml/android/build.gradle index 32e68066a88..aaf79cfd66b 100644 --- a/packages/ml/android/build.gradle +++ b/packages/ml/android/build.gradle @@ -94,8 +94,6 @@ dependencies { implementation 'com.google.android.gms:play-services-vision:20.1.1' implementation 'com.google.android.gms:play-services-vision-common:19.1.1' - implementation 'com.google.android.gms:play-services-vision-image-labeling-internal:16.0.5' - implementation 'com.google.android.gms:play-services-vision-image-label:18.0.5' implementation 'com.google.firebase:firebase-ml-model-interpreter:22.0.4' }