RALP-4812 Remove threeten package and replace with java.time

README.md

@@ -43,7 +43,7 @@ npm install backpack-react-native --save
     ext {
         compileSdkVersion   = 30
         targetSdkVersion    = 30
-        minSdkVersion       = 24
+        minSdkVersion       = 26
     }
   ```
 

android/app/build.gradle

@@ -183,7 +183,6 @@ dependencies {
     implementation project(':backpack-react-native')
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "com.google.android.material:material:1.5.0"
-    implementation "com.jakewharton.threetenabp:threetenabp:${rootProject.ext.threetenabpVersion}"
 
     androidTestImplementation 'junit:junit:4.13.2'
     androidTestImplementation "androidx.test:runner:1.4.0"

android/app/src/main/java/net/skyscanner/backpack/MainApplication.kt

@@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.shell.MainReactPackage
 import com.facebook.soloader.SoLoader
-import com.jakewharton.threetenabp.AndroidThreeTen
 import net.skyscanner.backpack.reactnative.BackpackReactNative
 import net.skyscanner.backpack.reactnative.button.BpkButtonPackage
 import net.skyscanner.backpack.reactnative.calendar.CalendarPackage
@@ -50,7 +49,6 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    AndroidThreeTen.init(this)
     BackpackReactNative.init(this)
     SoLoader.init(this, /* native exopackage */ false)
   }

android/build.gradle

@@ -23,12 +23,11 @@ ext {
   backpackVersion     = "42.2.2"
   compileSdkVersion   = 33
   targetSdkVersion    = 33
-  minSdkVersion       = 24
+  minSdkVersion       = 26
   androidx            = '1.6.0'
   appcompat           = '1.3.1'
   playServicesVersion = "17.0.0"
   androidMapsUtilsVersion = "xxx"
-  threetenabpVersion = "1.4.0"
   if (System.properties['os.arch'] == "aarch64") {
     // For M1 Users we need to use the NDK 24 which added support for aarch64
     ndkVersion = "24.0.8215888"

lib/android/build.gradle

@@ -25,7 +25,7 @@ def _reactNativeVersion = safeExtGet("reactNative", "+")
 def _backpackAndroidVersion = safeExtGet("backpackVersion", "42.2.2")
 def _compileSdkVersion = safeExtGet("compileSdkVersion", 33)
 def _targetSdkVersion = safeExtGet("targetSdkVersion", 33)
-def _minSdkVersion = safeExtGet("minSdkVersion", 24)
+def _minSdkVersion = safeExtGet("minSdkVersion", 26)
 def _internalBuild = safeExtGet("internalBuild", false)
 
 apply plugin: "com.android.library"
@@ -62,5 +62,4 @@ dependencies {
   compileOnly "com.facebook.react:react-native:${_reactNativeVersion}"
   implementation "net.skyscanner.backpack:backpack-android:${_backpackAndroidVersion}"
   implementation "androidx.constraintlayout:constraintlayout:2.1.3"
-  implementation "com.jakewharton.threetenabp:threetenabp:${rootProject.ext.threetenabpVersion}"
 }

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/CalendarControllerTest.kt

@@ -20,23 +20,16 @@ package net.skyscanner.backpack.reactnative.calendar
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.jakewharton.threetenabp.AndroidThreeTen
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import java.util.Locale
 
 @RunWith(AndroidJUnit4::class)
 class CalendarControllerTest {
 
-  @Before
-  fun setup() {
-    AndroidThreeTen.init(InstrumentationRegistry.getInstrumentation().targetContext)
-  }
-
   @Test
   fun test_is_date_disabled() {
     val controller = CalendarController(

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/CalendarViewManagerTest.kt

@@ -27,7 +27,6 @@ import com.facebook.react.bridge.JavaOnlyMap
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.soloader.SoLoader
-import com.jakewharton.threetenabp.AndroidThreeTen
 import io.mockk.mockk
 import io.mockk.verify
 import net.skyscanner.backpack.calendar.presenter.HighlightedDaysAdapter
@@ -44,7 +43,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 @RunWith(AndroidJUnit4::class)
 class CalendarViewManagerTest {
@@ -70,7 +69,6 @@ class CalendarViewManagerTest {
   fun setup() {
     SoLoader.init(contextRule.context, 0)
 
-    AndroidThreeTen.init(InstrumentationRegistry.getInstrumentation().targetContext)
     date1 = LocalDate.of(2020, 3, 16)
     date2 = LocalDate.of(2020, 3, 20)
   }

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/DateMatcherTest.kt

@@ -20,23 +20,16 @@ package net.skyscanner.backpack.reactnative.calendar
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
-import com.jakewharton.threetenabp.AndroidThreeTen
 import net.skyscanner.backpack.reactnative.testing.Matchers.throws
 import org.hamcrest.Matchers.*
 import org.junit.Assert.*
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 @RunWith(AndroidJUnit4::class)
 class DateMatcherTest {
 
-  @Before
-  fun setup() {
-    AndroidThreeTen.init(InstrumentationRegistry.getInstrumentation().targetContext)
-  }
-
   @Test
   fun test_create_range_matcher_from_js() {
     val startDate = LocalDate.of(2020, 3, 16)

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/RNCalendarViewTest.kt

@@ -20,7 +20,6 @@ package net.skyscanner.backpack.reactnative.calendar
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.jakewharton.threetenabp.AndroidThreeTen
 import net.skyscanner.backpack.calendar.BpkCalendar
 import net.skyscanner.backpack.calendar.model.CalendarCellStyle
 import net.skyscanner.backpack.calendar.model.ColoredBucket
@@ -30,11 +29,10 @@ import net.skyscanner.backpack.reactnative.testing.ReactContextTestRule
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import java.util.*
 
 @RunWith(AndroidJUnit4::class)
@@ -43,11 +41,6 @@ class RNCalendarViewTest {
   @get:Rule
   val contextRule = ReactContextTestRule()
 
-  @Before
-  fun setup() {
-    AndroidThreeTen.init(InstrumentationRegistry.getInstrumentation().targetContext)
-  }
-
   @Test
   fun test_render() {
     val calendar = RNCalendarView(contextRule.context)

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/RNColorBucketTest.kt

@@ -24,7 +24,7 @@ import net.skyscanner.backpack.calendar.model.ColoredBucket
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 @RunWith(AndroidJUnit4::class)
 class RNColorBucketTest {

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/RNFooterViewTest.kt

@@ -33,7 +33,7 @@ import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import java.util.Locale
 
 @RunWith(AndroidJUnit4::class)

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/TypeConversionsTest.kt

@@ -26,7 +26,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 @RunWith(AndroidJUnit4::class)
 class TypeConversionsTest {

lib/android/src/androidTest/java/net/skyscanner/backpack/reactnative/calendar/events/CalendarChangeEventTest.kt

@@ -29,7 +29,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 @RunWith(AndroidJUnit4::class)
 class CalendarChangeEventTest {

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/CalendarController.kt

@@ -23,7 +23,7 @@ import net.skyscanner.backpack.calendar.model.CalendarSelection
 import net.skyscanner.backpack.calendar.presenter.BpkCalendarController
 import net.skyscanner.backpack.calendar.presenter.MonthFooterAdapter
 import net.skyscanner.backpack.calendar.presenter.SelectionType
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import java.util.*
 
 typealias ChangeCallback = (CalendarSelection) -> Unit

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/CalendarViewManager.kt

@@ -30,8 +30,8 @@ import net.skyscanner.backpack.calendar.model.SingleDay
 import net.skyscanner.backpack.calendar.presenter.SelectionType
 import net.skyscanner.backpack.reactnative.calendar.events.CalendarChangeEvent
 import net.skyscanner.backpack.reactnative.extensions.getOptional
-import org.threeten.bp.LocalDate
-import org.threeten.bp.ZoneId
+import java.time.LocalDate
+import java.time.ZoneId
 
 class CalendarViewManager : ViewGroupManager<RNCalendarView>() {
 

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/DateMatcher.kt

@@ -18,7 +18,7 @@
 package net.skyscanner.backpack.reactnative.calendar
 
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
-import org.threeten.bp.LocalDate
+import java.time.bp.LocalDate
 
 interface DateMatcher {
   companion object {

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/RNCalendarView.kt

@@ -29,7 +29,7 @@ import net.skyscanner.backpack.calendar.model.CalendarSelection
 import net.skyscanner.backpack.calendar.model.SingleDay
 import net.skyscanner.backpack.calendar.presenter.SelectionType
 import net.skyscanner.backpack.reactnative.BpkViewStateHolder
-import org.threeten.bp.LocalDate
+import java.time.bp.LocalDate
 import java.util.Locale
 
 @SuppressLint("ViewConstructor")

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/RNColorBucket.kt

@@ -3,7 +3,7 @@ package net.skyscanner.backpack.reactnative.calendar
 import androidx.annotation.ColorInt
 import net.skyscanner.backpack.calendar.model.CalendarCellStyle
 import net.skyscanner.backpack.calendar.model.ColoredBucket
-import org.threeten.bp.LocalDate
+import java.time.bp.LocalDate
 
 internal data class RNColorBucket(
   @ColorInt val color: Int,

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/TypeConversions.kt

@@ -20,8 +20,8 @@ package net.skyscanner.backpack.reactnative.calendar
 
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import net.skyscanner.backpack.calendar.model.CalendarCellStyle
-import org.threeten.bp.Instant
-import org.threeten.bp.LocalDate
+import java.time.Instant
+import java.time.LocalDate
 
 internal object TypeConversions {
   fun stringToCellStyle(cellStyleString: String): CalendarCellStyle {

lib/android/src/main/java/net/skyscanner/backpack/reactnative/calendar/events/CalendarChangeEvent.kt

@@ -22,9 +22,9 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import net.skyscanner.backpack.reactnative.calendar.CalendarViewManager
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalTime
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
 
 class CalendarChangeEvent(
   id: Int,