summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-10-23 16:21:50 +0200
committerGitHub <noreply@github.com>2021-10-23 16:21:50 +0200
commitaec383a83e0d5255c868e83e1406e6b5da3b9d2b (patch)
treefbc55c939419342735a4477466cbcf2487a9137e
parent0aa6f27061ce3d140566fbf076010a4f3ead839b (diff)
parentf80cb4dffac69b8251b5ae94831dae3562cc6a63 (diff)
downloadredot-engine-aec383a83e0d5255c868e83e1406e6b5da3b9d2b.tar.gz
Merge pull request #54155 from madmiraal/fix-54091
Fix Gradle builds not excluding excluded tasks
-rw-r--r--platform/android/java/build.gradle14
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index 87bb2ea218..efdcc6c77b 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -158,9 +158,9 @@ def templateBuildTasks() {
/**
* Master task used to coordinate the tasks defined above to generate the set of Godot templates.
*/
-task generateGodotTemplates(type: GradleBuild) {
- startParameter.excludedTaskNames = templateExcludedBuildTask()
- tasks = templateBuildTasks()
+task generateGodotTemplates {
+ gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
+ dependsOn = templateBuildTasks()
finalizedBy 'zipCustomBuild'
}
@@ -168,12 +168,12 @@ task generateGodotTemplates(type: GradleBuild) {
/**
* Generates the same output as generateGodotTemplates but with dev symbols
*/
-task generateDevTemplate (type: GradleBuild) {
+task generateDevTemplate {
// add parameter to set symbols to true
- startParameter.projectProperties += [doNotStrip: true]
+ gradle.startParameter.projectProperties += [doNotStrip: true]
- startParameter.excludedTaskNames = templateExcludedBuildTask()
- tasks = templateBuildTasks()
+ gradle.startParameter.excludedTaskNames += templateExcludedBuildTask()
+ dependsOn = templateBuildTasks()
finalizedBy 'zipCustomBuild'
}