Skip to content

Commit c8679c3

Browse files
authored
Merge pull request #1186 from NativeScript/master
Creating RC
2 parents 74804d5 + 2bb64de commit c8679c3

File tree

127 files changed

+6899
-4908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+6899
-4908
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: Bug report
3+
about: 'We really appreciate your effort to provide feedback. Before opening a new
4+
issue, please make sure that this case is not already reported in GitHub as an
5+
issue or in StackOverflow as a question.'
6+
7+
---
8+
9+
**Environment**
10+
Provide version numbers for the following components (information can be retrieved by running `tns info` in your project folder or by inspecting the `package.json` of the project):
11+
- CLI:
12+
- Cross-platform modules:
13+
- Android Runtime:
14+
- iOS Runtime (if applicable):
15+
- Plugin(s):
16+
17+
**Describe the bug**
18+
<!-- A clear and concise description of what the bug is. Please, explain whether it's a build time error or a runtime error. More detailed logs can be easily obtained by following the instructions in this guide: https://docs.nativescript.org/get-support#how-to-obtain-diagnostic-reports. -->
19+
20+
**To Reproduce**
21+
<!-- Add commands used or steps taken to reproduce the behaviour. -->
22+
23+
**Expected behavior**
24+
25+
**Sample project**
26+
<!-- If possible, provide a link from the [Playground](https://play.nativescript.org) with reproduction of the problem. If not, consider attaching a sample project or link to a repository with such project. -->
27+
28+
**Additional context**
29+
<!-- Add any other context about the problem here. -->
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
<!-- A clear and concise description of what the problem is. Explain what is stopping you from finishing the job. -->
9+
10+
**Describe the solution you'd like**
11+
<!-- A clear and concise description of what you want to happen. -->
12+
13+
**Describe alternatives you've considered**
14+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
15+
16+
**Additional context**
17+
<!-- Add any other context or screenshots about the feature request here. -->

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
5.0.0
2+
==
3+
4+
## What's New
5+
- [Upgrade v8 to 6.9.427.23(#1168)](https://github.com/NativeScript/android-runtime/issues/1168)
6+
- [Added support for before-plugins.gradle file applied before plugin(#1183)](https://github.com/NativeScript/android-runtime/pull/1185)
7+
- [Make JSParser in SBG fail the build when failing(#1152)](https://github.com/NativeScript/android-runtime/issues/1152)
8+
- [Generate interface names list in SBG in parallel(#1132)](https://github.com/NativeScript/android-runtime/issues/1132)
9+
- [Upgrade android gradle plugin to 3.2.0(#1147)](https://github.com/NativeScript/android-runtime/issues/1147)
10+
11+
## Bug Fixes
12+
13+
- [Static Binding Generator fails if class has static properties that are used within the class(#1160)](https://github.com/NativeScript/android-runtime/issues/1160)
14+
- [Fixing NoClassDefFoundError when using older API(#1164)](https://github.com/NativeScript/android-runtime/pull/1164)
15+
116
4.2.0
217
==
318

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ We love PRs! Check out the [contributing guidelines](CONTRIBUTING.md). If you wa
9696
* [Implementing additional Chrome DevTools protocol Domains](docs/extending-inspector.md)
9797

9898
## Get Help
99-
Please, use [github issues](https://github.com/NativeScript/android-runtime/issues) strictly for [reporting bugs](CONTRIBUTING.md#reporting-bugs) or [requesting features](CONTRIBUTING.md#requesting-new-features). For general questions and support, check out the [NativeScript community forum](https://discourse.nativescript.org/) or ask our experts in [NativeScript community Slack channel](http://developer.telerik.com/wp-login.php?action=slack-invitation).
99+
Please, use [github issues](https://github.com/NativeScript/android-runtime/issues) strictly for [reporting bugs](CONTRIBUTING.md#reporting-bugs) or [requesting features](CONTRIBUTING.md#requesting-new-features). For general questions and support, check out [Stack Overflow](https://stackoverflow.com/questions/tagged/nativescript) or ask our experts in [NativeScript community Slack channel](http://developer.telerik.com/wp-login.php?action=slack-invitation).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"v8Version": "6.7.288.46"
2+
"v8Version": "6.9.427.23"
33
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tns-android",
33
"description": "NativeScript Runtime for Android",
4-
"version": "4.2.0",
4+
"version": "5.0.0",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/NativeScript/android-runtime.git"
@@ -11,6 +11,6 @@
1111
],
1212
"gradle": {
1313
"version": "4.4",
14-
"android": "3.1.3"
14+
"android": "3.1.4"
1515
}
1616
}

test-app/app/build.gradle

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text
7575
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 26 }
7676
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 26 }
7777
def computeBuildToolsVersion = { ->
78-
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.3"
78+
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "28.0.2"
7979
}
8080

8181
project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug"
@@ -111,7 +111,17 @@ def getAppResourcesPath = { ->
111111
project.ext.appResourcesPath = absolutePathToAppResources
112112

113113
return absolutePathToAppResources
114-
};
114+
}
115+
116+
def applyBeforePluginGradleConfiguration = { ->
117+
def appResourcesPath = getAppResourcesPath()
118+
def pathToBeforePluginGradle = "$appResourcesPath/Android/before-plugins.gradle"
119+
def beforePluginGradle = file(pathToBeforePluginGradle)
120+
if (beforePluginGradle.exists()) {
121+
println "\t + applying user-defined configuration from ${beforePluginGradle}"
122+
apply from: pathToBeforePluginGradle
123+
}
124+
}
115125

116126
def applyAppGradleConfiguration = { ->
117127
def appResourcesPath = getAppResourcesPath()
@@ -212,8 +222,9 @@ android {
212222
}
213223

214224
setAppIdentifier()
215-
applyAppGradleConfiguration()
225+
applyBeforePluginGradleConfiguration()
216226
applyPluginGradleConfigurations()
227+
applyAppGradleConfiguration()
217228
}
218229

219230
def externalRuntimeExists = !findProject(':runtime').is(null)
@@ -251,6 +262,8 @@ dependencies {
251262
supportVer = supportVersion
252263
}
253264

265+
println "Using support library version $supportVer"
266+
254267
implementation "com.android.support:multidex:1.0.2"
255268
implementation "com.android.support:support-v4:$supportVer"
256269
implementation "com.android.support:appcompat-v7:$supportVer"
@@ -477,14 +490,16 @@ task buildMetadata(type: JavaExec) {
477490
description "builds metadata with provided jar dependencies"
478491

479492
inputs.files("$MDG_JAVA_DEPENDENCIES")
480-
inputs.dir("$buildDir/intermediates/classes")
493+
494+
def classesDir = "$buildDir/intermediates/javac"
495+
inputs.dir(classesDir)
481496

482497
outputs.files("$METADATA_OUT_PATH/treeNodeStream.dat", "$METADATA_OUT_PATH/treeStringsStream.dat", "$METADATA_OUT_PATH/treeValueStream.dat")
483498

484499
doFirst {
485500
// get compiled classes to pass to metadata generator
486501
// these need to be called after the classes have compiled
487-
def classesDir = "$buildDir/intermediates/classes"
502+
assert file(classesDir).exists()
488503

489504
def classesSubDirs = new File(classesDir).listFiles()
490505
def selectedBuildType = project.ext.selectedBuildType

test-app/app/src/debug/java/com/tns/NativeScriptSyncServiceSocketImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public void run() {
5858
deviceSystemSocket = new LocalServerSocket(this.name);
5959
while (running) {
6060
LocalSocket systemSocket = deviceSystemSocket.accept();
61-
systemSocket.setSoTimeout(70000);
6261
livesyncWorker = new LiveSyncWorker(systemSocket);
6362
Thread liveSyncThread = setUpLivesyncThread();
6463
liveSyncThread.start();
@@ -116,7 +115,7 @@ private class LiveSyncWorker implements Runnable {
116115
public static final String FILE_CONTENT = "fileContent";
117116
public static final String FILE_CONTENT_LENGTH = FILE_CONTENT + "Length";
118117
public static final int DEFAULT_OPERATION = -1;
119-
private static final String PROTOCOL_VERSION = "0.1.0";
118+
private static final String PROTOCOL_VERSION = "0.2.0";
120119
private byte[] handshakeMessage;
121120
private final DigestInputStream input;
122121
private Closeable livesyncSocket;

0 commit comments

Comments
 (0)