Replace org.threeten with java.time

app/build.gradle.kts

@@ -139,9 +139,7 @@ val googleplayImplementation by configurations
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.5")
     implementation("com.gitlab.bitfireAT:dav4jvm:2.1")
-    implementation("com.gitlab.bitfireAT:ical4android:1.0") {
+    implementation("com.gitlab.bitfireAT:ical4android:a675c7194b")
-        exclude(group = "org.threeten", module = "threetenbp")
-    }
     implementation("com.gitlab.bitfireAT:cert4android:1488e39a66")
 
     kapt("com.google.dagger:dagger-compiler:${Versions.dagger}")
@@ -172,7 +170,6 @@ dependencies {
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
     implementation("androidx.preference:preference:1.1.1")
     implementation("com.jakewharton.timber:timber:4.7.1")
-    implementation("com.jakewharton.threetenabp:threetenabp:1.2.4")
     implementation("com.jakewharton:process-phoenix:2.0.0")
     implementation("com.google.android.apps.dashclock:dashclock-api:2.0.0")
     implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") {

app/licenses.yml

@@ -249,12 +249,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://github.com/ReactiveX/RxAndroid
-- artifact: org.threeten:threetenbp:+
-  name: ThreeTen backport
-  copyrightHolder: Stephen Colebourne & Michael Nascimento Santos
-  license: BSD 3-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-3-Clause
-  url: https://www.threeten.org/threetenbp
 - artifact: androidx.swiperefreshlayout:swiperefreshlayout:+
   name: Android Support Library Custom View
   copyrightHolder: Android Open Source Project
@@ -407,12 +401,6 @@
   licenseUrl: https://opensource.org/licenses/BSD-2-Clause
   url: https://github.com/mapbox/mapbox-gestures-android
   forceGenerate: true
-- artifact: com.jakewharton.threetenabp:threetenabp:+
-  name: ThreeTenAbp
-  copyrightHolder: Jake Wharton
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/JakeWharton/ThreeTenABP/
 - artifact: androidx.lifecycle:lifecycle-process:+
   name: Android Lifecycle Process
   copyrightHolder: Android Open Source Project
@@ -775,3 +763,16 @@
   license: Mapbox Terms of Service
   licenseUrl: https://www.mapbox.com/tos/
   url: https://github.com/mapbox/mapbox-accounts-android
+- artifact: com.sun.mail:android-mail:+
+  name: android-mail
+  copyrightHolder: Oracle and/or its affiliates
+  license: Eclipse Public License, Version 2.0
+- artifact: commons-io:commons-io:+
+  name: commons-io
+  copyrightHolder: The Apache Software Foundation
+  license: The Apache Software License, Version 2.0
+  url: http://commons.apache.org/proper/commons-io/
+- artifact: com.sun.mail:android-activation:+
+  name: android-activation
+  copyrightHolder: Oracle and/or its affiliates
+  license: Eclipse Public License, Version 2.0

app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.kt

@@ -14,7 +14,7 @@ import org.junit.runner.RunWith
 import org.tasks.Freeze.Companion.freezeAt
 import org.tasks.date.DateTimeUtils
 import org.tasks.time.DateTime
-import org.threeten.bp.format.FormatStyle
+import java.time.format.FormatStyle
 import java.util.*
 
 @RunWith(AndroidJUnit4::class)

app/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.kt

@@ -9,7 +9,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.tasks.Freeze
 import org.tasks.time.DateTime
-import org.threeten.bp.format.FormatStyle
+import java.time.format.FormatStyle
 import java.util.*
 
 @RunWith(AndroidJUnit4::class)

app/src/main/assets/licenses.json

@@ -581,20 +581,6 @@
       "url": "https://github.com/ReactiveX/RxAndroid",
       "libraryName": "RxAndroid"
     },
