Skip to content

Commit c5e6b41

Browse files
committed
fix(android): firebase-android-sdk 30.0.1
the upstream breaking change was removal of analytics ecommerce constants, those are already gone here AppCheck no longer beta, app distribution available, but it is beta, adjust deps the features added are not exposed here yet, so to us this is just a fix release allows reversal of workaround in #6158
1 parent 0205506 commit c5e6b41

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

packages/app-check/android/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ repositories {
9393
dependencies {
9494
api appProject
9595
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion('firebase', 'bom')}")
96-
// These are beta, so they are not in the BoM yet. We have to specify the versions explicitly.
97-
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0-beta04'
98-
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0-beta04'
96+
implementation "com.google.firebase:firebase-appcheck-safetynet"
97+
implementation "com.google.firebase:firebase-appcheck-debug"
9998
}
10099

101100
ReactNative.shared.applyPackageVersion()

packages/app-distribution/android/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ repositories {
9090
dependencies {
9191
api appProject
9292
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
93+
// TODO remove the specific version once it is out of beta and participates in bom versioning
94+
implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta02'
9395
}
9496

9597
ReactNative.shared.applyPackageVersion()

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"targetSdk": 31,
7373
"compileSdk": 31,
7474
"buildTools": "30.0.3",
75-
"firebase": "29.1.0",
75+
"firebase": "30.0.1",
7676
"firebaseCrashlyticsGradle": "2.8.1",
7777
"firebasePerfGradle": "1.4.1",
7878
"gmsGoogleServicesGradle": "4.3.10",

packages/firestore/android/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ repositories {
9090
dependencies {
9191
api appProject
9292
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
93-
// TODO - remove this once we have access to a BOM > 29.2.0
94-
// See https://github.com/invertase/react-native-firebase/issues/6158
95-
// See https://github.com/firebase/firebase-android-sdk/issues/3557
96-
implementation "com.google.firebase:firebase-firestore:24.1.1"
93+
implementation "com.google.firebase:firebase-firestore"
9794
}
9895

9996
ReactNative.shared.applyPackageVersion()

tests/android/app/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ apply plugin: 'com.google.firebase.firebase-perf'
55
apply plugin: 'com.google.firebase.appdistribution'
66

77
import com.android.build.OutputFile
8+
import groovy.json.JsonSlurper
89

910
project.ext.react = [
1011
enableHermes: false,
@@ -143,8 +144,9 @@ dependencies {
143144
* ------------------------ */
144145
androidTestImplementation(project(path: ':detox'))
145146

146-
// These are beta, so they are not in the BoM yet. We have to specify the versions explicitly.
147-
androidTestImplementation 'com.google.firebase:firebase-appcheck-debug-testing:16.0.0-beta04'
147+
def firebaseBomVersion = new JsonSlurper().parseText(new File('../../node_modules/@react-native-firebase/app/package.json').text).sdkVersions.android.firebase
148+
androidTestImplementation platform("com.google.firebase:firebase-bom:${firebaseBomVersion}")
149+
androidTestImplementation "com.google.firebase:firebase-appcheck-debug-testing"
148150
}
149151

150152
apply from: file('../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle'); applyNativeModulesAppBuildGradle(project)

tests/android/app/jacoco.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import groovy.transform.Memoized
33
apply plugin: 'jacoco'
44

55
jacoco {
6-
toolVersion = '0.8.7'
6+
toolVersion = '0.8.8'
77
}
88

99
android {
1010
jacoco {
11-
version = '0.8.7'
11+
version = '0.8.8'
1212
}
1313
}
1414

tests/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ buildscript {
3636
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
3737
classpath 'com.google.firebase:perf-plugin:1.4.1'
3838
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
39-
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.0'
39+
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.1'
4040
}
4141
}
4242

@@ -104,7 +104,7 @@ subprojects {
104104
android {
105105
// Instrument all our modules for coverage generation
106106
buildTypes.debug.testCoverageEnabled true
107-
jacoco.version '0.8.7'
107+
jacoco.version '0.8.8'
108108
testOptions.unitTests.includeAndroidResources = true
109109

110110
// Make sure our project are run through basic lint checks

0 commit comments

Comments
 (0)