Merge pull request phonegap#420 from jcesarmobile/min-sdk-fix

Don't set minSdkVersion if another plugin set a greater value
ns0m · Feb 28, 2017 · 3219941 · 3219941
2 parents 49db409 + fd12c80
commit 3219941
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/android/barcodescanner.gradle b/src/android/barcodescanner.gradle
@@ -1,4 +1,8 @@
-cdvMinSdkVersion = Math.max(15, cdvHelpers.getConfigPreference('android-minSdkVersion', 0) as Integer)
+def DEFAULT_MIN_SDK_VERSION = 15
+def minSdk = Math.max(DEFAULT_MIN_SDK_VERSION, cdvHelpers.getConfigPreference('android-minSdkVersion',0) as Integer);
+if (cdvMinSdkVersion == null || Integer.parseInt(cdvMinSdkVersion) < minSdk ) {
+    ext.cdvMinSdkVersion = minSdk;
+}
 
 repositories{
     jcenter()