Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
192ce80
bumped versions in master
vtrifonov Dec 5, 2018
4564214
change packages in error report files when using android x
vtrifonov Dec 6, 2018
7134a7c
remove unneeded print
vtrifonov Dec 6, 2018
3528b52
add useAndroidX flag to enable android x
vtrifonov Dec 7, 2018
dcf1fbd
improve andoird x flags
vtrifonov Dec 7, 2018
9d35e50
Merge pull request #1224 from NativeScript/trifonov/android-x-support
vtrifonov Dec 7, 2018
73902ce
refactor build.grade
vtrifonov Dec 7, 2018
b03942f
use .add instead of .push as in 5.0 it adds the items in front
vtrifonov Dec 7, 2018
3048f4f
update dts generator to the latest version
vtrifonov Dec 7, 2018
b2fc68e
Merge pull request #1227 from NativeScript/trifonov/gradle-improvements
vtrifonov Dec 10, 2018
11dc45e
replace android.support.multidex.MultiDex as well
vtrifonov Dec 10, 2018
127a739
Merge branch 'master' into trifonov/android-x-support
vtrifonov Dec 10, 2018
e41c243
Merge pull request #1228 from NativeScript/trifonov/android-x-support
vtrifonov Dec 10, 2018
c107ba6
use AppCompatActivity instead of Activity
vtrifonov Dec 11, 2018
9621bce
Merge pull request #1230 from NativeScript/trifonov/use-appcompat-act…
vtrifonov Dec 13, 2018
2285315
Upgrade V8 to 7.1.302.31
darind Oct 19, 2018
05dc386
Added android NDK version used to build the runtime in package.json
darind Dec 17, 2018
43ed041
Pass the dynamically loaded snapshot blob to the V8 Isolate creation …
darind Dec 17, 2018
cb6a4b2
Merge pull request #1233 from NativeScript/darind/v8-7.1.302.31
darind Dec 18, 2018
591cbc3
Use the new ScriptCompiler::CreateCodeCache API to produce script Cac…
darind Dec 18, 2018
e499846
Merge pull request #1236 from NativeScript/darind/codecache-fix
darind Dec 19, 2018
d454eb8
Upgrade V8 to 7.1.302.32
darind Dec 19, 2018
f72d778
Merge pull request #1238 from NativeScript/darind/v8-7.1.302.32
darind Dec 20, 2018
b70d8e9
Fix handling of user implemented interfaces
vmutafov Dec 20, 2018
abb59d4
chore: update community files
etabakov Jan 7, 2019
9c27658
Added __onDiscardedError handler
vtrifonov Jan 8, 2019
3bbbb63
Added test for onDiscardedExceptions handler
vtrifonov Jan 8, 2019
2263e02
Merge pull request #1244 from NativeScript/etabakov/update-license-year
vtrifonov Jan 8, 2019
048586d
Merge branch 'master' into trifonov/on-discarded-error
vtrifonov Jan 8, 2019
2ba32e6
formatting fix
vtrifonov Jan 8, 2019
dcb2553
Improved logging when an error is discarded
vtrifonov Jan 8, 2019
6844f0c
some methods renaming
vtrifonov Jan 8, 2019
6aa1b74
Merge pull request #1246 from NativeScript/trifonov/on-discarded-error
vtrifonov Jan 8, 2019
dd4482b
Merge branch 'master' into vmutafov/sbg-interfaces-handling-fix
vtrifonov Jan 8, 2019
3aeaa47
Merge pull request #1239 from NativeScript/vmutafov/sbg-interfaces-ha…
vtrifonov Jan 9, 2019
509cd53
upgrade android gradle plugin
vtrifonov Jan 16, 2019
266bbee
Add an option to runScript without waiting for result
vtrifonov Jan 16, 2019
532e2ea
Close previous connection when opening a new inspector
vtrifonov Jan 17, 2019
7eba8bd
fixed a problem with finding class in inner classes
vtrifonov Jan 17, 2019
cc95195
Merge pull request #1249 from NativeScript/trifonov/gradle-plugin-upg…
vtrifonov Jan 18, 2019
6a821a2
Merge branch 'master' into trifonov/non-blocking-livesync
vtrifonov Jan 18, 2019
f287063
Merge branch 'master' into trifonov/metadata-fix
vtrifonov Jan 18, 2019
87c930f
Merge pull request #1250 from NativeScript/trifonov/non-blocking-live…
vtrifonov Jan 18, 2019
b56c098
update android gradle version
vtrifonov Jan 18, 2019
10507bd
Merge branch 'master' into trifonov/inspector-improvements
vtrifonov Jan 18, 2019
16de7c8
removed unneeded semicolumns in gradle
vtrifonov Jan 18, 2019
a8d1378
Merge pull request #1252 from NativeScript/trifonov/inspector-improve…
vtrifonov Jan 18, 2019
7b995a9
Merge branch 'master' into trifonov/metadata-fix
vtrifonov Jan 18, 2019
bab6678
add a check for null fullClassName
vtrifonov Jan 18, 2019
b4ebcc3
removed this from method call
vtrifonov Jan 21, 2019
03dc822
Merge pull request #1253 from NativeScript/trifonov/metadata-fix
vtrifonov Jan 21, 2019
65597c3
Add releaseNativeCounterpart JS function for releasing the native par…
vmutafov Jan 31, 2019
eeeec21
Fix usage of weakJavaObjectToID.remove()
vmutafov Jan 31, 2019
8e9671d
Merge pull request #1258 from NativeScript/vmutafov/release-native-co…
vtrifonov Feb 4, 2019
04a1fc2
Merge branch 'master' into vmutafov/fix-runtime-weakref-leak
vtrifonov Feb 4, 2019
8fd6f05
Merge pull request #1259 from NativeScript/vmutafov/fix-runtime-weakr…
vtrifonov Feb 4, 2019
d6470c6
filter Broken pipe errors from stack trace log
vtrifonov Feb 4, 2019
fb00746
Log the Runtime and V8 versions under the TNS.Runtime category
darind Feb 4, 2019
226053f
Refactor logging to take into account enableVerboseLogging
vtrifonov Feb 4, 2019
9e4aa19
Merge pull request #1265 from NativeScript/darind/logging
darind Feb 4, 2019
74b8045
Merge branch 'master' into trifonov/filter-broken-pipe
vtrifonov Feb 4, 2019
3226b64
Merge pull request #1264 from NativeScript/trifonov/filter-broken-pipe
vtrifonov Feb 4, 2019
fc91222
Merge branch 'release'
vtrifonov Feb 6, 2019
91d8e41
Add change log for version 5.2.0
vtrifonov Feb 6, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion build-artifacts/project-template-gradle/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"v8Version": "6.9.427.23"
"v8Version": "7.1.302.32"
}
80 changes: 39 additions & 41 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
}
}

Expand Down Expand Up @@ -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"
}
}
}
Expand 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"
}
}
}
Expand 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"
}
}
}
Expand 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"
}
}
}
Expand 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
}
}
Expand All @@ -202,7 +191,7 @@ task generateOptimizedWithInspectorRuntimeAar (type: Exec) {
doFirst {
workingDir "$TEST_APP_PATH"
def arguments = getAssembleReleaseBuildArguments()
arguments.push("-PoptimizedWithInspector")
arguments.add("-PoptimizedWithInspector")
commandLine arguments
}
}
Expand Down Expand Up @@ -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())
}
}
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
}
}
}
Expand 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) {
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
}
Loading