diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index 02a1dd077..9cfa0581e 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -339,7 +339,7 @@ dependencies { println "\t + adding nativescript runtime package dependency: $runtime" project.dependencies.add("implementation", [name: runtime, ext: "aar"]) } else { - implementation project(path: ':runtime', configuration: 'default') + implementation project(':runtime') } } @@ -475,12 +475,17 @@ task extractAllJars { def buildType = project.selectedBuildType == "release" ? "Release" : "Debug" def iter = [] Pattern pattern = Pattern.compile("^(.+)${buildType}CompileClasspath\$") + def artifactType = Attribute.of('artifactType', String) configurations.all { config -> Matcher matcher = pattern.matcher(config.name) if (matcher.find() || config.name == "${buildType.toLowerCase()}CompileClasspath") { - config.resolve().each { - if (!iter.contains(it)) { - iter.push(it) + config.incoming.artifactView { + attributes { + it.attribute(artifactType, 'jar') + } + }.artifacts.each { + if (!iter.contains(it.file)) { + iter.push(it.file) } } } diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle index 213784ef8..4a0f304c9 100644 --- a/test-app/runtime/build.gradle +++ b/test-app/runtime/build.gradle @@ -25,10 +25,10 @@ project.ext._buildToolsVersion = "28.0.3" android { sourceSets { main { - def defaultSrcPath = "src/main/java"; + def defaultSrcPath = "src/main/java" def bindingGeneratorSourcePath = new File(project(":runtime-binding-generator").projectDir, defaultSrcPath) - // embedd runtime binding generator in runtime, while keeping it in a sperate project + // embed runtime binding generator in runtime, while keeping it in a separate project java.srcDirs = [bindingGeneratorSourcePath, defaultSrcPath] } }