Merge pull request #88 from dao-wkm/master

Fix conflict android
jordanbyron · Jun 23, 2019 · d879146 · d879146
2 parents 950d0f7 + a0e062f
commit d879146
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,14 @@
 apply plugin: 'com.android.library'
-
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion safeExtGet('compileSdkVersion', 25)
+    buildToolsVersion safeExtGet('buildToolsVersion', '25.0.2')
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 25
+       minSdkVersion safeExtGet('minSdkVersion', 21)
+       targetSdkVersion safeExtGet('targetSdkVersion', 25)
     }
 }