erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Forgot maxSdkVersion.

Browse source
This commit is contained in:
Cedric Beust 2015-12-10 22:43:21 +04:00
parent 42f756dc92
commit cfedc3e5a0
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt
View file

@ -137,7 +137,7 @@ class AndroidBuild {
appInfo.versionName, appInfo.versionName,
appInfo.minSdkVersion, appInfo.minSdkVersion,
appInfo.targetSdkVersion, appInfo.targetSdkVersion,
23, appInfo.maxSdkVersion,
outManifest, outManifest,
outAaptSafeManifestLocation, outAaptSafeManifestLocation,
ManifestMerger2.MergeType.APPLICATION, ManifestMerger2.MergeType.APPLICATION,

1
src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
View file

@ -417,6 +417,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v
} }
class DefaultConfig(var minSdkVersion: String? = null, class DefaultConfig(var minSdkVersion: String? = null,
val maxSdkVersion: String? = null,
var targetSdkVersion: String? = null, var targetSdkVersion: String? = null,
var versionCode: Int? = null, var versionCode: Int? = null,
var versionName: String? = null) { var versionName: String? = null) {

3
src/main/kotlin/com/beust/kobalt/plugin/android/AppInfo.kt
View file

@ -20,6 +20,9 @@ class AppInfo(val androidManifest: File, val config: AndroidConfig) {
val minSdkVersion: String? val minSdkVersion: String?
get() = config.defaultConfig.minSdkVersion ?: AndroidManifest.getMinSdkVersion(abstractManifest)?.toString() get() = config.defaultConfig.minSdkVersion ?: AndroidManifest.getMinSdkVersion(abstractManifest)?.toString()
val maxSdkVersion: Int?
get() = config.defaultConfig.maxSdkVersion?.toInt()
val targetSdkVersion: String? val targetSdkVersion: String?
get() = config.defaultConfig.targetSdkVersion get() = config.defaultConfig.targetSdkVersion
?: AndroidManifest.getTargetSdkVersion(abstractManifest)?.toString() ?: AndroidManifest.getTargetSdkVersion(abstractManifest)?.toString()