From Joda-Time to ThreeTenABP

app/build.gradle

@@ -138,6 +138,7 @@ dependencies {
     compile "com.jakewharton:butterknife:$butterknifeVersion"
     kapt "com.jakewharton:butterknife-compiler:$butterknifeVersion"
     compile 'com.jakewharton.timber:timber:4.5.1'
+    compile 'com.jakewharton.threetenabp:threetenabp:1.0.5'
     compile 'org.greenrobot:eventbus:3.0.0'
@@ -146,8 +147,6 @@ dependencies {
     compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
-    compile 'net.danlew:android.joda:2.9.9'
-
     compile "org.parceler:parceler-api:$parcelerVersion"
     kapt "org.parceler:parceler:$parcelerVersion"

app/src/main/java/com/commit451/gitlab/App.kt

@@ -13,11 +13,11 @@ import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.model.Account
 import com.commit451.gitlab.util.FabricUtil
 import com.commit451.lift.Lift
+import com.jakewharton.threetenabp.AndroidThreeTen
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs
 import com.squareup.leakcanary.LeakCanary
 import com.squareup.picasso.Picasso
 import io.reactivex.plugins.RxJavaPlugins
-import net.danlew.android.joda.JodaTimeAndroid
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.greenrobot.eventbus.EventBus
@@ -61,6 +61,8 @@ open class App : Application() {
             Timber.e(error)
         }
+        AndroidThreeTen.init(this)
+
         Prefs.init(this)
         //So that we don't get weird half translations
         forceLocale(Locale.ENGLISH)
@@ -70,7 +72,6 @@ open class App : Application() {
             Timber.plant(Timber.DebugTree())
         }
-        JodaTimeAndroid.init(this)
         SimpleChromeCustomTabs.initialize(this)
         val accounts = Account.getAccounts()

app/src/main/java/com/commit451/gitlab/api/rss/DateTransform.kt

 package com.commit451.gitlab.api.rss
-import com.commit451.gitlab.util.ConversionUtil
 import org.simpleframework.xml.transform.Transform
+import org.threeten.bp.Instant
+import org.threeten.bp.format.DateTimeFormatter
 import java.util.*
 /**
@@ -11,11 +12,11 @@ class DateTransform : Transform<Date> {
     @Throws(Exception::class)
     override fun read(value: String): Date? {
-        return ConversionUtil.toDate(value)
+        return Date(Instant.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(value)).toEpochMilli())
     }
     @Throws(Exception::class)
     override fun write(value: Date): String {
-        return ConversionUtil.fromDate(value)
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(Instant.ofEpochMilli(value.time))
     }
 }

app/src/main/java/com/commit451/gitlab/util/ConversionUtil.kt

@@ -2,27 +2,12 @@ package com.commit451.gitlab.util
 import android.net.Uri
 import com.commit451.gitlab.model.Account
-import org.joda.time.DateTime
-import org.joda.time.format.ISODateTimeFormat
-import java.util.*
 /**
  * Converts things!
  */
 object ConversionUtil {
-    fun fromDate(date: Date): String {
-        return ISODateTimeFormat.dateTime().print(DateTime(date))
-    }
-
-    fun toDate(dateString: String?): Date? {
-        if (dateString == null || dateString.isEmpty()) {
-            return null
-        }
-
-        return ISODateTimeFormat.dateTimeParser().parseDateTime(dateString).toDate()
-    }
-
     fun fromUri(uri: Uri?): String? {
         if (uri == null) {
             return null