Merge pull request #2569 from mbeddr/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
mbeddr · Oct 24, 2024 · d499787 · d499787
2 parents c718578 + 52bdac2
commit d499787
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/subprojects/com.mbeddr/languages/build.gradle b/subprojects/com.mbeddr/languages/build.gradle
@@ -46,6 +46,7 @@ dependencies {
 }
 
 task resolve_mbeddr_platform() {
+    dependsOn(configurations.mbeddrPlatform)
     doLast {
         copy {
             from {
@@ -66,9 +67,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")
 }