Merge pull request #1518 from NativeScript/master

Merge master into release

Author: vtrifonov

.gitignore

@@ -20,4 +20,5 @@ bin/
 .settings
 
 .classpath
-android-runtime.iml
+android-runtime.iml
+test-app/build-tools/*.log

CHANGELOG.md

@@ -1,3 +1,23 @@
+6.2.0
+==
+
+## What's New
+ - [Add Kotlin extension functions support (#1515)](https://github.com/NativeScript/android-runtime/issues/1515)
+ - [update dts generator to the latest version (#1506)](https://github.com/NativeScript/android-runtime/pull/1506)
+ - [Unify exceptions information in try/catch and __onUncaughtError (#1445)](https://github.com/NativeScript/android-runtime/issues/1445)
+ - [Interop between JS Objects and JSONObjects (#1500)](https://github.com/NativeScript/android-runtime/issues/1500)
+ - [Collect build analytics (#1501)](https://github.com/NativeScript/android-runtime/issues/1501)
+ - [expose the NDK revision used to build the V8 and the Runtime (#1498)](https://github.com/NativeScript/android-runtime/pull/1498)
+ - [Upgrade android gradle plugin to the latest 3.5.1 version (#1502)](https://github.com/NativeScript/android-runtime/issues/1502)
+ - [support snapshot libs out of the box (#1496)](https://github.com/NativeScript/android-runtime/pull/1496)
+ - [Upgrade v8 to 7.7.299.11 (#1478)](https://github.com/NativeScript/android-runtime/issues/1478)
+ 
+## Bug Fixes
+ - [Console.log in worker makes chrome debugging crash (#1511)](https://github.com/NativeScript/android-runtime/issues/1511)
+ - [fix searching for merge assets folder on windows (#1503)](https://github.com/NativeScript/android-runtime/pull/1503)
+ - [Background job with WorkManager (#1488)](https://github.com/NativeScript/android-runtime/issues/1488)
+ - [Deprecated API used in the ErrorActivity is crashing the app (when latest support library is used) (#1494)](https://github.com/NativeScript/android-runtime/issues/1494)
+
 6.1.2
 ==
 
@@ -12,6 +32,7 @@
 
 - [When using kotlin sometimes the metadata is not existing in the result apk (#1476)](https://github.com/NativeScript/android-runtime/issues/1476)
 
+
 6.1.0
 ==
 

build-artifacts/project-template-gradle/settings.json

@@ -1,4 +1,5 @@
 {
-    "v8Version": "7.6.303.28",
+    "v8Version": "7.7.299.11",
+    "ndkRevision": "20.0.5594570",
     "mksnapshotParams": "--profile_deserialization --turbo_instruction_scheduling --target_os=android --no-native-code-counters"
-}
+}

build.gradle

@@ -287,12 +287,24 @@ task copyFilesToProjectTemeplate {
             into "$DIST_FRAMEWORK_PATH"
         }
         copy {
-            from "$TEST_APP_PATH/paths.gradle"
-            into "$DIST_FRAMEWORK_PATH"
+            from "$TEST_APP_PATH/gradle-helpers/paths.gradle"
+            into "$DIST_FRAMEWORK_PATH/gradle-helpers"
         }
         copy {
-            from "$TEST_APP_PATH/user_properties_reader.gradle"
-            into "$DIST_FRAMEWORK_PATH"
+            from "$TEST_APP_PATH/gradle-helpers/user_properties_reader.gradle"
+            into "$DIST_FRAMEWORK_PATH/gradle-helpers"
+        }
+        copy {
+            from "$TEST_APP_PATH/app/gradle-helpers/CustomExecutionLogger.gradle"
+            into "$DIST_FRAMEWORK_PATH/app/gradle-helpers"
+        }
+        copy {
+            from "$TEST_APP_PATH/app/gradle-helpers/AnalyticsCollector.gradle"
+            into "$DIST_FRAMEWORK_PATH/app/gradle-helpers"
+        }
+        copy {
+            from "$TEST_APP_PATH/app/gradle-helpers/BuildToolTask.gradle"
+            into "$DIST_FRAMEWORK_PATH/app/gradle-helpers"
         }
         copy {
             from "$TEST_APP_PATH/gradle"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "6.1.2",
+  "version": "6.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"
@@ -11,7 +11,7 @@
   ],
   "gradle": {
     "version": "5.4.1",
-    "android": "3.5.0"
+    "android": "3.5.1"
   },
   "android_ndk_version": "20"
 }

test-app/app/build.gradle

@@ -27,8 +27,13 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
 import java.security.MessageDigest
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import static org.gradle.internal.logging.text.StyledTextOutput.Style
 
 apply plugin: "com.android.application"
+apply from: "gradle-helpers/BuildToolTask.gradle"
+apply from: "gradle-helpers/CustomExecutionLogger.gradle"
+apply from: "gradle-helpers/AnalyticsCollector.gradle"
 
 def enableKotlin = (project.hasProperty("useKotlin") && project.useKotlin == "true")
 
@@ -39,7 +44,7 @@ if (enableKotlin) {
 
 def onlyX86 = project.hasProperty("onlyX86")
 if (onlyX86) {
-    println "OnlyX86 build triggered."
+    outLogger.withStyle(Style.Info).println "OnlyX86 build triggered."
 }
 
 //common
@@ -78,6 +83,14 @@ def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : "29.0.2"
 }
 
+def enableAnalytics = (project.hasProperty("gatherAnalyticsData") && project.gatherAnalyticsData == "true")
+def analyticsFilePath = "$rootDir/analytics/build-statistics.json"
+def analyticsCollector = project.ext.AnalyticsCollector.withOutputPath(analyticsFilePath)
+if (enableKotlin && enableAnalytics) {
+    analyticsCollector.markHasUseKotlinPropertyInApp()
+    analyticsCollector.writeAnalyticsFile()
+}
+
 project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug"
 
 buildscript {
@@ -100,6 +113,7 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
         project.ext.nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text)
         project.ext.PLATFORMS_ANDROID = "platforms/android"
         project.ext.USER_PROJECT_ROOT = "$rootDir/../.."
+        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
 
         project.ext.getAppPath = { ->
             def relativePathToApp = "app"
@@ -146,15 +160,15 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
         def pathToBuildScriptGradle = "$absolutePathToAppResources/Android/buildscript.gradle"
         def buildScriptGradle = file(pathToBuildScriptGradle)
         if (buildScriptGradle.exists()) {
-            println "\t + applying user-defined buildscript from ${buildScriptGradle}"
+            outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined buildscript from ${buildScriptGradle}"
             apply from: pathToBuildScriptGradle, to: buildscript
         }
 
         nativescriptDependencies.each { dep ->
             def pathToPluginBuildScriptGradle = "$rootDir/${dep.directory}/$PLATFORMS_ANDROID/buildscript.gradle"
             def pluginBuildScriptGradle = file(pathToPluginBuildScriptGradle)
             if (pluginBuildScriptGradle.exists()) {
-                println "\t + applying user-defined buildscript from dependency ${pluginBuildScriptGradle}"
+                outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined buildscript from dependency ${pluginBuildScriptGradle}"
                 apply from: pathToPluginBuildScriptGradle, to: buildscript
             }
         }
@@ -172,7 +186,7 @@ def applyBeforePluginGradleConfiguration = { ->
     def pathToBeforePluginGradle = "$appResourcesPath/Android/before-plugins.gradle"
     def beforePluginGradle = file(pathToBeforePluginGradle)
     if (beforePluginGradle.exists()) {
-        println "\t + applying user-defined configuration from ${beforePluginGradle}"
+        outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined configuration from ${beforePluginGradle}"
         apply from: pathToBeforePluginGradle
     }
 }
@@ -182,10 +196,10 @@ def applyAppGradleConfiguration = { ->
     def pathToAppGradle = "$appResourcesPath/Android/app.gradle"
     def appGradle = file(pathToAppGradle)
     if (appGradle.exists()) {
-        println "\t + applying user-defined configuration from ${appGradle}"
+        outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined configuration from ${appGradle}"
         apply from: pathToAppGradle
     } else {
-        println "\t + couldn't load user-defined configuration from ${appGradle}. File doesn't exist."
+        outLogger.withStyle(Style.Info).println "\t + couldn't load user-defined configuration from ${appGradle}. File doesn't exist."
     }
 }
 
@@ -211,7 +225,7 @@ def getAppIdentifier = { packageJsonMap ->
 }
 
 def setAppIdentifier = { ->
-    println "\t + setting applicationId"
+    outLogger.withStyle(Style.SuccessHeader).println "\t + setting applicationId"
     File packageJsonFile = new File("$USER_PROJECT_ROOT/$PACKAGE_JSON")
 
     if (packageJsonFile.exists()) {
@@ -261,7 +275,7 @@ android {
     }
 
     sourceSets.main {
-        jniLibs.srcDir "$projectDir/libs/jni"
+        jniLibs.srcDirs = ["$projectDir/libs/jni", "$projectDir/snapshot-build/build/ndk-build/libs"]
     }
 
     signingConfigs {
@@ -303,7 +317,7 @@ android {
                   task = variant.getMergeAssets()
               }
               for (File file : task.getOutputs().getFiles()) {
-                  if (!file.getPath().contains("/incremental/")) {
+                  if (!file.getPath().contains("${File.separator}incremental${File.separator}")) {
                       project.ext.mergedAssetsOutputPath = file.getPath()
                       break;
                   }
@@ -362,7 +376,7 @@ dependencies {
         androidXMaterialVersion = androidXMaterial
     }
 
-    println "\t + using android X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
+    outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
 
     implementation "androidx.multidex:multidex:2.0.1"
     implementation "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
@@ -397,7 +411,7 @@ dependencies {
             runtime = "nativescript-regular"
         }
 
-        println "\t + adding nativescript runtime package dependency: $runtime"
+        outLogger.withStyle(Style.SuccessHeader).println "\t + adding nativescript runtime package dependency: $runtime"
         project.dependencies.add("implementation", [name: runtime, ext: "aar"])
     } else {
         implementation project(':runtime')
@@ -420,14 +434,14 @@ task addDependenciesFromNativeScriptPlugins {
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
             def fileName = aarFile.name[0..<length]
-            println "\t + adding aar plugin dependency: " + aarFile.getAbsolutePath()
+            outLogger.withStyle(Style.SuccessHeader).println "\t + adding aar plugin dependency: " + aarFile.getAbsolutePath()
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }
 
         def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.jar"])
         jarFiles.each { jarFile ->
             def jarFileAbsolutePath = jarFile.getAbsolutePath()
-            println "\t + adding jar plugin dependency: $jarFileAbsolutePath"
+            outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"
             pluginsJarLibraries.add(jarFile.getAbsolutePath())
         }
 
@@ -443,14 +457,14 @@ task addDependenciesFromAppResourcesLibraries {
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
             def fileName = aarFile.name[0..<length]
-            println "\t + adding aar library dependency: " + aarFile.getAbsolutePath()
+            outLogger.withStyle(Style.SuccessHeader).println "\t + adding aar library dependency: " + aarFile.getAbsolutePath()
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }
 
         def jarFiles = fileTree(dir: appResourcesLibraries, include: ["**/*.jar"])
         jarFiles.each { jarFile ->
             def jarFileAbsolutePath = jarFile.getAbsolutePath()
-            println "\t + adding jar plugin dependency: $jarFileAbsolutePath"
+            outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"
             pluginsJarLibraries.add(jarFile.getAbsolutePath())
         }
 
