Merge pull request #1467 from NativeScript/master

Release

Author: Vasil Hristov

.gitignore

@@ -20,4 +20,4 @@ bin/
 .settings
 
 .classpath
-android-runtime.iml
+android-runtime.iml

.travis.yml

@@ -1,14 +1,14 @@
 env:
   global:
   - NODE_VERSION=10
-  - NDK_VERSION=r19c
+  - NDK_VERSION=r20
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
   - EMULATOR_API_LEVEL=21
   - ANDROID_ABI=armeabi-v7a
   - EMULATOR_NAME=runtime-emu
-  - BUILD_TOOLS=28.0.3
-  - ANDROID_API=28
+  - BUILD_TOOLS=29.0.2
+  - ANDROID_API=29
 
 matrix:
   include:

CHANGELOG.md

@@ -1,9 +1,27 @@
+6.1.0
+==
+
+## What's New
+ - [Runtime Binding Generator depends on deprecated APIs #1441)](https://github.com/NativeScript/android-runtime/issues/1441)
+ - [The runtime depends on accessing a hidden value field (#1458)](https://github.com/NativeScript/android-runtime/issues/1458)
+ - [Upgrade v8 to 7.6.303.28 (#1439)](https://github.com/NativeScript/android-runtime/issues/1439)
+ - [Unify JS stack trace when exception is thrown #1443](https://github.com/NativeScript/android-runtime/issues/1443)
+ - [Update androidSdk, targetSdk and build tools to 29 (#1452)](https://github.com/NativeScript/android-runtime/issues/1452)
+ - [Upgrade android gradle plugin to the latest 3.5.0 version (#1456)](https://github.com/NativeScript/android-runtime/issues/1456)
+ - [Add initial Kotlin support (#1459)](https://github.com/NativeScript/android-runtime/issues/1459)
+ - [Add support for user defined gradle.properties (#1463)](https://github.com/NativeScript/android-runtime/issues/1463)
+
+
+## Bug Fixes
+
+ - [SIGSEGV in libNativeScript.so on callback from java with console.log when displaying an object. #1366](https://github.com/NativeScript/android-runtime/issues/1366)
+
 6.0.2
 ==
 
 ## What's New
 
-- [Include x86_64 architecture](https://github.com/NativeScript/android-runtime/issues/1419)
+ - [Include x86_64 architecture](https://github.com/NativeScript/android-runtime/issues/1419)
 
 6.0.1
 ==
@@ -16,7 +34,6 @@
 - [Upgrade android gradle plugin to the latest 3.4.2 version (#1425)](https://github.com/NativeScript/android-runtime/issues/1425)
 
 
-
 6.0.0
 ==
 

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

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

build.gradle

@@ -286,6 +286,14 @@ task copyFilesToProjectTemeplate {
             from "$TEST_APP_PATH/build.gradle"
             into "$DIST_FRAMEWORK_PATH"
         }
+        copy {
+            from "$TEST_APP_PATH/paths.gradle"
+            into "$DIST_FRAMEWORK_PATH"
+        }
+        copy {
+            from "$TEST_APP_PATH/user_properties_reader.gradle"
+            into "$DIST_FRAMEWORK_PATH"
+        }
         copy {
             from "$TEST_APP_PATH/gradle"
             into "$DIST_FRAMEWORK_PATH/gradle"

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"
@@ -10,8 +10,8 @@
     "**/*"
   ],
   "gradle": {
-    "version": "5.1.1",
-    "android": "3.4.2"
+    "version": "5.4.1",
+    "android": "3.5.0"
   },
-  "android_ndk_version": "19c"
+  "android_ndk_version": "20"
 }

test-app/app/build.gradle

@@ -18,15 +18,25 @@
 *            -PandroidXMaterial=[androidx_material_version]
 */
 
+
+import groovy.io.FileType
 import groovy.json.JsonSlurper
+
+import javax.inject.Inject
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
-import groovy.io.FileType
 import java.security.MessageDigest
-import javax.inject.Inject
+
 apply plugin: "com.android.application"
 
+def enableKotlin = (project.hasProperty("useKotlin") && project.useKotlin == "true")
+
+if (enableKotlin) {
+    apply plugin: 'kotlin-android'
+    apply plugin: 'kotlin-android-extensions'
+}
+
 def onlyX86 = project.hasProperty("onlyX86")
 if (onlyX86) {
     println "OnlyX86 build triggered."
@@ -61,10 +71,11 @@ def METADATA_OUT_PATH = "$projectDir/src/main/assets/metadata"
 def pluginsJarLibraries = new LinkedList<String>()
 def allJarLibraries = new LinkedList<String>()
 
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 28 }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 28 }
+def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.3.41" }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 29 }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 29 }
 def computeBuildToolsVersion = { ->
-    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "28.0.3"
+    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "29.0.2"
 }
 
 project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug"
@@ -217,6 +228,13 @@ def setAppIdentifier = { ->
 }
 
 android {
+
+    if (enableKotlin) {
+        kotlinOptions {
+            jvmTarget = '1.8'
+        }
+    }
+
     compileSdkVersion computeCompileSdkVersion()
     buildToolsVersion computeBuildToolsVersion()
 
@@ -302,6 +320,7 @@ repositories {
             dirs pluginDependencies
         }
     }
+    mavenCentral()
 }
 
 dependencies {
@@ -320,9 +339,9 @@ dependencies {
         androidXMaterialVersion = androidXMaterial
     }
 
-    println "\t + using andorid X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
+    println "\t + using android X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
 
-    implementation "androidx.multidex:multidex:2.0.0"
+    implementation "androidx.multidex:multidex:2.0.1"
     implementation "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
     implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
     implementation "com.google.android.material:material:$androidXMaterialVersion"
@@ -361,6 +380,11 @@ dependencies {
         implementation project(':runtime')
     }
 
+    def kotlinVersion = computeKotlinVersion()
+    if (enableKotlin) {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    }
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -545,7 +569,7 @@ afterEvaluate { project ->
                 // if there's a project dependency search for its result jar file in the build/intermediates/runtime_library_classes folder
                 // this is the output folder in gradle 5.1.1, but it can be changed in the future versions of gradle
                 def jarDir = new File("${it.getBuildDir()}/intermediates/runtime_library_classes/${buildType.toLowerCase()}")
-                if(jarDir.exists()) {
+                if (jarDir.exists()) {
                     jarDir.eachFileRecurse(FileType.FILES) { file ->
                         if (file.path.endsWith(".jar")) {
                             processJar(file, jars)
@@ -574,7 +598,7 @@ def processJar(File jar, jars) {
         // directory is a randomly generated string)
         cleanupAllJars.inputs.files jar
 
-        task "${taskName}" (type: WorkerTask) {
+        task "${taskName}"(type: WorkerTask) {
             dependsOn cleanupAllJars
             extractAllJars.dependsOn it
 
@@ -683,6 +707,11 @@ task buildMetadata(type: JavaExec) {
     def classesDir = "$buildDir/intermediates/javac"
     inputs.dir(classesDir)
 
+    def kotlinClassesDir = "$buildDir/tmp/kotlin-classes"
+    if (file(kotlinClassesDir).exists()) {
+        inputs.dir(kotlinClassesDir)
+    }
+
     outputs.files("$METADATA_OUT_PATH/treeNodeStream.dat", "$METADATA_OUT_PATH/treeStringsStream.dat", "$METADATA_OUT_PATH/treeValueStream.dat")
 
     doFirst {
@@ -700,6 +729,15 @@ task buildMetadata(type: JavaExec) {
             }
         }
 
+        if (file(kotlinClassesDir).exists()) {
+            def kotlinClassesSubDirs = new File(kotlinClassesDir).listFiles()
+            for (File subDir : kotlinClassesSubDirs) {
+                if (subDir.getName() == selectedBuildType) {
+                    generatedClasses.add(subDir.getAbsolutePath())
+                }
+            }
+        }
+
         new File("$BUILD_TOOLS_PATH/$MDG_OUTPUT_DIR").withWriter { out ->
             out.println "$METADATA_OUT_PATH"
         }

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

@@ -53,4 +53,9 @@ require("./tests/dex-interface-implementation");
 require("./tests/testInterfaceImplementation");
 require("./tests/testRuntimeImplementedAPIs");
 require("./tests/testsInstanceOfOperator");
-require("./tests/testReleaseNativeCounterpart");
+require("./tests/testReleaseNativeCounterpart");
+require("./tests/kotlin/companions/testCompanionObjectsSupport");
+require("./tests/kotlin/properties/testPropertiesSupport");
+require("./tests/kotlin/delegation/testDelegationSupport");
+require("./tests/kotlin/objects/testObjectsSupport");
+require("./tests/kotlin/functions/testTopLevelFunctionsSupport");