Skip to content

Commit

Permalink
fix(android): firebase-android-sdk 30.0.1
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mikehardy committed May 14, 2022
1 parent 0205506 commit c5e6b41
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
5 changes: 2 additions & 3 deletions packages/app-check/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ repositories {
dependencies {
api appProject
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion('firebase', 'bom')}")
// These are beta, so they are not in the BoM yet. We have to specify the versions explicitly.
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0-beta04'
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0-beta04'
implementation "com.google.firebase:firebase-appcheck-safetynet"
implementation "com.google.firebase:firebase-appcheck-debug"
}

ReactNative.shared.applyPackageVersion()
Expand Down
2 changes: 2 additions & 0 deletions packages/app-distribution/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ repositories {
dependencies {
api appProject
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
// TODO remove the specific version once it is out of beta and participates in bom versioning
implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta02'
}

ReactNative.shared.applyPackageVersion()
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"targetSdk": 31,
"compileSdk": 31,
"buildTools": "30.0.3",
"firebase": "29.1.0",
"firebase": "30.0.1",
"firebaseCrashlyticsGradle": "2.8.1",
"firebasePerfGradle": "1.4.1",
"gmsGoogleServicesGradle": "4.3.10",
Expand Down
5 changes: 1 addition & 4 deletions packages/firestore/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,7 @@ repositories {
dependencies {
api appProject
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
// TODO - remove this once we have access to a BOM > 29.2.0
// See https://github.com/invertase/react-native-firebase/issues/6158
// See https://github.com/firebase/firebase-android-sdk/issues/3557
implementation "com.google.firebase:firebase-firestore:24.1.1"
implementation "com.google.firebase:firebase-firestore"
}

ReactNative.shared.applyPackageVersion()
Expand Down
6 changes: 4 additions & 2 deletions tests/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apply plugin: 'com.google.firebase.firebase-perf'
apply plugin: 'com.google.firebase.appdistribution'

import com.android.build.OutputFile
import groovy.json.JsonSlurper

project.ext.react = [
enableHermes: false,
Expand Down Expand Up @@ -143,8 +144,9 @@ dependencies {
* ------------------------ */
androidTestImplementation(project(path: ':detox'))

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

apply from: file('../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle'); applyNativeModulesAppBuildGradle(project)
4 changes: 2 additions & 2 deletions tests/android/app/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import groovy.transform.Memoized
apply plugin: 'jacoco'

jacoco {
toolVersion = '0.8.7'
toolVersion = '0.8.8'
}

android {
jacoco {
version = '0.8.7'
version = '0.8.8'
}
}

Expand Down
4 changes: 2 additions & 2 deletions tests/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.google.firebase:perf-plugin:1.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.0'
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.1'
}
}

Expand Down Expand Up @@ -104,7 +104,7 @@ subprojects {
android {
// Instrument all our modules for coverage generation
buildTypes.debug.testCoverageEnabled true
jacoco.version '0.8.7'
jacoco.version '0.8.8'
testOptions.unitTests.includeAndroidResources = true

// Make sure our project are run through basic lint checks
Expand Down

1 comment on commit c5e6b41

@vercel
Copy link

@vercel vercel bot commented on c5e6b41 May 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.