Skip to content

Commit 1fc5c20

Browse files
authored
feat: bump firebase sdk versions, add GoogleApi dep, use Android API29 (invertase#4122)
* feat(sdks, dependencies): bump firebase sdk versions, add GoogleApi dep, use Android API29 This bumps firebase-ios-sdk to 6.31.0, Android to 25.7.0, and Android compile/target to API29 Also: - cleans up the non-functional gradle wrapper files in the packages - centralizes all the gradle versioning to app/package.json (overrides still possible) * fix(ios, versions): centralize firebase-ios-sdk versions
1 parent 1691473 commit 1fc5c20

File tree

5 files changed

+11
-305
lines changed

5 files changed

+11
-305
lines changed

RNFBMessaging.podspec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ appPackage = JSON.parse(File.read(File.join('..', 'app', 'package.json')))
44

55
coreVersionDetected = appPackage['version']
66
coreVersionRequired = package['peerDependencies'][appPackage['name']]
7-
if appPackage['sdkVersions']
8-
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
9-
else
10-
firebase_sdk_version = '~> 6.28.1'
11-
end
7+
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
128
if coreVersionDetected != coreVersionRequired
139
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
1410
end

android/build.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212

1313
dependencies {
14-
classpath("com.android.tools.build:gradle:4.0.0")
14+
classpath("com.android.tools.build:gradle:4.0.1")
1515
}
1616
}
1717
}
@@ -30,7 +30,11 @@ if (findProject(':@react-native-firebase_app')) {
3030
}
3131
def packageJson = PackageJson.getForProject(project)
3232
def appPackageJson = PackageJson.getForProject(appProject)
33-
def firebaseBomVersion = appPackageJson['sdkVersions'] ? appPackageJson['sdkVersions']['android']['firebase'] : "25.5.0"
33+
def firebaseBomVersion = appPackageJson['sdkVersions']['android']['firebase']
34+
def jsonMinSdk = appPackageJson['sdkVersions']['android']['minSdk']
35+
def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
36+
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
37+
def jsonBuildTools = appPackageJson['sdkVersions']['android']['buildTools']
3438
def coreVersionDetected = appPackageJson['version']
3539
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
3640
// Only log after build completed so log warning appears at the end
@@ -40,17 +44,16 @@ if (coreVersionDetected != coreVersionRequired) {
4044
}
4145
}
4246

43-
4447
project.ext {
4548
set('react-native', [
4649
versions: [
4750
android : [
48-
minSdk : 16,
49-
targetSdk : 28,
50-
compileSdk: 28,
51+
minSdk : jsonMinSdk,
52+
targetSdk : jsonTargetSdk,
53+
compileSdk: jsonCompileSdk,
5154
// optional as gradle.buildTools comes with one by default
5255
// overriding here though to match the version RN uses
53-
buildTools: "28.0.3"
56+
buildTools: jsonBuildTools
5457
],
5558

5659
firebase: [

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

android/gradlew

Lines changed: 0 additions & 188 deletions
This file was deleted.

android/gradlew.bat

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)