Skip to content

Commit ba1fd1d

Browse files
authored
Merge pull request #1055 from NativeScript/trifonov/update-graddle
upgraded gradle to 4.4 and Android Plugin for Gradle 3.1.2
2 parents b2b2ace + 7ab0f0d commit ba1fd1d

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

test-app/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text
6868
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 26 }
6969
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 26 }
7070
def computeBuildToolsVersion = { ->
71-
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1"
71+
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.3"
7272
}
7373

7474
project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug"

test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ describe("Tests exception handling ", function () {
340340
});
341341

342342
// run this test only for API level bigger than 25 as we have handling there
343-
if(android.os.Build.VERSION.SDK_INT > 25) {
343+
if(android.os.Build.VERSION.SDK_INT > 25 && android.os.Build.CPU_ABI != "x86" && android.os.Build.CPU_ABI != "x86_64") {
344344
it("Should handle SIGABRT and throw a NativeScript exception when incorrectly calling JNI methods", function () {
345345
let myClassInstance = new com.tns.tests.MyTestBaseClass3();
346346
// public void callMeWithAString(java.lang.String[] stringArr, Runnable arbitraryInterface)

test-app/build-tools/android-metadata-generator/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717
}
1818

1919
dependencies {
20-
classpath 'com.android.tools.build:gradle:3.0.1'
20+
classpath 'com.android.tools.build:gradle:3.1.2'
2121
}
2222
}
2323

test-app/build-tools/static-binding-generator/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ compileJava {
1515
}
1616

1717
task copyJarToBuildTools (type: Copy) {
18-
inputs.dir("$projectDir/build/libs/static-binding-generator.jar")
18+
inputs.file("$projectDir/build/libs/static-binding-generator.jar")
1919
from "$projectDir/build/libs/static-binding-generator.jar"
2020
into "$projectDir/../"
2121
}

test-app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
4+
55
repositories {
66
jcenter()
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
10+
classpath 'com.android.tools.build:gradle:3.1.2'
1111
}
1212
}
1313

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 18 14:23:16 EEST 2017
1+
#Fri May 11 16:45:47 EEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

test-app/runtime/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (onlyX86) {
1515
println "OnlyX86 build triggered."
1616
}
1717

18-
project.ext._buildToolsVersion = "27.0.1"
18+
project.ext._buildToolsVersion = "27.0.3"
1919

2020
android {
2121
sourceSets {

0 commit comments

Comments
 (0)