From 2667299e9ecf6eb966efe2a19c1e47bf842850d1 Mon Sep 17 00:00:00 2001 From: Kizito Nwose Date: Sun, 26 May 2024 21:53:14 +0200 Subject: [PATCH] Remove desugar from view and compose module --- .../calendar/buildsrc/Dependencies.kt | 4 ++-- compose/build.gradle | 15 ++++++++------- .../com/kizitonwose/calendar/data/Extensions.kt | 1 + .../com/kizitonwose/calendar/data/MonthData.kt | 1 + .../java/com/kizitonwose/calendar/data/Utils.kt | 1 + .../com/kizitonwose/calendar/data/WeekData.kt | 1 + sample/build.gradle | 15 ++++++++++----- view/build.gradle | 16 ++++++++-------- 8 files changed, 32 insertions(+), 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 index b09791b5..bb65dc69 100644 --- a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt +++ b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt @@ -4,6 +4,7 @@ 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 @@ -11,10 +12,9 @@ object Config { } 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 index 28ae5cb9..e87226ec 100644 --- 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 index 69303a3b..b35d2ac3 100644 --- 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 index 5b38d842..e9045ad8 100644 --- 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 index 33ff3376..3c83c88f 100644 --- 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 index 8652bb7e..862d4d23 100644 --- 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 index 668aa10e..091d632c 100644 --- 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 index d4c8caad..7e986370 100644 --- 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