aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle8
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt15
-rw-r--r--gradle.properties2
3 files changed, 7 insertions, 18 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 5a4acdfb..23ba05d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -144,6 +144,10 @@ android {
}
}
+ androidExtensions {
+ experimental = true
+ }
+
}
repositories {
@@ -233,10 +237,6 @@ dependencies {
implementation "co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}"
- implementation "nz.bradcampbell:paperparcel:${PAPER_PARCEL}"
- implementation "nz.bradcampbell:paperparcel-kotlin:${PAPER_PARCEL}"
- kapt "nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}"
-
implementation "com.bugsnag:bugsnag-android:${BUGSNAG}"
implementation "com.davemorrissey.labs:subsampling-scale-image-view:${SCALE_IMAGE_VIEW}"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
index db3bf973..8678f997 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
@@ -16,7 +16,6 @@
*/
package com.pitchedapps.frost.dbflow
-import android.os.Parcel
import android.os.Parcelable
import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.pitchedapps.frost.facebook.FbItem
@@ -37,7 +36,7 @@ import com.raizlabs.android.dbflow.kotlinextensions.where
import com.raizlabs.android.dbflow.structure.BaseModel
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
-import paperparcel.PaperParcel
+import kotlinx.android.parcel.Parcelize
import java.net.UnknownHostException
/**
@@ -50,18 +49,10 @@ object CookiesDb {
const val VERSION = 2
}
-@PaperParcel
+@Parcelize
@Table(database = CookiesDb::class, allFields = true, primaryKeyConflict = ConflictAction.REPLACE)
data class CookieModel(@PrimaryKey var id: Long = -1L, var name: String? = null, var cookie: String? = null) :
- BaseModel(), Parcelable {
- companion object {
- @JvmField
- val CREATOR = PaperParcelCookieModel.CREATOR
- }
-
- override fun describeContents() = 0
- override fun writeToParcel(dest: Parcel, flags: Int) = PaperParcelCookieModel.writeToParcel(this, dest, flags)
-}
+ BaseModel(), Parcelable
fun loadFbCookie(id: Long): CookieModel? =
(select from CookieModel::class where (CookieModel_Table.id eq id)).querySingle()
diff --git a/gradle.properties b/gradle.properties
index c78cd10a..62b16ce4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,8 +57,6 @@ LEAK_CANARY=1.6.2
MATERIAL_DRAWER_KT=2.0.1
# https://github.com/square/okhttp/releases
OKHTTP=3.12.1
-# https://github.com/grandstaish/paperparcel/releases
-PAPER_PARCEL=2.0.6
# http://robolectric.org/getting-started/
ROBOELECTRIC=4.1
# https://github.com/ReactiveX/RxAndroid/releases