Merge pull request #1217 from NativeScript/kddimitrov/add-buildmetadata-as-dependency-to-mergeassets

vtrifonov · web-flow · commit 56c774ce7636 · 2018-11-29T16:01:58.000+02:00
fix: merges assets executed before the metadata is generated
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
@@ -368,6 +368,9 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
         currentTask.finalizedBy(ensureMetadataOutDir)
         ensureMetadataOutDir.finalizedBy(buildMetadata)
     }
+    if (currentTask =~ /merge.*Assets/) {
+        currentTask.dependsOn(buildMetadata);
+    }
     if (currentTask =~ /assemble.*Debug/ || currentTask =~ /assemble.*Release/) {
         currentTask.finalizedBy("validateAppIdMatch")
     }

Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,9 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->`
`368`	`368`	`currentTask.finalizedBy(ensureMetadataOutDir)`
`369`	`369`	`ensureMetadataOutDir.finalizedBy(buildMetadata)`
`370`	`370`	`}`
	`371`	`+ if (currentTask =~ /merge.*Assets/) {`
	`372`	`+ currentTask.dependsOn(buildMetadata);`
	`373`	`+ }`
`371`	`374`	`if (currentTask =~ /assemble.Debug/ \|\| currentTask =~ /assemble.Release/) {`
`372`	`375`	`currentTask.finalizedBy("validateAppIdMatch")`
`373`	`376`	`}`