From b74218bfd5d0e57087dcc0473366f76d34ff6433 Mon Sep 17 00:00:00 2001 From: "Kristian D. Dimitrov" Date: Tue, 1 Aug 2017 17:08:11 +0300 Subject: [PATCH 1/2] Add warning for difference of application identifier. --- .../project-template-gradle/build.gradle | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build-artifacts/project-template-gradle/build.gradle b/build-artifacts/project-template-gradle/build.gradle index 776731df2..bea1141fd 100644 --- a/build-artifacts/project-template-gradle/build.gradle +++ b/build-artifacts/project-template-gradle/build.gradle @@ -721,6 +721,26 @@ copyTypings.onlyIf({ generateTypescriptDefinitions.didWork; }) +task validateAppIdMatch { + doLast { + def packageJsonFile = new File("$projectDir/../../package.json"); + def lineSeparator = System.getProperty("line.separator"); + + if (packageJsonFile.exists()) { + String content = packageJsonFile.getText("UTF-8") + def jsonSlurper = new JsonSlurper() + def packageJsonMap = jsonSlurper.parseText(content) + + if (packageJsonMap.nativescript.id != android.defaultConfig.applicationId) { + def errorMessage = "${lineSeparator}WARNING: The Application identifier is different from the one inside 'package.json' file.$lineSeparator" + + "NativeScript CLI might not work properly.$lineSeparator" + + "Update the application identifier in package.json and app.gradle so that they match."; + logger.error(errorMessage); + } + } + } +} + //////////////////////////////////////////////////////////////////////////////////// ////////////////////////////// OPTIONAL TASKS ////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////// @@ -801,6 +821,7 @@ task deleteGeneratedBindings(type: Delete) { delete "$projectDir/src/main/java/com/tns/gen" } +buildapk.finalizedBy("validateAppIdMatch"); deleteMetadata.dependsOn(":asbg:clean") deleteFlavors.dependsOn(deleteMetadata) deleteConfigurations.dependsOn(deleteFlavors) From afc26fb4fcc353c01cb82c802663d4159e9c36a7 Mon Sep 17 00:00:00 2001 From: "Kristian D. Dimitrov" Date: Wed, 2 Aug 2017 14:49:49 +0300 Subject: [PATCH 2/2] Fix comments --- build-artifacts/project-template-gradle/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-artifacts/project-template-gradle/build.gradle b/build-artifacts/project-template-gradle/build.gradle index bea1141fd..c3270b158 100644 --- a/build-artifacts/project-template-gradle/build.gradle +++ b/build-artifacts/project-template-gradle/build.gradle @@ -726,7 +726,7 @@ task validateAppIdMatch { def packageJsonFile = new File("$projectDir/../../package.json"); def lineSeparator = System.getProperty("line.separator"); - if (packageJsonFile.exists()) { + if (packageJsonFile.exists() && !project.hasProperty("release")) { String content = packageJsonFile.getText("UTF-8") def jsonSlurper = new JsonSlurper() def packageJsonMap = jsonSlurper.parseText(content)