Skip to content

Commit

Permalink
feat(sdks, dependencies): bump firebase sdk versions, add GoogleApi d…
Browse files Browse the repository at this point in the history
…ep, 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)
  • Loading branch information
mikehardy committed Aug 26, 2020
1 parent 525dcc2 commit 39350b6
Show file tree
Hide file tree
Showing 77 changed files with 422 additions and 5,367 deletions.
18 changes: 11 additions & 7 deletions packages/admob/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:4.0.0")
classpath("com.android.tools.build:gradle:4.0.1")
}
}
}
Expand All @@ -30,7 +30,11 @@ if (findProject(':@react-native-firebase_app')) {
}
def packageJson = PackageJson.getForProject(project)
def appPackageJson = PackageJson.getForProject(appProject)
def firebaseBomVersion = appPackageJson['sdkVersions'] ? appPackageJson['sdkVersions']['android']['firebase'] : "25.5.0"
def firebaseBomVersion = appPackageJson['sdkVersions']['android']['firebase']
def jsonMinSdk = appPackageJson['sdkVersions']['android']['minSdk']
def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
def jsonBuildTools = appPackageJson['sdkVersions']['android']['buildTools']
def coreVersionDetected = appPackageJson['version']
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
// Only log after build completed so log warning appears at the end
Expand All @@ -44,16 +48,16 @@ project.ext {
set('react-native', [
versions: [
android : [
minSdk : 16,
targetSdk : 28,
compileSdk: 28,
minSdk : jsonMinSdk,
targetSdk : jsonTargetSdk,
compileSdk: jsonCompileSdk,
// optional as gradle.buildTools comes with one by default
// overriding here though to match the version RN uses
buildTools: "28.0.3"
buildTools: jsonBuildTools
],

firebase: [
bom: firebaseBomVersion
bom: firebaseBomVersion,
],

ads : [
Expand Down

This file was deleted.

188 changes: 0 additions & 188 deletions packages/admob/android/gradlew

This file was deleted.

100 changes: 0 additions & 100 deletions packages/admob/android/gradlew.bat

This file was deleted.

21 changes: 12 additions & 9 deletions packages/analytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:4.0.0")
classpath("com.android.tools.build:gradle:4.0.1")
}
}
}
Expand All @@ -30,7 +30,11 @@ if (findProject(':@react-native-firebase_app')) {
}
def packageJson = PackageJson.getForProject(project)
def appPackageJson = PackageJson.getForProject(appProject)
def firebaseBomVersion = appPackageJson['sdkVersions'] ? appPackageJson['sdkVersions']['android']['firebase'] : "25.5.0"
def firebaseBomVersion = appPackageJson['sdkVersions']['android']['firebase']
def jsonMinSdk = appPackageJson['sdkVersions']['android']['minSdk']
def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
def jsonBuildTools = appPackageJson['sdkVersions']['android']['buildTools']
def coreVersionDetected = appPackageJson['version']
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
// Only log after build completed so log warning appears at the end
Expand All @@ -40,20 +44,19 @@ if (coreVersionDetected != coreVersionRequired) {
}
}


project.ext {
set('react-native', [
versions: [
android : [
minSdk : 16,
targetSdk : 28,
compileSdk: 28,
android : [
minSdk : jsonMinSdk,
targetSdk : jsonTargetSdk,
compileSdk: jsonCompileSdk,
// optional as gradle.buildTools comes with one by default
// overriding here though to match the version RN uses
buildTools: "28.0.3"
buildTools: jsonBuildTools
],

firebase : [
firebase: [
bom: firebaseBomVersion,
],
],
Expand Down

This file was deleted.

Loading

0 comments on commit 39350b6

Please sign in to comment.