Remove desugar from view and compose module

kizitonwose · May 26, 2024 · 2667299 · 2667299
1 parent ba6e8fd
commit 2667299
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 22 deletions.
diff --git a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt
@@ -4,17 +4,17 @@ 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
     val compatibleJavaLanguageVersion = JavaLanguageVersion.of(compatibleJavaVersion.majorVersion.toInt())
 }
 
 object Android {
-    const val minSdkLibraryCore = 4
     const val minSdkLibraryView = 15
     const val minSdkLibraryCompose = 21
-    const val minSdkSample = 21
+    val minSdkSample = max(minSdkLibraryView, minSdkLibraryCompose)
     const val targetSdk = 33
     const val compileSdk = 34
 

diff --git a/compose/build.gradle b/compose/build.gradle
@@ -14,13 +14,15 @@ android {
         minSdkVersion Android.minSdkLibraryCompose
         targetSdkVersion Android.targetSdk
     }
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility = Config.compatibleJavaVersion
-        targetCompatibility = Config.compatibleJavaVersion
+    java {
+        toolchain {
+            languageVersion = Config.compatibleJavaLanguageVersion
+        }
     }
-    kotlinOptions {
-        jvmTarget = Config.compatibleJavaVersion
+    kotlin {
+        jvmToolchain {
+            languageVersion = Config.compatibleJavaLanguageVersion
+        }
     }
     buildFeatures {
         compose true
@@ -33,7 +35,6 @@ android {
 dependencies {
     api project(':core')
     implementation project(':data')
-    coreLibraryDesugaring Libs.Core.deSugar
     implementation Kotlin.stdLib
 
     implementation Libs.Compose.ui

diff --git a/data/src/main/java/com/kizitonwose/calendar/data/Extensions.kt b/data/src/main/java/com/kizitonwose/calendar/data/Extensions.kt
@@ -1,3 +1,4 @@
+@file:Suppress("NewApi")
 package com.kizitonwose.calendar.data
 
 import java.time.DayOfWeek

diff --git a/data/src/main/java/com/kizitonwose/calendar/data/MonthData.kt b/data/src/main/java/com/kizitonwose/calendar/data/MonthData.kt
@@ -1,3 +1,4 @@
+@file:Suppress("NewApi")
 package com.kizitonwose.calendar.data
 
 import com.kizitonwose.calendar.core.CalendarDay

diff --git a/data/src/main/java/com/kizitonwose/calendar/data/Utils.kt b/data/src/main/java/com/kizitonwose/calendar/data/Utils.kt
@@ -1,3 +1,4 @@
+@file:Suppress("NewApi")
 package com.kizitonwose.calendar.data
 
 import java.time.LocalDate

diff --git a/data/src/main/java/com/kizitonwose/calendar/data/WeekData.kt b/data/src/main/java/com/kizitonwose/calendar/data/WeekData.kt
@@ -1,3 +1,4 @@
+@file:Suppress("NewApi")
 package com.kizitonwose.calendar.data
 
 import com.kizitonwose.calendar.core.Week

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -26,13 +26,18 @@ android {
             minifyEnabled false
         }
     }
+    java {
+        toolchain {
+            languageVersion = Config.compatibleJavaLanguageVersion
+        }
+    }
+    kotlin {
+        jvmToolchain {
+            languageVersion = Config.compatibleJavaLanguageVersion
+        }
+    }
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility = Config.compatibleJavaVersion
-        targetCompatibility = Config.compatibleJavaVersion
-    }
-    kotlinOptions {
-        jvmTarget = Config.compatibleJavaVersion
     }
     composeOptions {
         kotlinCompilerExtensionVersion Android.composeCompiler

diff --git a/view/build.gradle b/view/build.gradle
@@ -13,22 +13,22 @@ android {
     defaultConfig {
         minSdkVersion Android.minSdkLibraryView
         targetSdkVersion Android.targetSdk
-        multiDexEnabled true // Needed for desugar because minSdk < 21
     }
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility = Config.compatibleJavaVersion
-        targetCompatibility = Config.compatibleJavaVersion
+    java {
+        toolchain {
+            languageVersion = Config.compatibleJavaLanguageVersion
+        }
     }
-    kotlinOptions {
-        jvmTarget = Config.compatibleJavaVersion
+    kotlin {
+        jvmToolchain {
+            languageVersion = Config.compatibleJavaLanguageVersion
+        }
     }
 }
 
 dependencies {
     api project(':core')
     implementation project(':data')
-    coreLibraryDesugaring Libs.Core.deSugar
     implementation Kotlin.stdLib
     implementation Libs.View.coreKtx