Skip to content

make assemble gradle task depend on buildMetadata task #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2017
Merged

make assemble gradle task depend on buildMetadata task #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions build-artifacts/project-template-gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,27 @@ android {
}

compileSourcesTask.finalizedBy(buildMetadata)

// forces packaging of resources and assets AFTER producing metadata
// Reference: https://github.com/NativeScript/android-runtime/issues/785

// Ensure metadata has been built and copied in assets before packaging
variant.outputs.each { output ->
def abiName = "";
if (output.getFilter(com.android.build.OutputFile.ABI)) {
abiName = output.getFilter(com.android.build.OutputFile.ABI)
def packageTask = project.tasks.findByName("package${output.name}")
if (packageTask) {
packageTask.dependsOn(buildMetadata)
}
}
}

// Compile the Java sources AFTER the Java code-generation step is done
def compileTask = project.tasks.findByName("compile${variantName}JavaWithJavac")
if (compileTask) {
compileTask.dependsOn("asbg:generateBindings")
}
}
}

Expand Down Expand Up @@ -413,13 +434,11 @@ task createDefaultIncludeFiles {
if (hasChildrenDirs) {
file.listFiles().each { subFile ->
if (subFile.isDirectory()) {
flavorNumber++
createIncludeGradleForPlugin(subFile, flavorNumber, flavorNames)
createIncludeGradleForPlugin(subFile, flavorNumber++, flavorNames)
}
}
} else {
flavorNumber++
createIncludeGradleForPlugin(file, flavorNumber, flavorNames)
createIncludeGradleForPlugin(file, flavorNumber++, flavorNames)
}
}
}
Expand Down Expand Up @@ -730,6 +749,7 @@ setProperties.finalizedBy("asbg:generateBindings", generateTypescriptDefinitions
// 5. plugin extend (apply from include files)

// --execution phase

ensureMetadataOutDir.dependsOn(cleanLocalAarFiles)
collectAllJars.dependsOn(ensureMetadataOutDir)
buildMetadata.dependsOn(collectAllJars)
Expand Down