@@ -52,9 +52,9 @@ def asbgProject = project(":asbg")
52
52
asbgProject. ext. outDir = new File (" $projectDir " , " src/main/java" )
53
53
asbgProject. ext. jsCodeDir = new File (" $projectDir " , " src/main/assets/app" )
54
54
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 " }
58
58
59
59
project. ext. selectedBuildType = project. hasProperty(" release" ) ? " release" : " debug"
60
60
@@ -190,13 +190,13 @@ android {
190
190
applyAppGradleConfiguration()
191
191
}
192
192
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 )
194
194
195
195
repositories {
196
196
197
197
// used for local *.AAR files
198
198
def pluginDependencies = nativescriptDependencies. collect { " $rootDir /${ it.directory} /platforms/android" }
199
- if (localRuntimeExists ) {
199
+ if (! externalRuntimeExists ) {
200
200
pluginDependencies. add(" libs/runtime-libs" )
201
201
}
202
202
@@ -206,7 +206,7 @@ repositories {
206
206
}
207
207
208
208
dependencies {
209
- def supportVer = " 22.2.0 "
209
+ def supportVer = " 25.3.1 "
210
210
if (project. hasProperty(" supportVersion" )) {
211
211
supportVer = supportVersion
212
212
}
@@ -227,10 +227,12 @@ task addNativeScriptRuntimePackageDependency {
227
227
return packageJson. nativescript. useV8Symbols;
228
228
}
229
229
230
- if (localRuntimeExists ) {
230
+ if (! externalRuntimeExists ) {
231
231
def runtime = useV8Symbols ? " nativescript-regular" : " nativescript-optimized" ;
232
232
println " \t + adding nativescript runtime package dependency: $runtime "
233
233
project. dependencies. add(" compile" , [name : runtime, ext : " aar" ])
234
+ } else {
235
+ project. dependencies. add(" compile" , project(' :runtime' ))
234
236
}
235
237
}
236
238
0 commit comments