Skip to content

Commit 0917329

Browse files
authored
Merge pull request #994 from NativeScript/pete/fix-compile-deps
fix(project-build-script): change compile -> implementation
2 parents bfbf942 + 775ca45 commit 0917329

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

test-app/app/build.gradle

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -199,21 +199,22 @@ dependencies {
199199
supportVer = supportVersion
200200
}
201201

202-
compile "com.android.support:multidex:1.0.2"
203-
compile "com.android.support:support-v4:$supportVer"
204-
compile "com.android.support:appcompat-v7:$supportVer"
205-
debugCompile "com.android.support:design:$supportVer"
202+
implementation "com.android.support:multidex:1.0.2"
203+
implementation "com.android.support:support-v4:$supportVer"
204+
implementation "com.android.support:appcompat-v7:$supportVer"
205+
debugImplementation "com.android.support:design:$supportVer"
206+
206207
def sbgProjectExists = !findProject(':static-binding-generator').is(null)
207208
if (sbgProjectExists) {
208-
provided project(':static-binding-generator')
209+
compileOnly project(':static-binding-generator')
209210
}
210211
def mdgProjectExists = !findProject(':android-metadata-generator').is(null)
211212
if (mdgProjectExists) {
212-
provided project(':android-metadata-generator')
213+
compileOnly project(':android-metadata-generator')
213214
}
214215
def dtsgProjectExists = !findProject(':dts-generator').is(null)
215216
if (dtsgProjectExists) {
216-
provided project(':dts-generator')
217+
compileOnly project(':dts-generator')
217218
}
218219

219220
def useV8Symbols = nativescriptDependencies.any {
@@ -224,10 +225,9 @@ dependencies {
224225
if (!externalRuntimeExists) {
225226
def runtime = useV8Symbols ? "nativescript-regular" : "nativescript-optimized"
226227
println "\t + adding nativescript runtime package dependency: $runtime"
227-
project.dependencies.add("compile", [name: runtime, ext: "aar"])
228+
project.dependencies.add("implementation", [name: runtime, ext: "aar"])
228229
} else {
229-
implementation project(':runtime')
230-
230+
implementation project(path: ':runtime', configuration: 'default')
231231
}
232232
}
233233

@@ -242,7 +242,7 @@ task addDependenciesFromNativeScriptPlugins {
242242
def length = aarFile.name.length() - 4
243243
def fileName = aarFile.name[0..<length]
244244
println "\t + adding aar plugin dependency: " + aarFile.getAbsolutePath()
245-
project.dependencies.add("compile", [name: fileName, ext: "aar"])
245+
project.dependencies.add("implementation", [name: fileName, ext: "aar"])
246246
}
247247

248248
def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.jar"])
@@ -265,7 +265,7 @@ task addDependenciesFromAppResourcesLibraries {
265265
def length = aarFile.name.length() - 4
266266
def fileName = aarFile.name[0..<length]
267267
println "\t + adding aar library dependency: " + aarFile.getAbsolutePath()
268-
project.dependencies.add("compile", [name: fileName, ext: "aar"])
268+
project.dependencies.add("implementation", [name: fileName, ext: "aar"])
269269
}
270270

271271
def jarFiles = fileTree(dir: appResourcesLibraries, include: ["**/*.jar"])
@@ -275,7 +275,7 @@ task addDependenciesFromAppResourcesLibraries {
275275
pluginsJarLibraries.add(jarFile.getAbsolutePath())
276276
}
277277

278-
project.dependencies.add("compile", jarFiles)
278+
project.dependencies.add("implementation", jarFiles)
279279
}
280280
}
281281

@@ -348,18 +348,20 @@ def explodeAar(File compileDependency, String outputDir) {
348348
}
349349

350350
task extractAllJars {
351-
352351
outputs.dir extractedDependenciesDir
353352

354353
doLast {
355-
def iter = configurations.compile.resolvedConfiguration.resolvedArtifacts.iterator()
354+
def iter;
355+
if (project.selectedBuildType == "release") {
356+
iter = configurations.releaseCompileClasspath.resolve()
357+
} else {
358+
iter = configurations.debugCompileClasspath.resolve()
359+
}
356360
def dependencyCounter = 0
357-
while (iter.hasNext()) {
358-
//declaring variable as specific class for getting code completion in Android Studio
359-
org.gradle.api.internal.artifacts.DefaultResolvedArtifact nextDependency = iter.next()
360-
361+
iter.each {
362+
def nextDependency = it
361363
def outputDir = java.nio.file.Paths.get(extractedDependenciesDir, "" + dependencyCounter).normalize().toString()
362-
explodeAar(nextDependency.file, outputDir)
364+
explodeAar(nextDependency, outputDir)
363365
dependencyCounter++
364366
}
365367
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Packs metadata generator in a .tgz file in ~/dist folder
33
* To build .tgz
44
* gradlew packmg
@@ -42,11 +42,11 @@ task copyNecessaryFiles {
4242
from "$rootDir/helpers"
4343
into "$rootDir/dist/bin"
4444
}
45-
45+
4646
copy {
4747
from "$rootDir/package.json"
4848
into "$rootDir/dist"
49-
}
49+
}
5050
}
5151
}
5252

@@ -55,7 +55,7 @@ jar {
5555
attributes("Manifest-Version": "1.0",
5656
"Main-Class": "com.telerik.metadata.Generator")
5757
}
58-
58+
5959
from {
6060

6161
configurations.runtime.collect {

test-app/runtime/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ android {
2020
compileSdkVersion 26
2121
buildToolsVersion project.ext._buildToolsVersion
2222

23-
publishNonDefault true
2423
defaultConfig {
2524
minSdkVersion 17
2625
targetSdkVersion 26
@@ -65,7 +64,7 @@ android {
6564
}
6665

6766
dependencies {
68-
compile fileTree(include: ['*.jar'], dir: 'libs')
67+
implementation fileTree(include: ['*.jar'], dir: 'libs')
6968
}
7069

7170
tasks.whenTaskAdded { task ->

0 commit comments

Comments
 (0)