From 7034e38efd9164d48643258ba034185575ec84ce Mon Sep 17 00:00:00 2001
From: Kizito Nwose <kizitonwose@gmail.com>
Date: Sat, 18 Jan 2025 22:47:33 +0100
Subject: [PATCH] Bump min sdk to 21

---
 .../src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt | 5 +----
 compose-multiplatform/library/build.gradle.kts               | 2 +-
 compose-multiplatform/sample/build.gradle.kts                | 2 +-
 compose/build.gradle.kts                                     | 2 +-
 sample/build.gradle.kts                                      | 2 +-
 view/build.gradle.kts                                        | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt
index b6109384..eff577f7 100644
--- a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt
+++ b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt
@@ -4,7 +4,6 @@ package com.kizitonwose.calendar.buildsrc
 
 import org.gradle.api.JavaVersion
 import org.gradle.jvm.toolchain.JavaLanguageVersion
-import kotlin.math.max
 
 object Config {
     val compatibleJavaVersion = JavaVersion.VERSION_17
@@ -21,9 +20,7 @@ object Version {
 private val VERSION_NO_PUBLISH = "NO_PUBLISH"
 
 object Android {
-    const val minSdkViewLibrary = 19
-    const val minSdkComposeLibrary = 21
-    val minSdkSampleApp = max(minSdkViewLibrary, minSdkComposeLibrary)
+    const val minSdk = 21
     const val targetSdk = 35
     const val compileSdk = 35
 }
diff --git a/compose-multiplatform/library/build.gradle.kts b/compose-multiplatform/library/build.gradle.kts
index 77a9e649..043b0970 100644
--- a/compose-multiplatform/library/build.gradle.kts
+++ b/compose-multiplatform/library/build.gradle.kts
@@ -97,7 +97,7 @@ android {
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
-        minSdk = Android.minSdkComposeLibrary
+        minSdk = Android.minSdk
     }
     packaging {
         resources {
diff --git a/compose-multiplatform/sample/build.gradle.kts b/compose-multiplatform/sample/build.gradle.kts
index 49dc3415..0491bf9b 100644
--- a/compose-multiplatform/sample/build.gradle.kts
+++ b/compose-multiplatform/sample/build.gradle.kts
@@ -98,7 +98,7 @@ android {
 
     defaultConfig {
         applicationId = "com.kizitonwose.calendar.compose.multiplatform.sample"
-        minSdk = Android.minSdkSampleApp
+        minSdk = Android.minSdk
         targetSdk = Android.targetSdk
         versionCode = 1
         versionName = "1.0"
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
index 7529aa2e..66265b9a 100644
--- a/compose/build.gradle.kts
+++ b/compose/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = Android.compileSdk
     namespace = "com.kizitonwose.calendar.compose"
     defaultConfig {
-        minSdk = Android.minSdkComposeLibrary
+        minSdk = Android.minSdk
     }
     java {
         toolchain {
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 3589eb88..0608edb7 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -13,7 +13,7 @@ android {
     namespace = "com.kizitonwose.calendar.sample"
     defaultConfig {
         applicationId = "com.kizitonwose.calendar.sample"
-        minSdk = Android.minSdkSampleApp
+        minSdk = Android.minSdk
         targetSdk = Android.targetSdk
         versionCode = 1
         versionName = "1.0"
diff --git a/view/build.gradle.kts b/view/build.gradle.kts
index b2d80676..f832648e 100644
--- a/view/build.gradle.kts
+++ b/view/build.gradle.kts
@@ -12,7 +12,7 @@ android {
     compileSdk = Android.compileSdk
     namespace = "com.kizitonwose.calendar.view"
     defaultConfig {
-        minSdk = Android.minSdkViewLibrary
+        minSdk = Android.minSdk
     }
     java {
         toolchain {