Merge branch 'master' of https://github.com/NativeScript/android-runtime into vmutafov/kotlin-extension-functions

Author: vmutafov

build.gradle

@@ -298,6 +298,10 @@ task copyFilesToProjectTemeplate {
             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"

test-app/app/build.gradle

@@ -33,6 +33,7 @@ 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")
 
@@ -82,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 {
@@ -308,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;
                   }
@@ -800,7 +809,14 @@ task buildMetadata(type: BuildToolTask) {
 
         setOutputs outLogger
 
-        args "android-metadata-generator.jar"
+        def paramz = new ArrayList<String>()
+        paramz.add("android-metadata-generator.jar")
+
+        if(enableAnalytics){
+            paramz.add("analyticsFilePath=$analyticsFilePath")
+        }
+
+        args paramz.toArray()
     }
 }
 

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

test-app/app/src/main/assets/app/mainpage.js

@@ -54,6 +54,7 @@ require("./tests/testInterfaceImplementation");
 require("./tests/testRuntimeImplementedAPIs");
 require("./tests/testsInstanceOfOperator");
 require("./tests/testReleaseNativeCounterpart");
+require("./tests/testJSONObjects");
 require("./tests/kotlin/companions/testCompanionObjectsSupport");
 require("./tests/kotlin/properties/testPropertiesSupport");
 require("./tests/kotlin/delegation/testDelegationSupport");