Clean up prebuild dependencies from gradle files.

jonsimantov · jonsimantov · commit b552d12b975d · 2024-09-25T13:07:34.000-07:00
diff --git a/app_check/build.gradle b/app_check/build.gradle
@@ -86,4 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('app_check')
   setupDexDependencies(':app_check:app_check_resources')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -86,4 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('auth')
   setupDexDependencies(':auth:auth_resources')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/database/build.gradle b/database/build.gradle
@@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('database')
   setupDexDependencies(':database:database_resources')
+  preBuild.dependsOn(':app:build')
+  preBuild.dependsOn(':auth:build')
 }
diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle
@@ -84,4 +84,5 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('dynamic_links')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/firestore/build.gradle b/firestore/build.gradle
@@ -87,4 +87,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('firestore')
   setupDexDependencies(':firestore:firestore_resources')
+  preBuild.dependsOn(':app:build')
+  preBuild.dependsOn(':auth:build')
 }
diff --git a/functions/build.gradle b/functions/build.gradle
@@ -84,6 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('functions')
-  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
+  preBuild.dependsOn(':app:build')
+  preBuild.dependsOn(':auth:build')
 }
diff --git a/gma/build.gradle b/gma/build.gradle
@@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('gma')
   setupDexDependencies(':gma:gma_resources')
-  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/installations/build.gradle b/installations/build.gradle
@@ -84,6 +84,5 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('installations')
-  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/messaging/build.gradle b/messaging/build.gradle
@@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('messaging')
-  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/remote_config/build.gradle b/remote_config/build.gradle
@@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('remote_config')
   setupDexDependencies(':remote_config:remote_config_resources')
-  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
+  preBuild.dependsOn(':app:build')
 }
diff --git a/storage/build.gradle b/storage/build.gradle
@@ -86,8 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('storage')
   setupDexDependencies(':storage:storage_resources')
-  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
-  preDebugBuild.dependsOn(':auth:externalNativeBuildDebug')
-  preReleaseBuild.dependsOn(':auth:externalNativeBuildRelease')
+  preBuild.dependsOn(':app:build')
+  preBuild.dependsOn(':auth:build')
 }

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`86`	`86`	`project.afterEvaluate {`
`87`	`87`	`generateProguardFile('app_check')`
`88`	`88`	`setupDexDependencies(':app_check:app_check_resources')`
	`89`	`+ preBuild.dependsOn(':app:build')`
`89`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`86`	`86`	`project.afterEvaluate {`
`87`	`87`	`generateProguardFile('database')`
`88`	`88`	`setupDexDependencies(':database:database_resources')`
	`89`	`+ preBuild.dependsOn(':app:build')`
	`90`	`+ preBuild.dependsOn(':auth:build')`
`89`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,5 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"`
`84`	`84`	`apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`85`	`85`	`project.afterEvaluate {`
`86`	`86`	`generateProguardFile('dynamic_links')`
	`87`	`+ preBuild.dependsOn(':app:build')`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,4 +87,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`87`	`87`	`project.afterEvaluate {`
`88`	`88`	`generateProguardFile('firestore')`
`89`	`89`	`setupDexDependencies(':firestore:firestore_resources')`
	`90`	`+ preBuild.dependsOn(':app:build')`
	`91`	`+ preBuild.dependsOn(':auth:build')`
`90`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"`
`84`	`84`	`apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`85`	`85`	`project.afterEvaluate {`
`86`	`86`	`generateProguardFile('functions')`
`87`		`- preDebugBuild.dependsOn(':app:externalNativeBuildDebug')`
`88`		`- preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')`
	`87`	`+ preBuild.dependsOn(':app:build')`
	`88`	`+ preBuild.dependsOn(':auth:build')`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,5 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`86`	`86`	`project.afterEvaluate {`
`87`	`87`	`generateProguardFile('gma')`
`88`	`88`	`setupDexDependencies(':gma:gma_resources')`
`89`		`- preDebugBuild.dependsOn(':app:externalNativeBuildDebug')`
`90`		`- preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')`
	`89`	`+ preBuild.dependsOn(':app:build')`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,5 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"`
`84`	`84`	`apply from: "$rootDir/android_build_files/generate_proguard.gradle"`
`85`	`85`	`project.afterEvaluate {`
`86`	`86`	`generateProguardFile('installations')`
`87`		`- preDebugBuild.dependsOn(':app:externalNativeBuildDebug')`
`88`		`- preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')`
	`87`	`+ preBuild.dependsOn(':app:build')`
`89`	`88`	`}`