@nativescript/android 8.8.0-alpha.1 → 8.8.0-alpha.3

package/framework/app/build.gradle

@@ -65,6 +65,7 @@ def SBG_BINDINGS_NAME = "sbg-bindings.txt"
 def SBG_INTERFACE_NAMES = "sbg-interface-names.txt"
 def INPUT_JS_DIR = "$projectDir/src/main/assets/app"
 def OUTPUT_JAVA_DIR = "$projectDir/src/main/java"
+def APP_DIR = "$projectDir/src/main/assets/app"
 
 //metadata generator
 def MDG_OUTPUT_DIR = "mdg-output-dir.txt"
@@ -179,7 +180,31 @@ def setAppIdentifier = { ->
     }
 }
 
+def computeNamespace = { ->
+    def appPackageJsonFile = file("${APP_DIR}/$PACKAGE_JSON")
+
+    if (appPackageJsonFile.exists()) {
+        def content = appPackageJsonFile.getText("UTF-8")
+
+        def jsonSlurper = new JsonSlurper()
+        def packageJsonMap = jsonSlurper.parseText(content)
+
+        def appIdentifier = ""
+
+        if (packageJsonMap && packageJsonMap.id) {
+            appIdentifier = packageJsonMap.id
+        }
+
+
+        if (appIdentifier) {
+            return appIdentifier
+        }
+    }
+    return "com.tns.testapplication"
+}
+
 android {
+    namespace computeNamespace()
 
     applyBeforePluginGradleConfiguration()
 
@@ -235,7 +260,6 @@ android {
         }
     }
 
-    namespace "com.tns.testapplication"
     setAppIdentifier()
     applyPluginGradleConfigurations()
     applyAppGradleConfiguration()
@@ -1005,19 +1029,15 @@ tasks.configureEach({ DefaultTask currentTask ->
     }
 
     if (currentTask =~ /generate.+LintVitalReportModel/) {
-        buildMetadata.finalizedBy(currentTask)
+        currentTask.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /lintVitalAnalyze.+/) {
-        buildMetadata.finalizedBy(currentTask)
-    }
-
-    if (currentTask =~ /extract.+NativeSymbolTables/) {
-        buildMetadata.finalizedBy(currentTask)
+        currentTask.mustRunAfter(buildMetadata)
     }
 
     if (currentTask =~ /merge.+GlobalSynthetics/) {
-        buildMetadata.finalizedBy(currentTask)
+        currentTask.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /optimize.+Resources/) {
@@ -1037,23 +1057,19 @@ tasks.configureEach({ DefaultTask currentTask ->
     }
 
     if (currentTask =~ /generate.*LintReportModel/) {
-        buildMetadata.finalizedBy(currentTask)
-    }
-
-    if (currentTask.name.contains(":runtime:configureCMakeRelWithDebInfo")) {
         currentTask.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /generate.*AndroidTestResValues/) {
-        buildMetadata.finalizedBy(currentTask)
+        buildMetadata.dependsOn(currentTask)
     }
 
     if (currentTask =~ /generate.*AndroidTestLintModel/) {
-        buildMetadata.finalizedBy(currentTask)
+        currentTask.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /generate.*UnitTestLintModel/) {
-        currentTask.finalizedBy(buildMetadata)
+        buildMetadata.mustRunAfter(currentTask)
     }
 
     if (currentTask =~ /generate.*UnitTestLintModel/) {
@@ -1077,12 +1093,12 @@ tasks.configureEach({ DefaultTask currentTask ->
         currentTask.finalizedBy(buildMetadata)
     }
 
-    if (currentTask.name == ":runtime:lintAnalyzeDebugAndroidTest" || currentTask.name == ":runtime:lintAnalyzeReleaseAndroidTest") {
+    if (currentTask =~ /lintAnalyze.*/) {
         currentTask.finalizedBy(buildMetadata)
     }
 
-    if (currentTask.name == "lintAnalyzeDebug" || currentTask.name == "lintAnalyzeRelease") {
-        buildMetadata.finalizedBy(currentTask)
+    if (currentTask =~ /lintAnalyze.*AndroidTest/) {
+        currentTask.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /bundle.*Resources/) {
@@ -1090,7 +1106,7 @@ tasks.configureEach({ DefaultTask currentTask ->
     }
 
     if (currentTask =~ /compile.*ArtProfile/) {
-        currentTask.finalizedBy(buildMetadata)
+        currentTask.mustRunAfter(buildMetadata)
     }
 
 })

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nativescript/android",
     "description": "NativeScript for Android using v8",
-    "version": "8.8.0-alpha.1",
+    "version": "8.8.0-alpha.3",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android.git"