Change java time lib usages to threetenabp lib

ZuperInc · Apr 5, 2022 · 51ef087 · 51ef087
1 parent ea9bc1b
commit 51ef087
Show file tree

Hide file tree

Showing 26 changed files with 58 additions and 38 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -134,6 +134,12 @@ object Kotest {
   const val Assertions = "io.kotest:kotest-assertions-core-jvm:$Version"
 }
 
+object Jakewharton {
+  private const val Version = "1.4.0"
+
+  const val Threetenabp = "com.jakewharton.threetenabp:threetenabp:$Version"
+}
+
 object ComposeTest {
   const val Core = "androidx.compose.ui:ui-test-junit4:${Compose.Version}"
   const val Manifest = "androidx.compose.ui:ui-test-manifest:${Compose.Version}"

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
   implementation(Compose.Foundation)
   implementation(Compose.FoundationLayout)
   implementation(Compose.Material)
+  implementation(Jakewharton.Threetenabp)
   implementation(Timber.Core)
 
   testImplementation(Kotest.Assertions)

diff --git a/library/src/androidTest/java/io/github/boguszpawlowski/composecalendar/ScrollBehaviorTest.kt b/library/src/androidTest/java/io/github/boguszpawlowski/composecalendar/ScrollBehaviorTest.kt
@@ -9,7 +9,7 @@ import androidx.compose.ui.test.swipeLeft
 import androidx.compose.ui.test.swipeRight
 import org.junit.Rule
 import org.junit.Test
-import java.time.YearMonth
+import org.threeten.bp.YearMonth
 
 internal class ScrollBehaviorTest {
 

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt
@@ -25,10 +25,10 @@ import io.github.boguszpawlowski.composecalendar.selection.SelectionMode
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
 import io.github.boguszpawlowski.composecalendar.week.DefaultWeekHeader
 import io.github.boguszpawlowski.composecalendar.week.rotateRight
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.YearMonth
-import java.time.temporal.WeekFields
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
+import org.threeten.bp.temporal.WeekFields
 import java.util.Locale
 
 /**

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/day/Day.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/day/Day.kt
@@ -1,6 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.day
 
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 /**
  * Container for basic info about the displayed day

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/day/DefaultDay.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/day/DefaultDay.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 /**
  * Default implementation for day content. It supports different appearance for days from

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/day/WeekDay.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/day/WeekDay.kt
@@ -1,7 +1,7 @@
 package io.github.boguszpawlowski.composecalendar.day
 
 import androidx.compose.runtime.Immutable
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 @Immutable
 internal class WeekDay(

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import java.time.format.TextStyle.FULL
+import org.threeten.bp.format.TextStyle.FULL
 import java.util.Locale
 
 /**

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.setValue
-import java.time.YearMonth
+import org.threeten.bp.YearMonth
 
 @Suppress("FunctionName") // Factory function
 public fun MonthState(

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt
@@ -25,9 +25,9 @@ import io.github.boguszpawlowski.composecalendar.pager.toIndex
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
 import io.github.boguszpawlowski.composecalendar.week.WeekContent
 import io.github.boguszpawlowski.composecalendar.week.getWeeks
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.YearMonth
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
 
 internal const val DaysOfWeek = 7
 

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthPagerState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthPagerState.kt
@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.runningFold
-import java.time.YearMonth
+import org.threeten.bp.YearMonth
 
 internal const val PageCount = 3
 

diff --git a/.../main/java/io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler.kt b/.../main/java/io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler.kt
@@ -1,7 +1,7 @@
 package io.github.boguszpawlowski.composecalendar.selection
 
 import io.github.boguszpawlowski.composecalendar.util.addOrRemoveIfExists
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 /**
  * Helper class for calculating new selection, when using a [DynamicSelectionState] approach.

diff --git a/.../src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionExtensions.kt b/.../src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionExtensions.kt
@@ -1,6 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.selection
 
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 internal fun Collection<LocalDate>.startOrMax() = firstOrNull() ?: LocalDate.MAX
 

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt
@@ -7,7 +7,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.setValue
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 @Stable
 public interface SelectionState {

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/DateUtil.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/DateUtil.kt
@@ -1,7 +1,7 @@
 package io.github.boguszpawlowski.composecalendar.util
 
-import java.time.DayOfWeek
-import java.time.LocalDate
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
 
 internal fun Collection<LocalDate>.addOrRemoveIfExists(date: LocalDate) =
   if (contains(date)) {

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/YearMonthExtensions.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/YearMonthExtensions.kt
@@ -1,6 +1,6 @@
 package io.github.boguszpawlowski.composecalendar.util
 
-import java.time.YearMonth
+import org.threeten.bp.YearMonth
 
 internal operator fun YearMonth.dec() = this.minusMonths(1)
 

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt
@@ -6,8 +6,8 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
-import java.time.DayOfWeek
-import java.time.format.TextStyle.SHORT
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.format.TextStyle.SHORT
 import java.util.Locale
 
 @Composable

diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt
@@ -2,9 +2,9 @@ package io.github.boguszpawlowski.composecalendar.week
 
 import io.github.boguszpawlowski.composecalendar.day.WeekDay
 import io.github.boguszpawlowski.composecalendar.util.daysUntil
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.YearMonth
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
 
 private const val DaysInAWeek = 7
 

diff --git a/...y/src/test/java/io/github/boguszpawlowski/composecalendar/selection/SelectionStateTest.kt b/...y/src/test/java/io/github/boguszpawlowski/composecalendar/selection/SelectionStateTest.kt
@@ -6,8 +6,8 @@ import io.kotest.assertions.throwables.shouldNotThrowAny
 import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.shouldBe
-import java.time.LocalDate
-import java.time.Month.APRIL
+import org.threeten.bp.LocalDate
+import org.threeten.bp.Month.APRIL
 
 internal class SelectionStateTest : ShouldSpec({
 

diff --git a/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekUtilTest.kt b/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekUtilTest.kt
@@ -7,11 +7,11 @@ import io.kotest.matchers.collections.shouldContainAll
 import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.shouldBe
-import java.time.DayOfWeek.MONDAY
-import java.time.DayOfWeek.SATURDAY
-import java.time.DayOfWeek.SUNDAY
-import java.time.LocalDate
-import java.time.YearMonth
+import org.threeten.bp.DayOfWeek.MONDAY
+import org.threeten.bp.DayOfWeek.SATURDAY
+import org.threeten.bp.DayOfWeek.SUNDAY
+import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
 
 internal class WeekUtilTest : ShouldSpec({
 

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
   implementation(Compose.Foundation)
   implementation(Compose.FoundationLayout)
   implementation(Compose.Material)
+  implementation(Jakewharton.Threetenabp)
   implementation(Timber.Core)
 
   debugImplementation(Debug.LeakCanary)

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="io.github.boguszpawlowski.composecalendar">
 
     <application
+        android:name=".sample.CalendarApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CalendarApplication.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CalendarApplication.kt
@@ -0,0 +1,11 @@
+package io.github.boguszpawlowski.composecalendar.sample
+
+import android.app.Application
+import com.jakewharton.threetenabp.AndroidThreeTen
+
+public class CalendarApplication: Application() {
+  override fun onCreate() {
+    super.onCreate()
+    AndroidThreeTen.init(this)
+  }
+}
diff --git a/.../src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt b/.../src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt
@@ -25,9 +25,9 @@ import androidx.compose.ui.unit.dp
 import io.github.boguszpawlowski.composecalendar.StaticCalendar
 import io.github.boguszpawlowski.composecalendar.day.NonSelectableDayState
 import io.github.boguszpawlowski.composecalendar.header.MonthState
-import java.time.DayOfWeek
-import java.time.DayOfWeek.SUNDAY
-import java.time.format.TextStyle.NARROW
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.DayOfWeek.SUNDAY
+import org.threeten.bp.format.TextStyle.NARROW
 import java.util.Locale
 
 @Composable

diff --git a/...e/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt b/...e/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt
@@ -11,8 +11,8 @@ import io.github.boguszpawlowski.composecalendar.Calendar
 import io.github.boguszpawlowski.composecalendar.CalendarState
 import io.github.boguszpawlowski.composecalendar.header.MonthState
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
-import java.time.LocalDate
-import java.time.YearMonth
+import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
 
 @Composable
 fun CustomSelectionSample() {

diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt
@@ -39,7 +39,7 @@ import io.github.boguszpawlowski.composecalendar.selection.SelectionMode
 import io.github.boguszpawlowski.composecalendar.selection.SelectionMode.Period
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 /**
  * In this sample, calendar composable is wired with an ViewModel. It's purpose is to show how to use