@@ -52,9 +52,9 @@ def asbgProject = project(":asbg")
5252asbgProject. ext. outDir = new File (" $projectDir " , " src/main/java" )
5353asbgProject. ext. jsCodeDir = new File (" $projectDir " , " src/main/assets/app" )
5454
55- def computeCompileSdkVersion = { -> project. hasProperty(" compileSdk" ) ? compileSdk : 23 }
56- def computeTargetSdkVersion = { -> project. hasProperty(" targetSdk" ) ? targetSdk : 23 }
57- def computeBuildToolsVersion = { -> project. hasProperty(" buildToolsVersion" ) ? buildToolsVersion : " 25 .0.2 " }
55+ def computeCompileSdkVersion = { -> project. hasProperty(" compileSdk" ) ? compileSdk : 26 }
56+ def computeTargetSdkVersion = { -> project. hasProperty(" targetSdk" ) ? targetSdk : 26 }
57+ def computeBuildToolsVersion = { -> project. hasProperty(" buildToolsVersion" ) ? buildToolsVersion : " 26 .0.1 " }
5858
5959project. ext. selectedBuildType = project. hasProperty(" release" ) ? " release" : " debug"
6060
@@ -190,13 +190,13 @@ android {
190190 applyAppGradleConfiguration()
191191}
192192
193- def localRuntimeExists = file( " $p rojectDir /libs/ runtime-libs/nativescript-regular.aar " ) . exists() || file( " $p rojectDir /libs/runtime-libs/nativescript-optimized.aar " ) . exists( )
193+ def externalRuntimeExists = ! findProject( ' : runtime' ) . is( null )
194194
195195repositories {
196196
197197 // used for local *.AAR files
198198 def pluginDependencies = nativescriptDependencies. collect { " $rootDir /${ it.directory} /platforms/android" }
199- if (localRuntimeExists ) {
199+ if (! externalRuntimeExists ) {
200200 pluginDependencies. add(" libs/runtime-libs" )
201201 }
202202
@@ -206,7 +206,7 @@ repositories {
206206}
207207
208208dependencies {
209- def supportVer = " 22.2.0 "
209+ def supportVer = " 25.3.1 "
210210 if (project. hasProperty(" supportVersion" )) {
211211 supportVer = supportVersion
212212 }
@@ -227,10 +227,12 @@ task addNativeScriptRuntimePackageDependency {
227227 return packageJson. nativescript. useV8Symbols;
228228 }
229229
230- if (localRuntimeExists ) {
230+ if (! externalRuntimeExists ) {
231231 def runtime = useV8Symbols ? " nativescript-regular" : " nativescript-optimized" ;
232232 println " \t + adding nativescript runtime package dependency: $runtime "
233233 project. dependencies. add(" compile" , [name : runtime, ext : " aar" ])
234+ } else {
235+ project. dependencies. add(" compile" , project(' :runtime' ))
234236 }
235237}
236238
0 commit comments