@@ -486,7 +500,7 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
 ///////////////////////////// EXECUTUION PHASE /////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////
 
-task runSbg(type: JavaExec) {
+task runSbg(type: BuildToolTask) {
     dependsOn "collectAllJars"
     if (!findProject(':static-binding-generator').is(null)) {
         dependsOn ':static-binding-generator:jar'
@@ -506,6 +520,8 @@ task runSbg(type: JavaExec) {
         paramz.add("-show-deprecation-warnings")
     }
 
+    setOutputs outLogger
+
     args paramz
 
     doFirst {
@@ -564,7 +580,7 @@ class EmptyRunnable implements Runnable {
 
 def getMergedAssetsOutputPath() {
     if (!project.hasProperty("mergedAssetsOutputPath")) {
-        // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.5.0
+        // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.5.1
         project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/merged_assets/" + project.selectedBuildType + "/out"
     }
     return project.ext.mergedAssetsOutputPath
@@ -599,7 +615,7 @@ afterEvaluate { project ->
                         }
                     }
                 } else {
-                    println "WARNING: Folder ${jarDir.path} does not exists, the dependent project's classes won't be included in the metadata"
+                    outLogger.withStyle(Style.Info).println "WARNING: Folder ${jarDir.path} does not exists, the dependent project's classes won't be included in the metadata"
                 }
             }
         }
@@ -727,7 +743,7 @@ task copyMetadata {
     }
 }
 
-task buildMetadata(type: JavaExec) {
+task buildMetadata(type: BuildToolTask) {
     if (!findProject(':android-metadata-generator').is(null)) {
         dependsOn ':android-metadata-generator:jar'
     }
@@ -791,11 +807,20 @@ task buildMetadata(type: JavaExec) {
         workingDir "$BUILD_TOOLS_PATH"
         main "-jar"
 
-        args "android-metadata-generator.jar"
+        setOutputs outLogger
+
+        def paramz = new ArrayList<String>()
+        paramz.add("android-metadata-generator.jar")
+
+        if(enableAnalytics){
+            paramz.add("analyticsFilePath=$analyticsFilePath")
+        }
+
+        args paramz.toArray()
     }
 }
 
-task generateTypescriptDefinitions(type: JavaExec) {
+task generateTypescriptDefinitions(type: BuildToolTask) {
     if (!findProject(':dts-generator').is(null)) {
         dependsOn ':dts-generator:jar'
     }
@@ -826,7 +851,10 @@ task generateTypescriptDefinitions(type: JavaExec) {
         new File("$TYPINGS_PATH").mkdirs()
 
         logger.info("Task generateTypescriptDefinitions: Call dts-generator.jar with arguments: " + paramz.toString().replaceAll(',', ''))
-        println "Task generateTypescriptDefinitions: Call dts-generator.jar with arguments: " + paramz.toString().replaceAll(',', '')
+        outLogger.withStyle(Style.SuccessHeader).println "Task generateTypescriptDefinitions: Call dts-generator.jar with arguments: " + paramz.toString().replaceAll(',', '')
+
+        setOutputs outLogger
+
         args paramz.toArray()
     }
 }
@@ -849,7 +877,7 @@ static def shouldIncludeDirForTypings(path, includeDirs) {
 
 task copyTypings {
     doLast {
-        println "Copied generated typings to application root level. Make sure to import android.d.ts in reference.d.ts"
+        outLogger.withStyle(Style.Info).println "Copied generated typings to application root level. Make sure to import android.d.ts in reference.d.ts"
 
         copy {
             from "$TYPINGS_PATH"

test-app/app/gradle-helpers/AnalyticsCollector.gradle

@@ -0,0 +1,48 @@
+import groovy.json.JsonBuilder
+
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.nio.file.Path
+
+class AnalyticsCollector{
+
+    private final String analyticsFilePath
+    private boolean hasUseKotlinPropertyInApp = false
+    private boolean hasKotlinRuntimeClasses = false
+
+    private AnalyticsCollector(String analyticsFilePath){
+        this.analyticsFilePath = analyticsFilePath
+    }
+
+    static AnalyticsCollector withOutputPath(String analyticsFilePath){
+        return new AnalyticsCollector(analyticsFilePath)
+    }
+
+    void markHasUseKotlinPropertyInApp() {
+        hasUseKotlinPropertyInApp = true
+    }
+
+    void writeAnalyticsFile() {
+        def jsonBuilder = new JsonBuilder()
+        def kotlinUsageData = new Object()
+        kotlinUsageData.metaClass.hasUseKotlinPropertyInApp = hasUseKotlinPropertyInApp
+        kotlinUsageData.metaClass.hasKotlinRuntimeClasses = hasKotlinRuntimeClasses
+        jsonBuilder(kotlinUsage: kotlinUsageData)
+        def prettyJson = jsonBuilder.toPrettyString()
+
+
+
+        Path statisticsFilePath = Paths.get(analyticsFilePath)
+
+        if (Files.notExists(statisticsFilePath)) {
+            Files.createDirectories(statisticsFilePath.getParent())
+            Files.createFile(statisticsFilePath)
+        }
+
+        Files.write(statisticsFilePath, prettyJson.getBytes(StandardCharsets.UTF_8))
+
+    }
+}
+
+ext.AnalyticsCollector = AnalyticsCollector