From ca2dbad5281de2419fd697910a512e308ac724c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Thu, 24 Oct 2024 22:24:37 +0200 Subject: [PATCH] build: depend on resolve_mbeddr_platform Because we always need the platform zip unzipped. In case of a local build we zip the platform first and then unzip it again later, but we keep the projects more independent, and we can fix this later with more Gradle modelling. --- build/com.mbeddr/languages/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/com.mbeddr/languages/build.gradle b/build/com.mbeddr/languages/build.gradle index 930c98e62e..6a49fbc139 100755 --- a/build/com.mbeddr/languages/build.gradle +++ b/build/com.mbeddr/languages/build.gradle @@ -45,6 +45,7 @@ dependencies { } task resolve_mbeddr_platform() { + dependsOn(configurations.mbeddrPlatform) doLast { copy { from { @@ -65,9 +66,7 @@ ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.ju ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', classpath: configurations.junitAnt.asPath) -def mbeddrPlatformDependency - -task build_mbeddr(type: BuildLanguages, dependsOn: [':com.mbeddr:platform:copy_allScripts', configurations.mbeddrPlatform]) { +task build_mbeddr(type: BuildLanguages, dependsOn: [':com.mbeddr:platform:copy_allScripts', 'resolve_mbeddr_platform']) { script script_build_mbeddr outputs.dir("$artifactsDir/mbeddr") }