diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index ae9cc3954..4a8d94d7b 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -68,7 +68,7 @@ def nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 26 } def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 26 } def computeBuildToolsVersion = { -> - project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1" + project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.3" } project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug" diff --git a/test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js b/test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js index f8329e497..742b8ac4a 100644 --- a/test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js +++ b/test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js @@ -340,7 +340,7 @@ describe("Tests exception handling ", function () { }); // run this test only for API level bigger than 25 as we have handling there - if(android.os.Build.VERSION.SDK_INT > 25) { + if(android.os.Build.VERSION.SDK_INT > 25 && android.os.Build.CPU_ABI != "x86" && android.os.Build.CPU_ABI != "x86_64") { it("Should handle SIGABRT and throw a NativeScript exception when incorrectly calling JNI methods", function () { let myClassInstance = new com.tns.tests.MyTestBaseClass3(); // public void callMeWithAString(java.lang.String[] stringArr, Runnable arbitraryInterface) diff --git a/test-app/build-tools/android-metadata-generator/build.gradle b/test-app/build-tools/android-metadata-generator/build.gradle index 48f3f8f65..7a65f3e0a 100644 --- a/test-app/build-tools/android-metadata-generator/build.gradle +++ b/test-app/build-tools/android-metadata-generator/build.gradle @@ -17,7 +17,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' } } diff --git a/test-app/build-tools/static-binding-generator/build.gradle b/test-app/build-tools/static-binding-generator/build.gradle index afa8645bd..b8786c877 100644 --- a/test-app/build-tools/static-binding-generator/build.gradle +++ b/test-app/build-tools/static-binding-generator/build.gradle @@ -15,7 +15,7 @@ compileJava { } task copyJarToBuildTools (type: Copy) { - inputs.dir("$projectDir/build/libs/static-binding-generator.jar") + inputs.file("$projectDir/build/libs/static-binding-generator.jar") from "$projectDir/build/libs/static-binding-generator.jar" into "$projectDir/../" } diff --git a/test-app/build.gradle b/test-app/build.gradle index 457a2c9a2..0dc9e78f5 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - + repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' } } diff --git a/test-app/gradle/wrapper/gradle-wrapper.properties b/test-app/gradle/wrapper/gradle-wrapper.properties index cba6c1d77..182c48faa 100644 --- a/test-app/gradle/wrapper/gradle-wrapper.properties +++ b/test-app/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 18 14:23:16 EEST 2017 +#Fri May 11 16:45:47 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle index b2f625959..0b071ec9a 100644 --- a/test-app/runtime/build.gradle +++ b/test-app/runtime/build.gradle @@ -15,7 +15,7 @@ if (onlyX86) { println "OnlyX86 build triggered." } -project.ext._buildToolsVersion = "27.0.1" +project.ext._buildToolsVersion = "27.0.3" android { sourceSets {