Skip to content

Commit 0cfee04

Browse files
mikehardymikehardy
committed
refactor(android): buildFinished deprecated in gradle with no good replacement
it is possible to emulate the old behavior but it is extraordinarily verbose and relies on an incubating feature only used to print warnings at bottom, but printing them anywhere seems good enough so just warn in place if our app package isn't the version we expect
1 parent 6387263 commit 0cfee04

15 files changed

Lines changed: 15 additions & 60 deletions

File tree

‎packages/analytics/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3939
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
4040
def coreVersionDetected = appPackageJson['version']
4141
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
42-
// Only log after build completed so log warning appears at the end
4342
if (coreVersionDetected != coreVersionRequired) {
44-
gradle.buildFinished {
45-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
46-
}
43+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4744
}
4845

4946
project.ext {

‎packages/app-check/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/app-distribution/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/auth/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/crashlytics/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/database/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/firestore/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/functions/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/in-app-messaging/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

‎packages/installations/android/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
3737
def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
3838
def coreVersionDetected = appPackageJson['version']
3939
def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
40-
// Only log after build completed so log warning appears at the end
4140
if (coreVersionDetected != coreVersionRequired) {
42-
gradle.buildFinished {
43-
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
44-
}
41+
project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
4542
}
4643

4744
project.ext {

0 commit comments

Comments
 (0)