Skip to content

upgraded gradle template #309

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
Plamen5kov merged 1 commit into from
Jan 5, 2016
Merged

upgraded gradle template #309

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
54 changes: 34 additions & 20 deletions build/project-template-gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def nodeModulesDir = "../../node_modules/"
def libDir = "../../lib/Android/"
def pluginNames = new ArrayList<String>()
def configDir = file(configurationsDir)
def appResExists = false
def appResourcesName = "NativescriptAppResources"
def nsarFolder = "nsar"
def nsarPath = "src/" + nsarFolder

def compiteCompileSdkVersion () {
if(project.hasProperty("compileSdk")) {
Expand Down Expand Up @@ -140,6 +140,14 @@ android {
mergeAssetsTask.dependsOn(copyMetadata)
}
}

// done because of android manifest we want to merge
// flavorDimensions "NSAR"
productFlavors {
"$nsarFolder" {
dimension "$nsarFolder"
}
}
}

repositories {
Expand Down Expand Up @@ -222,11 +230,6 @@ task createDefaultIncludeFiles {
def dimensionName = sanatizeDimensionName(fileName)
createPluginConfigFile = true
def foundIncludeFile = false
def isAppResDir = false
if(fileName == appResourcesName) {
appResExists = true
isAppResDir = true
}

println "\t+found plugins: " + fileName
fl.listFiles().each { subFile ->
Expand All @@ -237,9 +240,7 @@ task createDefaultIncludeFiles {
}
}

if(!isAppResDir) {
pluginNames.add('"' + dimensionName + '"')
}
pluginNames.add('"' + dimensionName + '"')

if(!foundIncludeFile) {
createIncludeFile(fl.getAbsolutePath() ,fileName, dimensionName)
Expand All @@ -260,23 +261,23 @@ task createPluginsConfigFile {
if(createPluginConfigFile) {
println "\t+creating product flavors include.gradle file in $configurationsDir folder..."
def flavors = pluginNames.join(",")
if(appResExists) {
if (flavors == '') {
flavors = '"' + appResourcesName + '"'
} else {
flavors = '"' + appResourcesName + '", ' + flavors
}
}

flavorsFile << "android { \n"
flavorsFile << "\tflavorDimensions " + flavors + "\n"
flavorsFile << "\tflavorDimensions \"" + nsarFolder + "\", " + flavors + "\n"
flavorsFile << "}\n"
}
}
}

task pluginExtend {
description "applies additional configuration"


def pathToAppGradle = "../../app/App_Resources/Android/app.gradle"
def appGradle = file(pathToAppGradle)
if(appGradle.exists()) {
apply from: pathToAppGradle
}

if(configDir.exists()) {
println "$configStage pluginExtend"
configDir.eachFileRecurse(groovy.io.FileType.FILES) {
Expand All @@ -294,11 +295,21 @@ task pluginExtend {
// createPluginsConfigFile.dependsOn(createDefaultIncludeFiles)
// pluginExtend.dependsOn(createPluginsConfigFile)


////////////////////////////////////////////////////////////////////////////////////
///////////////////////////// BEFORE EXECUTION /////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////


task cleanNsar (type: Delete) {
delete nsarPath
}

task makeNsarDir (type: Copy) {
println "$configStage create nativescript app resources dir"
from "../../app/App_Resources/Android/AndroidManifest.xml"
into nsarPath
}

// we need to copy all dependencies into a flat dir, as pointed by the repositories configurations at the top
task copyAarDependencies (type: Copy) {
println "$configStage copyAarDependencies"
Expand Down Expand Up @@ -369,6 +380,7 @@ task isMetadataGenerationNecessary {
description "checks if new metadata is necessary based on jar and aar dependencies used"
def inputFile = new File("build/metadataUTD")
def metadataDir = new File("metadata/output");

inputs.file inputFile
outputs.upToDateWhen {
inputFile.exists() &&
Expand Down Expand Up @@ -457,6 +469,8 @@ task buildapk {
// and this is the only way so far
tasks.copyAarDependencies.execute()
tasks.addAarDependencies.execute()
tasks.cleanNsar.execute();
tasks.makeNsarDir.execute();

//done to build only necessary apk
if(project.hasProperty("release")) {
Expand Down