From 7fd5f0a522172767a284d3660dd26b83376fdca0 Mon Sep 17 00:00:00 2001 From: Peter Kanev Date: Wed, 4 Apr 2018 14:30:04 +0300 Subject: [PATCH 1/4] fix(project-build-script): change compile -> implementation dependency declaring --- test-app/app/build.gradle | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index d21920d39..6e2fb5468 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -63,7 +63,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" + "25.2.5" } project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug" @@ -198,9 +198,9 @@ dependencies { if (project.hasProperty("supportVersion")) { supportVer = supportVersion } - compile "com.android.support:support-v4:$supportVer" - compile "com.android.support:appcompat-v7:$supportVer" - debugCompile "com.android.support:design:$supportVer" + implementation "com.android.support:support-v4:$supportVer" + implementation "com.android.support:appcompat-v7:$supportVer" + debugImplementation "com.android.support:design:$supportVer" def sbgProjectExists = !findProject(':static-binding-generator').is(null) if (sbgProjectExists) { provided project(':static-binding-generator') @@ -222,7 +222,7 @@ dependencies { if (!externalRuntimeExists) { def runtime = useV8Symbols ? "nativescript-regular" : "nativescript-optimized" println "\t + adding nativescript runtime package dependency: $runtime" - project.dependencies.add("compile", [name: runtime, ext: "aar"]) + project.dependencies.add("implementation", [name: runtime, ext: "aar"]) } else { implementation project(':runtime') @@ -240,7 +240,7 @@ task addDependenciesFromNativeScriptPlugins { def length = aarFile.name.length() - 4 def fileName = aarFile.name[0.. Date: Tue, 10 Apr 2018 09:56:37 +0300 Subject: [PATCH 2/4] Fixing build --- test-app/app/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index 6e2fb5468..0816e0680 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -63,7 +63,7 @@ def nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 26 } def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 26 } def computeBuildToolsVersion = { -> - "25.2.5" + project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1" } project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug" @@ -224,8 +224,7 @@ dependencies { println "\t + adding nativescript runtime package dependency: $runtime" project.dependencies.add("implementation", [name: runtime, ext: "aar"]) } else { - implementation project(':runtime') - + implementation project(path: ':runtime', configuration: 'default') } } From 55b0aabe1f8a4ab2112a6bac740ae9cc9157a122 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Mon, 16 Apr 2018 12:07:25 +0300 Subject: [PATCH 3/4] some more gradle warnings fixed --- test-app/app/build.gradle | 6 +++--- .../android-metadata-generator/build.gradle | 12 ++++++------ test-app/runtime/build.gradle | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index 1e43993b0..24d364c8b 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -206,15 +206,15 @@ dependencies { def sbgProjectExists = !findProject(':static-binding-generator').is(null) if (sbgProjectExists) { - provided project(':static-binding-generator') + compileOnly project(':static-binding-generator') } def mdgProjectExists = !findProject(':android-metadata-generator').is(null) if (mdgProjectExists) { - provided project(':android-metadata-generator') + compileOnly project(':android-metadata-generator') } def dtsgProjectExists = !findProject(':dts-generator').is(null) if (dtsgProjectExists) { - provided project(':dts-generator') + compileOnly project(':dts-generator') } def useV8Symbols = nativescriptDependencies.any { diff --git a/test-app/build-tools/android-metadata-generator/build.gradle b/test-app/build-tools/android-metadata-generator/build.gradle index 5959f8b6d..a8b98574d 100644 --- a/test-app/build-tools/android-metadata-generator/build.gradle +++ b/test-app/build-tools/android-metadata-generator/build.gradle @@ -1,4 +1,4 @@ -/* +/* * Packs metadata generator in a .tgz file in ~/dist folder * To build .tgz * gradlew packmg @@ -32,8 +32,8 @@ sourceSets { compileJava.outputs.dir("$rootDir/dist/classes") dependencies { - compile files("./src/libs/bcel-5.2.jar") - compile files("./src/libs/dx.jar") + implementation files("./src/libs/bcel-5.2.jar") + implementation files("./src/libs/dx.jar") } task copyNecessaryFiles { @@ -42,11 +42,11 @@ task copyNecessaryFiles { from "$rootDir/helpers" into "$rootDir/dist/bin" } - + copy { from "$rootDir/package.json" into "$rootDir/dist" - } + } } } @@ -55,7 +55,7 @@ jar { attributes("Manifest-Version": "1.0", "Main-Class": "com.telerik.metadata.Generator") } - + from { configurations.runtime.collect { diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle index 75cc923e2..26d027e5e 100644 --- a/test-app/runtime/build.gradle +++ b/test-app/runtime/build.gradle @@ -20,7 +20,6 @@ android { compileSdkVersion 26 buildToolsVersion project.ext._buildToolsVersion - publishNonDefault true defaultConfig { minSdkVersion 17 targetSdkVersion 26 @@ -65,7 +64,7 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') + implementation fileTree(include: ['*.jar'], dir: 'libs') } tasks.whenTaskAdded { task -> From a60b24eccb57da2dd7e493b272452b1591098d7a Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Mon, 16 Apr 2018 13:47:50 +0300 Subject: [PATCH 4/4] undo change of "compile files" change to "implementation files" --- test-app/build-tools/android-metadata-generator/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-app/build-tools/android-metadata-generator/build.gradle b/test-app/build-tools/android-metadata-generator/build.gradle index a8b98574d..587591402 100644 --- a/test-app/build-tools/android-metadata-generator/build.gradle +++ b/test-app/build-tools/android-metadata-generator/build.gradle @@ -32,8 +32,8 @@ sourceSets { compileJava.outputs.dir("$rootDir/dist/classes") dependencies { - implementation files("./src/libs/bcel-5.2.jar") - implementation files("./src/libs/dx.jar") + compile files("./src/libs/bcel-5.2.jar") + compile files("./src/libs/dx.jar") } task copyNecessaryFiles {