-    {
-      "artifactId": {
-        "name": "threetenbp",
-        "group": "org.threeten",
-        "version": "+"
-      },
-      "copyrightHolder": "Stephen Colebourne & Michael Nascimento Santos",
-      "copyrightStatement": "Copyright © Stephen Colebourne & Michael Nascimento Santos. All rights reserved.",
-      "license": "BSD 3-Clause",
-      "licenseUrl": "https://opensource.org/licenses/BSD-3-Clause",
-      "normalizedLicense": "bsd_3_clauses",
-      "url": "https://www.threeten.org/threetenbp",
-      "libraryName": "ThreeTen backport"
-    },
     {
       "artifactId": {
         "name": "swiperefreshlayout",
@@ -944,20 +930,6 @@
       "url": "https://github.com/mapbox/mapbox-gestures-android",
       "libraryName": "Mapbox Android Gestures Library"
     },
-    {
-      "artifactId": {
-        "name": "threetenabp",
-        "group": "com.jakewharton.threetenabp",
-        "version": "+"
-      },
-      "copyrightHolder": "Jake Wharton",
-      "copyrightStatement": "Copyright © Jake Wharton. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
-      "normalizedLicense": "apache2",
-      "url": "https://github.com/JakeWharton/ThreeTenABP/",
-      "libraryName": "ThreeTenAbp"
-    },
     {
       "artifactId": {
         "name": "lifecycle-process",
@@ -1817,6 +1789,43 @@
       "normalizedLicense": "Mapbox Terms of Service",
       "url": "https://github.com/mapbox/mapbox-accounts-android",
       "libraryName": "mapbox-android-accounts"
+    },
+    {
+      "artifactId": {
+        "name": "android-mail",
+        "group": "com.sun.mail",
+        "version": "+"
+      },
+      "copyrightHolder": "Oracle and/or its affiliates",
+      "copyrightStatement": "Copyright © Oracle and/or its affiliates. All rights reserved.",
+      "license": "Eclipse Public License, Version 2.0",
+      "normalizedLicense": "Eclipse Public License, Version 2.0",
+      "libraryName": "android-mail"
+    },
+    {
+      "artifactId": {
+        "name": "commons-io",
+        "group": "commons-io",
+        "version": "+"
+      },
+      "copyrightHolder": "The Apache Software Foundation",
+      "copyrightStatement": "Copyright © The Apache Software Foundation. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "normalizedLicense": "apache2",
+      "url": "http://commons.apache.org/proper/commons-io/",
+      "libraryName": "commons-io"
+    },
+    {
+      "artifactId": {
+        "name": "android-activation",
+        "group": "com.sun.mail",
+        "version": "+"
+      },
+      "copyrightHolder": "Oracle and/or its affiliates",
+      "copyrightStatement": "Copyright © Oracle and/or its affiliates. All rights reserved.",
+      "license": "Eclipse Public License, Version 2.0",
+      "normalizedLicense": "Eclipse Public License, Version 2.0",
+      "libraryName": "android-activation"
     }
   ]
 }

app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java

@@ -18,9 +18,9 @@ import org.tasks.BuildConfig;
 import org.tasks.R;
 import org.tasks.locale.Locale;
 import org.tasks.time.DateTime;
