Merge branch 'master' into patch-1

vtrifonov · web-flow · commit 1e9e04337590 · 2018-12-03T16:07:56.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2018 Telerik EAD
+   Copyright (c) 2015-2018 Progress Software Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
@@ -369,7 +369,7 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
         ensureMetadataOutDir.finalizedBy(buildMetadata)
     }
     if (currentTask =~ /merge.*Assets/) {
-        currentTask.dependsOn(buildMetadata);
+        currentTask.shouldRunAfter(buildMetadata);
     }
     if (currentTask =~ /assemble.*Debug/ || currentTask =~ /assemble.*Release/) {
         currentTask.finalizedBy("validateAppIdMatch")

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