From 7737025f967401952dae66cff50f8c6e04c8e053 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 28 Dec 2017 03:04:29 -0800 Subject: [PATCH 1/2] Fix problem with jar files in nativescript plugins (#905) This fixes a number of currently broken nativescript plugins on android. Basically any nativescript plugin that shipped with it's own jar file for native code is broken until this is made live. In the interim i execute this command before building/running android (but after it is prepared and there is a `platforms/android` directory): ``` sed -Ei '' 's/"\$\{dep.directory\}\/platforms\/android"/"\$rootDir\/\${dep.directory}\/platforms\/android"/' platforms/android/app/build.gradle ``` --- build-artifacts/project-template-gradle/app/build.gradle | 2 +- test-app/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-artifacts/project-template-gradle/app/build.gradle b/build-artifacts/project-template-gradle/app/build.gradle index a16dfea58..13bd6ef18 100644 --- a/build-artifacts/project-template-gradle/app/build.gradle +++ b/build-artifacts/project-template-gradle/app/build.gradle @@ -254,7 +254,7 @@ task addDependenciesFromNativeScriptPlugins { project.dependencies.add("compile", [name: fileName, ext: "aar"]) } - def jarFiles = fileTree(dir: file("${dep.directory}/platforms/android"), include: ["**/*.jar"]) + def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.jar"]) jarFiles.each { jarFile -> println "\t + adding jar plugin dependency: " + jarFile.getAbsolutePath() } diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index 7d3674896..92fd302c9 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -124,4 +124,4 @@ tasks.whenTaskAdded { task -> if (task.getName() == "assembleDebug") { runtests.dependsOn assembleDebug } -} \ No newline at end of file +} From 63e5a0b569ba5eacdf3c1fc14ea750d8fd48e9ba Mon Sep 17 00:00:00 2001 From: Peter Kanev Date: Tue, 2 Jan 2018 11:25:28 +0200 Subject: [PATCH 2/2] chore: bump up package.json version to 3.4.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2aa53c8f..5135eb9e4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tns-android", "description": "NativeScript Runtime for Android", - "version": "3.4.0", + "version": "3.4.1", "repository": { "type": "git", "url": "https://github.com/NativeScript/android-runtime.git"