Skip to content

Commit e08c03c

Browse files
authored
Improve get SDK version values on Android (#77)
* Improve get SDK version values on Android * Target to compile should match
1 parent 7076269 commit e08c03c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

templates/android.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,22 @@ module.exports = platform => [{
1515
apply plugin: 'com.android.library'
1616
apply plugin: 'maven'
1717
18+
def safeExtGet(prop, fallback) {
19+
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
20+
}
21+
1822
def DEFAULT_COMPILE_SDK_VERSION = 27
1923
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
2024
def DEFAULT_MIN_SDK_VERSION = 16
21-
def DEFAULT_TARGET_SDK_VERSION = 26
25+
def DEFAULT_TARGET_SDK_VERSION = 27
2226
2327
android {
24-
compileSdkVersion rootProject.ext.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
25-
buildToolsVersion rootProject.ext.hasProperty('buildToolsVersion') ? rootProject.ext.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
28+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
29+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
2630
2731
defaultConfig {
28-
minSdkVersion rootProject.ext.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : DEFAULT_MIN_SDK_VERSION
29-
targetSdkVersion rootProject.ext.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
32+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
33+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
3034
versionCode 1
3135
versionName "1.0"
3236
}

0 commit comments

Comments
 (0)