Ver código fonte

Android: Support to change minSdkVersion (#8313)

Ramesh Ravone 8 anos atrás
pai
commit
93b417fe17
2 arquivos alterados com 14 adições e 2 exclusões
  1. 14 0
      platform/android/SCsub
  2. 0 2
      platform/android/build.gradle.template

+ 14 - 0
platform/android/SCsub

@@ -92,9 +92,23 @@ gradle_asset_dirs_text = ""
 
 gradle_default_config_text = ""
 
+minSdk = 14
+targetSdk = 23
+
 for x in env.android_default_config:
+    if x.startswith("minSdkVersion") and int(x.split(" ")[-1]) < minSdk: 
+        x = "minSdkVersion " + str(minSdk)
+    if x.startswith("targetSdkVersion") and int(x.split()[-1]) > targetSdk: 
+        x = "targetSdkVersion " + str(targetSdk)
+
     gradle_default_config_text += x + "\n\t\t"
 
+if "minSdkVersion" not in gradle_default_config_text:
+    gradle_default_config_text += ("minSdkVersion " + str(minSdk) + "\n\t\t")
+
+if "targetSdkVersion" not in gradle_default_config_text:
+    gradle_default_config_text += ("targetSdkVersion " + str(targetSdk) + "\n\t\t")
+
 gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$", gradle_maven_repos_text)
 gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$", gradle_maven_dependencies_text)
 gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$", gradle_java_dirs_text)

+ 0 - 2
platform/android/build.gradle.template

@@ -39,8 +39,6 @@ android {
 		exclude 'META-INF/NOTICE'
 	}
 	defaultConfig {
-		minSdkVersion 14
-		targetSdkVersion 23
 		$$GRADLE_DEFAULT_CONFIG$$
 	}
 	// Both signing and zip-aligning will be done at export time