From cfedc3e5a067ec65614c570cd830e31d36173302 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 10 Dec 2015 22:43:21 +0400 Subject: [PATCH] Forgot maxSdkVersion. --- .../kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt | 2 +- .../kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt | 1 + src/main/kotlin/com/beust/kobalt/plugin/android/AppInfo.kt | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt index 1c84621a..7811f09a 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt @@ -137,7 +137,7 @@ class AndroidBuild { appInfo.versionName, appInfo.minSdkVersion, appInfo.targetSdkVersion, - 23, + appInfo.maxSdkVersion, outManifest, outAaptSafeManifestLocation, ManifestMerger2.MergeType.APPLICATION, diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index 3d22c2c0..96461230 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -417,6 +417,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v } class DefaultConfig(var minSdkVersion: String? = null, + val maxSdkVersion: String? = null, var targetSdkVersion: String? = null, var versionCode: Int? = null, var versionName: String? = null) { diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AppInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AppInfo.kt index 28c2bdfd..30144a33 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AppInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AppInfo.kt @@ -20,6 +20,9 @@ class AppInfo(val androidManifest: File, val config: AndroidConfig) { val minSdkVersion: String? get() = config.defaultConfig.minSdkVersion ?: AndroidManifest.getMinSdkVersion(abstractManifest)?.toString() + val maxSdkVersion: Int? + get() = config.defaultConfig.maxSdkVersion?.toInt() + val targetSdkVersion: String? get() = config.defaultConfig.targetSdkVersion ?: AndroidManifest.getTargetSdkVersion(abstractManifest)?.toString()