Browse Source

Fix Gradle builds not excluding excluded tasks

(cherry picked from commit f80cb4dffac69b8251b5ae94831dae3562cc6a63)
Marcel Admiraal 3 years ago
parent
commit
4febf69f2a
1 changed files with 7 additions and 7 deletions
  1. 7 7
      platform/android/java/build.gradle

+ 7 - 7
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.
  * 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'
     finalizedBy 'zipCustomBuild'
 }
 }
@@ -168,12 +168,12 @@ task generateGodotTemplates(type: GradleBuild) {
 /**
 /**
  * Generates the same output as generateGodotTemplates but with dev symbols
  * Generates the same output as generateGodotTemplates but with dev symbols
  */
  */
-task generateDevTemplate (type: GradleBuild) {
+task generateDevTemplate {
     // add parameter to set symbols to true
     // 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'
     finalizedBy 'zipCustomBuild'
 }
 }