-import org.threeten.bp.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatter;
-import org.threeten.bp.format.FormatStyle;
+import java.time.format.FormatStyle;
-import org.threeten.bp.format.TextStyle;
+import java.time.format.TextStyle;
 
 public class DateUtilities {
 

app/src/main/java/org/tasks/Tasks.kt

@@ -7,7 +7,6 @@ import android.util.Log
 import androidx.core.app.JobIntentService
 import androidx.work.Configuration
 import com.jakewharton.processphoenix.ProcessPhoenix
-import com.jakewharton.threetenabp.AndroidThreeTen
 import com.todoroo.astrid.service.Upgrader
 import dagger.Lazy
 import io.reactivex.Completable
@@ -51,7 +50,6 @@ class Tasks : InjectingApplication(), Configuration.Provider {
         }
         buildSetup.setup()
         upgrade()
-        AndroidThreeTen.init(this)
         preferences.isSyncOngoing = false
         ThemeBase.getThemeBase(preferences, inventory, null).setDefaultNightMode()
         localBroadcastManager.registerRefreshReceiver(RefreshBroadcastReceiver())

app/src/main/java/org/tasks/caldav/iCalendar.kt

@@ -41,7 +41,7 @@ class iCalendar @Inject constructor(
         private const val APPLE_SORT_ORDER = "X-APPLE-SORT-ORDER"
 
         private val IS_PARENT = { r: RelatedTo? ->
-            r!!.parameters.isEmpty || r.getParameter(Parameter.RELTYPE) === RelType.PARENT
+            r!!.parameters.isEmpty || r.parameters.getParameter<RelType>(Parameter.RELTYPE) === RelType.PARENT
         }
 
         private val IS_APPLE_SORT_ORDER = { x: Property? ->

app/src/main/java/org/tasks/dialogs/DateTimePicker.kt

@@ -32,7 +32,7 @@ import org.tasks.notifications.NotificationManager
 import org.tasks.preferences.Preferences
 import org.tasks.themes.Theme
 import org.tasks.time.DateTime
-import org.threeten.bp.format.FormatStyle
+import java.time.format.FormatStyle
 import javax.inject.Inject
 
 class DateTimePicker : InjectingBottomSheetDialogFragment() {

app/src/main/java/org/tasks/locale/receiver/TaskerTaskCreator.java

@@ -10,9 +10,9 @@ import com.todoroo.astrid.service.TaskCreator;
 import javax.inject.Inject;
 import org.tasks.locale.bundle.TaskCreationBundle;
 import org.tasks.time.DateTime;
-import org.threeten.bp.LocalDate;
+import java.time.LocalDate;
-import org.threeten.bp.LocalTime;
+import java.time.LocalTime;
-import org.threeten.bp.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatter;
 import timber.log.Timber;
 
 class TaskerTaskCreator {

app/src/main/java/org/tasks/preferences/fragments/DateAndTime.kt

@@ -14,8 +14,8 @@ import org.tasks.locale.Locale
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTime
 import org.tasks.ui.TimePreference
-import org.threeten.bp.DayOfWeek
+import java.time.DayOfWeek
-import org.threeten.bp.format.TextStyle
+import java.time.format.TextStyle
 import javax.inject.Inject
 
 private const val REQUEST_MORNING = 10007

app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java

@@ -16,7 +16,7 @@ import javax.inject.Inject;
 import org.tasks.R;
 import org.tasks.analytics.Firebase;
 import org.tasks.locale.Locale;
-import org.threeten.bp.format.FormatStyle;
+import java.time.format.FormatStyle;
 import timber.log.Timber;
 
 public class RepeatConfirmationReceiver extends BroadcastReceiver {

app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java

@@ -64,7 +64,7 @@ import org.tasks.injection.InjectingDialogFragment;
 import org.tasks.locale.Locale;
 import org.tasks.preferences.ResourceResolver;
 import org.tasks.time.DateTime;
-import org.threeten.bp.format.FormatStyle;
+import java.time.format.FormatStyle;
 import timber.log.Timber;
 
 public class CustomRecurrenceDialog extends InjectingDialogFragment {

app/src/main/java/org/tasks/tasklist/HeaderViewHolder.kt

@@ -10,7 +10,7 @@ import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.core.SortHelper
 import org.tasks.R
 import org.tasks.date.DateTimeUtils.newDateTime
-import org.threeten.bp.format.FormatStyle
+import java.time.format.FormatStyle
 import java.util.*
 
 class HeaderViewHolder(

app/src/main/java/org/tasks/tasklist/TaskViewHolder.java

@@ -31,7 +31,7 @@ import org.tasks.dialogs.Linkify;
 import org.tasks.preferences.Preferences;
 import org.tasks.ui.CheckBoxProvider;
 import org.tasks.ui.ChipProvider;
-import org.threeten.bp.format.FormatStyle;
+import java.time.format.FormatStyle;
 
 public class TaskViewHolder extends RecyclerView.ViewHolder {
 

app/src/main/java/org/tasks/time/DateTime.java

@@ -21,8 +21,8 @@ import java.util.Objects;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import org.tasks.locale.Locale;
-import org.threeten.bp.LocalDate;
+import java.time.LocalDate;
-import org.threeten.bp.LocalDateTime;
+import java.time.LocalDateTime;
 
 public class DateTime {
 

app/src/main/java/org/tasks/ui/DeadlineControlSet.kt

@@ -22,7 +22,7 @@ import org.tasks.injection.FragmentComponent
 import org.tasks.locale.Locale
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTime
-import org.threeten.bp.format.FormatStyle
+import java.time.format.FormatStyle
 import javax.inject.Inject
 
 class DeadlineControlSet : TaskEditControlFragment() {

app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java

@@ -24,7 +24,7 @@ import org.tasks.locale.Locale;
 import org.tasks.preferences.DefaultFilterProvider;
 import org.tasks.preferences.Preferences;
 import org.tasks.ui.CheckBoxProvider;
-import org.threeten.bp.format.FormatStyle;
+import java.time.format.FormatStyle;
 import timber.log.Timber;
 
 class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {