Merge pull request #1267 from NativeScript/master

Prepare 5.2.0 release

Author: vtrifonov

.travis.yml

@@ -1,7 +1,7 @@
 env:
   global:
   - NODE_VERSION=6.11.1
-  - NDK_VERSION=r17b
+  - NDK_VERSION=r18b
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
   - EMULATOR_API_LEVEL=21

CHANGELOG.md

@@ -1,8 +1,29 @@
+5.2.0
+==
+
+## What's New
+ - [Upgrade v8 to 7.1.302.32(#1237)](https://github.com/NativeScript/android-runtime/issues/1237)
+ - [Add OnDiscardedError handler(#1245)](https://github.com/NativeScript/android-runtime/issues/1245)
+ - [Upgrade the android gradle plugin to the latest 3.3.0 version(#1251)](https://github.com/NativeScript/android-runtime/issues/1251)
+  - [Add android X support(#1226)](https://github.com/NativeScript/android-runtime/issues/1226)
+ - [Provide a JS helper function on the global object to release the native object wrapped by a JS instance(#1254)](https://github.com/NativeScript/android-runtime/issues/1254)
+
+## Bug Fixes
+
+ - [ClassNotFound exception when calling nested static class with correct argument(#1195)](https://github.com/NativeScript/android-runtime/issues/1195)
+ - [If you refresh or close the chrome dev tools window an error will be log in the console (#1202)](https://github.com/NativeScript/android-runtime/issues/1202)
+ - [Debug on Android fails when stopped on breakpoint and change in .xml/.css/.html is applied(#1243)](https://github.com/NativeScript/android-runtime/issues/1243)
+ - [Breakpoint stop to hit when you have two open tabs and close one(#1247)](https://github.com/NativeScript/android-runtime/issues/1247)
+ - [ClassNotFound exception when calling nested static class with correct argument(#1195)](https://github.com/NativeScript/android-runtime/issues/1195)
+ - [Upgrade V8 to v7 to fix unstable sort() method(#1176)](https://github.com/NativeScript/android-runtime/issues/1176)
+ - [CodeCache option is broken since Android Runtime 4.1.0(#1235)](https://github.com/NativeScript/android-runtime/issues/1235)
+ - [Snapshots with ABI splits do not work since Android Runtime 4.1.0(#1234)](https://github.com/NativeScript/android-runtime/issues/1234)
+
 5.1.0
 ==
 
 ## What's New
- - [Add a setting to wrap calls to CallJSMethod in try catch(#1223)](https://github.com/NativeScript/android-runtime/issues/12238)
+ - [Add a setting to wrap calls to CallJSMethod in try catch(#1223)](https://github.com/NativeScript/android-runtime/issues/1223)
  - [Support for abstract interface with static methods(#1157)](https://github.com/NativeScript/android-runtime/issues/1157)
  - [Use gradle plugin 3.2.1 instead of 3.2.0(#1209)](https://github.com/NativeScript/android-runtime/pull/1209)
  - [Add a concrete exception when the runtime cannot be found(#1201)](https://github.com/NativeScript/android-runtime/pull/1201)

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2018 Progress Software Corporation
+   Copyright (c) 2015-2019 Progress Software Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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

@@ -1,3 +1,3 @@
 {
-    "v8Version": "6.9.427.23"
+    "v8Version": "7.1.302.32"
 }

build.gradle

@@ -20,7 +20,7 @@ def useCCache = !project.hasProperty("noCCache")
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def pVersion = "no package version was provided by build.gradle build"
 def arVersion = "no commit sha was provided by build.gradle build"
-def generateRegularRuntimePackage = !project.hasProperty("skipUnoptimized");
+def generateRegularRuntimePackage = !project.hasProperty("skipUnoptimized")
 
 def DIST_PATH = "$rootDir/dist"
 def TEST_APP_PATH = "$rootDir/test-app"
@@ -29,19 +29,19 @@ def DIST_FRAMEWORK_PATH = "$DIST_PATH/framework"
 
 task checkEnvironmentVariables {
     if ("$System.env.JAVA_HOME" == "" || "$System.env.JAVA_HOME" == "null") {
-        throw new GradleException("Set JAVA_HOME to point to the correct Jdk location\n");
+        throw new GradleException("Set JAVA_HOME to point to the correct Jdk location\n")
     }
 
     if ("$System.env.ANDROID_HOME" == "" || "$System.env.ANDROID_HOME" == "null") {
-        throw new GradleException("Set ANDROID_HOME to point to the correct Android SDK location\n");
+        throw new GradleException("Set ANDROID_HOME to point to the correct Android SDK location\n")
     }
 
     if ("$System.env.GIT_COMMIT" == "null" && !project.hasProperty("gitCommitVersion")) {
-        logger.warn("Warning: The GIT_COMMIT is not set. This NativeScript Android Runtime will not be tagged with the git commit it is build from\n");
+        logger.warn("Warning: The GIT_COMMIT is not set. This NativeScript Android Runtime will not be tagged with the git commit it is build from\n")
     }
 
     if (project.hasProperty("metadataGen") && !file("../android-metadata-generator/dist/tns-android-metadata-generator-0.0.1.tgz").exists()) {
-        throw new GradleException("android-metadata-generator build output not found and no metadataGen option specified. Build android-metadata-generator first.\n");
+        throw new GradleException("android-metadata-generator build output not found and no metadataGen option specified. Build android-metadata-generator first.\n")
     }
 }
 
@@ -120,9 +120,9 @@ task generateDtsgJar(type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", ":dts-generator:jar"
+            commandLine "cmd", "/c", "gradlew", ":dts-generator:jar", "--warning-mode", "all"
         } else {
-            commandLine "./gradlew", ":dts-generator:jar"
+            commandLine "./gradlew", ":dts-generator:jar", "--warning-mode", "all"
         }
     }
 }
@@ -131,9 +131,9 @@ task generateSbgJar(type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", ":static-binding-generator:jar"
+            commandLine "cmd", "/c", "gradlew", ":static-binding-generator:jar", "--warning-mode", "all"
         } else {
-            commandLine "./gradlew", ":static-binding-generator:jar"
+            commandLine "./gradlew", ":static-binding-generator:jar", "--warning-mode", "all"
         }
     }
 }
@@ -142,21 +142,9 @@ task generateMdgJar(type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", ":android-metadata-generator:jar"
+            commandLine "cmd", "/c", "gradlew", ":android-metadata-generator:jar", "--warning-mode", "all"
         } else {
-            commandLine "./gradlew", ":android-metadata-generator:jar"
-        }
-    }
-}
-
-task generateRuntime {
-    doFirst {
-        tasks.generateOptimizedRuntimeAar.execute();
-
-        tasks.generateOptimizedWithInspectorRuntimeAar.execute();
-
-        if (generateRegularRuntimePackage) {
-            tasks.generateRuntimeAar.execute();
+            commandLine "./gradlew", ":android-metadata-generator:jar", "--warning-mode", "all"
         }
     }
 }
@@ -165,9 +153,9 @@ task cleanRuntime (type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", ":runtime:clean"
+            commandLine "cmd", "/c", "gradlew", ":runtime:clean", "--warning-mode", "all"
         } else {
-            commandLine "./gradlew", ":runtime:clean"
+            commandLine "./gradlew", ":runtime:clean", "--warning-mode", "all"
         }
     }
 }
@@ -177,23 +165,24 @@ def getAssembleReleaseBuildArguments = { ->
     if (isWinOs) {
         arguments += ["cmd", "/c", "gradlew"]
     } else {
-        arguments.push("./gradlew")
+        arguments.add("./gradlew")
     }
     arguments += [":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}"]
     if (onlyX86) {
-        arguments.push("-PonlyX86")
+        arguments.add("-PonlyX86")
     }
     if (useCCache) {
-        arguments.push("-PuseCCache")
+        arguments.add("-PuseCCache")
     }
-    return arguments;
+    arguments += ["--warning-mode", "all"]
+    return arguments
 }
 
 task generateOptimizedRuntimeAar (type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         def arguments = getAssembleReleaseBuildArguments()
-        arguments.push("-Poptimized")
+        arguments.add("-Poptimized")
         commandLine arguments
     }
 }
@@ -202,7 +191,7 @@ task generateOptimizedWithInspectorRuntimeAar (type: Exec) {
     doFirst {
         workingDir "$TEST_APP_PATH"
         def arguments = getAssembleReleaseBuildArguments()
-        arguments.push("-PoptimizedWithInspector")
+        arguments.add("-PoptimizedWithInspector")
         commandLine arguments
     }
 }
@@ -316,7 +305,7 @@ task setPackageVersionInPackageJsonFile {
         def inputFile = new File("$DIST_PATH/package.json")
         def json = new JsonSlurper().parseText(inputFile.text)
         json.version = pVersion
-        def jb = new JsonBuilder(json);
+        def jb = new JsonBuilder(json)
         inputFile.text = JsonOutput.prettyPrint(jb.toString())
     }
 }
@@ -344,9 +333,17 @@ createDistDir.dependsOn(generateMdgJar)
 
 getPackageVersion.dependsOn(createDistDir)
 getCommitVersion.dependsOn(getPackageVersion)
-generateRuntime.dependsOn(getCommitVersion)
+generateOptimizedRuntimeAar.dependsOn(getCommitVersion)
+
+generateOptimizedWithInspectorRuntimeAar.dependsOn(generateOptimizedRuntimeAar)
+
+if (generateRegularRuntimePackage) {
+    generateRuntimeAar.dependsOn(generateOptimizedWithInspectorRuntimeAar)
+    buildJsParser.dependsOn(generateRuntimeAar)
+} else {
+    buildJsParser.dependsOn(generateOptimizedWithInspectorRuntimeAar)
+}
 
-buildJsParser.dependsOn(generateRuntime)
 copyFilesToProjectTemeplate.dependsOn(buildJsParser)
 copyProjectTemplate.dependsOn(copyFilesToProjectTemeplate)
 copyPackageJson.dependsOn(copyProjectTemplate)
@@ -377,9 +374,9 @@ task runSbgTests (type: Exec, dependsOn: 'runAstTests') {
     doFirst {
         workingDir "$TEST_APP_PATH"
         if (isWinOs) {
-            commandLine "cmd", "/c", "gradlew", ":static-binding-generator:test"
+            commandLine "cmd", "/c", "gradlew", ":static-binding-generator:test", "--warning-mode", "all"
         } else {
-            commandLine "./gradlew", ":static-binding-generator:test"
+            commandLine "./gradlew", ":static-binding-generator:test", "--warning-mode", "all"
         }
     }
 }
@@ -389,16 +386,17 @@ def getRunTestsBuildArguments = { taskName ->
     if (isWinOs) {
         arguments += ["cmd", "/c", "gradlew"]
     } else {
-        arguments.push("./gradlew")
+        arguments.add("./gradlew")
     }
-    arguments +=["-b", "runtests.gradle", taskName]
+    arguments += ["-b", "runtests.gradle", taskName]
     if (onlyX86) {
-        arguments.push("-PonlyX86")
+        arguments.add("-PonlyX86")
     }
     if (useCCache) {
-        arguments.push("-PuseCCache")
+        arguments.add("-PuseCCache")
     }
-    return arguments;
+    arguments += ["--warning-mode", "all"]
+    return arguments
 }
 
 task runTests (type: Exec) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"
@@ -10,7 +10,8 @@
     "**/*"
   ],
   "gradle": {
-      "version": "4.10.2",
-      "android": "3.2.1"
-  }
+    "version": "4.10.2",
+    "android": "3.3.0"
+  },
+  "android_ndk_version": "18b"
 }