Remove threetenbp

joshfriend · Dec 19, 2021 · 0775e74 · 0775e74
1 parent dd8b1fc
commit 0775e74
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,8 +34,6 @@ allprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         kotlinOptions {
-            // TODO: AGP 4.0 remove threetenabp in favor of this
-//            coreLibraryDesugaringEnabled true
             allWarningsAsErrors = true
 //            jvmTarget = JavaVersion.VERSION_11
         }

diff --git a/bunnies/build.gradle b/bunnies/build.gradle
@@ -22,13 +22,16 @@ android {
         applicationId "com.fueledbycaffeine.bunnypedia"
         minSdkVersion 23
         targetSdkVersion 32
-        versionCode 27
-        versionName "0.20"
+        versionCode 28
+        versionName "0.21"
 
         multiDexEnabled true
     }
 
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+        // Sets Java compatibility to Java 8
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -138,14 +141,14 @@ dependencies {
     // Logging
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.2.2'
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     def ankoVersion = "0.10.8"
     implementation "org.jetbrains.anko:anko-commons:$ankoVersion"
     implementation "org.jetbrains.anko:anko-sdk23:$ankoVersion"
 
     implementation "com.google.firebase:firebase-crashlytics:18.2.6"
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 
 def getPassword(String item) {

diff --git a/bunnies/src/main/java/com/fueledbycaffeine/bunnypedia/database/model/ZodiacSign.kt b/bunnies/src/main/java/com/fueledbycaffeine/bunnypedia/database/model/ZodiacSign.kt
@@ -3,8 +3,8 @@ package com.fueledbycaffeine.bunnypedia.database.model
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.fueledbycaffeine.bunnypedia.R
-import org.threeten.bp.Month
-import org.threeten.bp.MonthDay
+import java.time.Month
+import java.time.MonthDay
 
 enum class ZodiacSign(val element: ZodiacElement, val number: Int) {
   ARIES(ZodiacElement.FIRE, 1),

diff --git a/bunnies/src/main/java/com/fueledbycaffeine/bunnypedia/injection/App.kt b/bunnies/src/main/java/com/fueledbycaffeine/bunnypedia/injection/App.kt
@@ -6,7 +6,6 @@ import com.fueledbycaffeine.bunnypedia.database.RoomAsset
 import com.fueledbycaffeine.bunnypedia.util.CrashlyticsTree
 import com.fueledbycaffeine.bunnypedia.util.configureStrictMode
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.jakewharton.threetenabp.AndroidThreeTen
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import org.jetbrains.anko.defaultSharedPreferences
@@ -41,8 +40,6 @@ class App : DaggerApplication() {
     FirebaseCrashlytics.getInstance()
       .setCrashlyticsCollectionEnabled(BuildConfig.DEBUG.not())
 
-    AndroidThreeTen.init(this)
-
     this.configureStrictMode()
   }
 

diff --git a/...es/src/main/java/com/fueledbycaffeine/bunnypedia/ui/card/details/CardSectionViewHolder.kt b/...es/src/main/java/com/fueledbycaffeine/bunnypedia/ui/card/details/CardSectionViewHolder.kt
@@ -23,9 +23,9 @@ import com.fueledbycaffeine.bunnypedia.ui.EpoxyLayoutContainer
 import com.fueledbycaffeine.bunnypedia.ui.GlideApp
 import com.google.android.flexbox.FlexboxLayout
 import kotlinx.android.synthetic.main.card_hero_details.view.*
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.format.DateTimeFormatter
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 class CardSectionViewHolder : EpoxyLayoutContainer() {
   companion object {