Skip to content

Commit 134067e

Browse files
committed
merged changes from release
2 parents 99db89f + 5f64507 commit 134067e

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
4.0.0-rc
1+
4.0.0
22
==
33

44
## Breaking Changes

build-artifacts/project-template-gradle/app/src/main/java/com/tns/NativeScriptApplication.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.tns;
22

33
import android.app.Application;
4+
import android.os.Build;
5+
import android.support.multidex.MultiDex;
46

57
public class NativeScriptApplication extends Application {
68

@@ -23,6 +25,14 @@ public void onCreate() {
2325
}
2426
}
2527

28+
public void attachBaseContext(android.content.Context base) {
29+
super.attachBaseContext(base);
30+
if (Build.VERSION.SDK_INT < 21) {
31+
// As the new gradle plugin automatically uses multidex if necessary we need to call this for older android API versions
32+
MultiDex.install(this);
33+
}
34+
}
35+
2636
public static Application getInstance() {
2737
return thiz;
2838
}

package.json

Lines changed: 1 addition & 1 deletion
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.0.0",
4+
"version": "4.0.1",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/NativeScript/android-runtime.git"

test-app/app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,12 @@ dependencies {
198198
if (project.hasProperty("supportVersion")) {
199199
supportVer = supportVersion
200200
}
201+
202+
implementation "com.android.support:multidex:1.0.2"
201203
implementation "com.android.support:support-v4:$supportVer"
202204
implementation "com.android.support:appcompat-v7:$supportVer"
203205
debugImplementation "com.android.support:design:$supportVer"
206+
204207
def sbgProjectExists = !findProject(':static-binding-generator').is(null)
205208
if (sbgProjectExists) {
206209
provided project(':static-binding-generator')
@@ -271,7 +274,7 @@ task addDependenciesFromAppResourcesLibraries {
271274
println "\t + adding jar plugin dependency: $jarFileAbsolutePath"
272275
pluginsJarLibraries.add(jarFile.getAbsolutePath())
273276
}
274-
277+
275278
project.dependencies.add("implementation", jarFiles)
276279
}
277280
}

0 commit comments

Comments
 (0)