Skip to content

Commit 7bf035b

Browse files
author
Mihail Slavchev
committed
fix gradle build script
1 parent 0548624 commit 7bf035b

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

build/project-template-gradle/build.gradle

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ android {
135135

136136
def mergeAssetsTask = variant.dex
137137
if(project.hasProperty("runSBGenerator")) {
138-
runBindingGenerator.dependsOn(copyMetadata)
138+
runBindingGenerator.dependsOn(buildMetadata)
139139
rbg.dependsOn(runBindingGenerator)
140140
mergeAssetsTask.dependsOn(rbg)
141141
}
142142
else {
143-
mergeAssetsTask.dependsOn(copyMetadata)
143+
mergeAssetsTask.dependsOn(buildMetadata)
144144
}
145145
}
146146
}
@@ -373,16 +373,13 @@ task buildMetadata (type: JavaExec) {
373373

374374
args metadataParams.toArray()
375375
}
376-
}
377-
378-
task copyMetadata(type: Copy) {
379-
description "moves metadata to the right place before packaging is done"
380-
outputs.upToDateWhen {
381-
!buildMetadata.didWork
376+
377+
doLast {
378+
copy {
379+
from "metadata/output"
380+
into "build/intermediates/assets/${firstApplicationBuildType}/metadata"
381+
}
382382
}
383-
384-
from "metadata/output"
385-
into "build/intermediates/assets/$firstApplicationBuildType/metadata"
386383
}
387384

388385

@@ -423,7 +420,6 @@ task rbg (dependsOn: "asbg:generatebindings")
423420
ensureMetadataOutDir.dependsOn(cleanLocalAarFiles)
424421
collectAllJars.dependsOn(ensureMetadataOutDir)
425422
buildMetadata.dependsOn(collectAllJars)
426-
copyMetadata.dependsOn(buildMetadata)
427423

428424
//DO NOT UNCOMMENT
429425
// mergeAssets.dependsOn(copyMetadata) -> look in CONFIGURATIONS(top) in android.applicationVariants to see how it's done

0 commit comments

Comments
 (0)