Remove core library desugaring in library (#120)

Author: boguszpawlowski

README.md

@@ -20,6 +20,23 @@ Library is available on Maven Central repository.
 ```
 Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.sonatype.org/content/repositories/snapshots/io/github/boguszpawlowski/composecalendar/).
 
+### 1.3.0 Changes
+From version 1.3.0 library no longer uses `coreLibraryDesugaring` itself. If you are using it in project supporting min SDK < 26, you need to add it to prevent runtime crashes. 
+```kotlin
+  // app-level build.gradle
+  android {
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+  }
+  dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
+  }
+```
+
 ## Supported features
 - Selection (single, multiple or a range of days)
 - Chose day as first day of week
@@ -213,7 +230,7 @@ This implementation of SelectionState also allows for handling side-effects and
 Apart from the default calendar, there is also a week calendar, which shows a single week at a time. It can be used in the same way as the default calendar, and has the same customization options.
 
 ## KotlinX DateTime
-As the core of the library is built on `java.time` library, on Android it requires to use [core libary desugaring](https://developer.android.com/studio/write/java8-support) to be able to access it's API.
+As the core of the library is built on `java.time` library, on Android SDK < 26 it requires to use [core libary desugaring](https://developer.android.com/studio/write/java8-support) to access it's API.
 As a result it's features may be unavailable to some project built around different date-time libraries (e.g. kotlinx-datetime). Although the project wont be migrating from `java.time`, as it's the best suited for it, there is a separate `kotlinx-datetime` artifact for those who need to use the library from a codebase based on it. It doesn't consist of a separate version of `ComposeCalendar` features, but offers a small bunch of utilities, that will enable you to create your own wrapper, as briefly presented in `KotlinDateTimeSample`. If the provided functionality, doesn't match your use-case, please submit an issue.
 
 ## License

build.gradle.kts

@@ -34,6 +34,7 @@ allprojects {
     mavenCentral()
     gradlePluginPortal()
     google()
+    mavenLocal()
   }
 
   tasks.withType<KotlinCompile> {

buildSrc/src/main/kotlin/CommonAndroidPlugin.kt

@@ -20,16 +20,13 @@ class CommonAndroidPlugin : Plugin<Project> {
       compileOptions {
         sourceCompatibility = VERSION_17
         targetCompatibility = VERSION_17
-        isCoreLibraryDesugaringEnabled = true
       }
 
       buildFeatures.compose = true
 
       composeOptions {
         kotlinCompilerExtensionVersion = Compose.CompilerVersion
       }
-
-      target.dependencies.add("coreLibraryDesugaring", Kotlin.DesugarJdkLibs)
     }
   }
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -27,7 +27,7 @@ object Kotlin {
   const val CompatibilityPlugin = "org.jetbrains.kotlinx.binary-compatibility-validator"
   const val CompatibilityPluginId = "binary-compatibility-validator"
 
-  const val DesugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5"
+  const val DesugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.4"
   const val DateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
 }
 

library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt

@@ -2,6 +2,7 @@
 
 package io.github.boguszpawlowski.composecalendar
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
@@ -68,6 +69,7 @@ public class CalendarState<T : SelectionState>(
  * @param monthContainer container composable for all the days in current month
  */
 @Composable
+@SuppressLint("NewApi")
 public fun SelectableCalendar(
   modifier: Modifier = Modifier,
   firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
@@ -122,6 +124,7 @@ public fun SelectableCalendar(
  * @param monthContainer container composable for all the days in current month
  */
 @Composable
+@SuppressLint("NewApi")
 public fun StaticCalendar(
   modifier: Modifier = Modifier,
   firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
@@ -170,6 +173,7 @@ public fun StaticCalendar(
  * @param monthContainer container composable for all the days in current month
  */
 @Composable
+@SuppressLint("NewApi")
 public fun <T : SelectionState> Calendar(
   calendarState: CalendarState<T>,
   modifier: Modifier = Modifier,
@@ -235,6 +239,7 @@ public fun <T : SelectionState> Calendar(
  * @param maxMonth last month that can be shown
  */
 @Composable
+@SuppressLint("NewApi")
 public fun rememberSelectableCalendarState(
   initialMonth: YearMonth = YearMonth.now(),
   minMonth: YearMonth = initialMonth.minusMonths(DefaultCalendarPagerRange),
@@ -264,6 +269,7 @@ public fun rememberSelectableCalendarState(
  * @param maxMonth last month that can be shown
  */
 @Composable
+@SuppressLint("NewApi")
 public fun rememberCalendarState(
   initialMonth: YearMonth = YearMonth.now(),
   minMonth: YearMonth = initialMonth.minusMonths(DefaultCalendarPagerRange),

library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt

@@ -2,6 +2,7 @@
 
 package io.github.boguszpawlowski.composecalendar
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -111,6 +112,7 @@ public fun SelectableWeekCalendar(
  * @param daysOfWeekHeader header for showing captions for each day of week
  */
 @Composable
+@SuppressLint("NewApi")
 public fun StaticWeekCalendar(
   modifier: Modifier = Modifier,
   firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
@@ -153,6 +155,7 @@ public fun StaticWeekCalendar(
  * @param daysOfWeekHeader header for showing captions for each day of week
  */
 @Composable
+@SuppressLint("NewApi")
 public fun <T : SelectionState> WeekCalendar(
   calendarState: WeekCalendarState<T>,
   modifier: Modifier = Modifier,
@@ -211,6 +214,7 @@ public fun <T : SelectionState> WeekCalendar(
  * @param maxWeek last week that can be shown
  */
 @Composable
+@SuppressLint("NewApi")
 public fun rememberSelectableWeekCalendarState(
   firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
   initialWeek: Week = Week.now(firstDayOfWeek),
@@ -243,6 +247,7 @@ public fun rememberSelectableWeekCalendarState(
  * @param maxWeek last week that can be shown
  */
 @Composable
+@SuppressLint("NewApi")
 public fun rememberWeekCalendarState(
   firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
   initialWeek: Week = Week.now(firstDayOfWeek),

library/src/main/java/io/github/boguszpawlowski/composecalendar/day/DefaultDay.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.day
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -26,6 +27,7 @@ import java.time.LocalDate
  * @param onClick callback for interacting with day clicks
  */
 @Composable
+@SuppressLint("NewApi")
 public fun <T : SelectionState> DefaultDay(
   state: DayState<T>,
   modifier: Modifier = Modifier,

library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.header
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -26,6 +27,7 @@ import java.util.Locale
  * 2 arrows for changing currently showed month
  */
 @Composable
+@SuppressLint("NewApi")
 public fun DefaultMonthHeader(
   monthState: MonthState,
   modifier: Modifier = Modifier,

library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.header
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -27,6 +28,7 @@ import java.util.Locale
  */
 @Composable
 @Suppress("LongMethod")
+@SuppressLint("NewApi")
 public fun DefaultWeekHeader(
   weekState: WeekState,
   modifier: Modifier = Modifier,

library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.header
 
+import android.annotation.SuppressLint
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -42,6 +43,7 @@ public interface MonthState {
 }
 
 @Stable
+@SuppressLint("NewApi")
 private class MonthStateImpl(
   initialMonth: YearMonth,
   minMonth: YearMonth,

library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.header
 
+import android.annotation.SuppressLint
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -21,6 +22,7 @@ public fun WeekState(
 )
 
 @Stable
+@SuppressLint("NewApi")
 public interface WeekState {
   public var currentWeek: Week
   public var minWeek: Week

library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt

@@ -33,7 +33,7 @@ import java.time.temporal.ChronoUnit
 
 @OptIn(ExperimentalSnapperApi::class)
 @Composable
-@Suppress("LongMethod")
+@Suppress("LongMethod", "NewApi")
 internal fun <T : SelectionState> MonthPager(
   initialMonth: YearMonth,
   showAdjacentMonths: Boolean,

library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.month
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
@@ -15,6 +16,7 @@ import java.time.YearMonth
 import java.time.temporal.ChronoUnit
 
 @Stable
+@SuppressLint("NewApi")
 internal class MonthListState(
   private val coroutineScope: CoroutineScope,
   private val monthState: MonthState,

library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.selection
 
+import android.annotation.SuppressLint
 import io.github.boguszpawlowski.composecalendar.util.addOrRemoveIfExists
 import java.time.LocalDate
 
@@ -10,6 +11,7 @@ import java.time.LocalDate
  * @param selectionMode current selection mode
  * @returns new selection in a form of a list of local dates.
  */
+@SuppressLint("NewApi")
 public object DynamicSelectionHandler {
   public fun calculateNewSelection(
     date: LocalDate,

library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionExtensions.kt

@@ -1,11 +1,14 @@
 package io.github.boguszpawlowski.composecalendar.selection
 
+import android.annotation.SuppressLint
 import java.time.LocalDate
 
+@SuppressLint("NewApi")
 internal fun Collection<LocalDate>.startOrMax() = firstOrNull() ?: LocalDate.MAX
 
 internal fun Collection<LocalDate>.endOrNull() = drop(1).lastOrNull()
 
+@SuppressLint("NewApi")
 internal fun Collection<LocalDate>.fillUpTo(date: LocalDate) =
   (0..date.toEpochDay() - first().toEpochDay()).map {
     first().plusDays(it)

library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.selection
 
+import android.annotation.SuppressLint
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
@@ -21,6 +22,7 @@ public interface SelectionState {
  * @param confirmSelectionChange return false from this callback to veto the selection change
  */
 @Stable
+@SuppressLint("NewApi")
 public class DynamicSelectionState(
   private val confirmSelectionChange: (newValue: List<LocalDate>) -> Boolean = { true },
   selection: List<LocalDate>,

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.week
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material.Text
@@ -20,6 +21,7 @@ import kotlin.DeprecationLevel.WARNING
   ),
   message = "Replace with DefaultDaysOfWeekHeader, DefaultWeekHeader will be removed in future versions"
 )
+@SuppressLint("NewApi")
 public fun DefaultWeekHeader(
   daysOfWeek: List<DayOfWeek>,
   modifier: Modifier = Modifier,
@@ -38,6 +40,7 @@ public fun DefaultWeekHeader(
 }
 
 @Composable
+@SuppressLint("NewApi")
 public fun DefaultDaysOfWeekHeader(
   daysOfWeek: List<DayOfWeek>,
   modifier: Modifier = Modifier,

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.week
 
+import android.annotation.SuppressLint
 import io.github.boguszpawlowski.composecalendar.selection.fillUpTo
 import io.github.boguszpawlowski.composecalendar.util.daysUntil
 import java.time.DayOfWeek
@@ -9,6 +10,7 @@ import java.time.temporal.ChronoUnit
 import java.time.temporal.WeekFields
 import java.util.Locale
 
+@SuppressLint("NewApi")
 public data class Week(
   val days: List<LocalDate>,
 ) {
@@ -48,5 +50,6 @@ public data class Week(
   }
 }
 
+@SuppressLint("NewApi")
 public fun ChronoUnit.between(first: Week, other: Week): Int =
   between(first.start, other.start).toInt()

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.week
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
@@ -14,6 +15,7 @@ import kotlinx.coroutines.launch
 import java.time.temporal.ChronoUnit
 
 @Stable
+@SuppressLint("NewApi")
 internal class WeekListState(
   private val coroutineScope: CoroutineScope,
   private val weekState: WeekState,

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.week
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.rememberSplineBasedDecay
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
@@ -30,6 +31,7 @@ import java.time.temporal.ChronoUnit
 @OptIn(ExperimentalSnapperApi::class)
 @Composable
 @Suppress("LongMethod")
+@SuppressLint("NewApi")
 internal fun <T : SelectionState> WeekPager(
   initialWeek: Week,
   selectionState: T,

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt

@@ -1,5 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.week
 
+import android.annotation.SuppressLint
 import io.github.boguszpawlowski.composecalendar.day.WeekDay
 import io.github.boguszpawlowski.composecalendar.util.daysUntil
 import java.time.DayOfWeek
@@ -8,10 +9,11 @@ import java.time.YearMonth
 
 internal const val DaysInAWeek = 7
 
+@SuppressLint("NewApi")
 internal fun YearMonth.getWeeks(
   includeAdjacentMonths: Boolean,
   firstDayOfTheWeek: DayOfWeek,
-  today: LocalDate = LocalDate.now(),
+  today: LocalDate,
 ): List<WeekDays> {
   val daysLength = lengthOfMonth()