Commit 90c65dc7 authored by Christophe Henry's avatar Christophe Henry

Solves Jackson's 2.9.7 version breaking compatibility with Android API level < 24

See https://github.com/FasterXML/jackson-module-kotlin/issues/176
parent 38925a46
...@@ -46,15 +46,17 @@ dependencies { ...@@ -46,15 +46,17 @@ dependencies {
def lifecycle_version = "2.0.0" def lifecycle_version = "2.0.0"
def room_version = "2.1.0-alpha04" def room_version = "2.1.0-alpha04"
def fuel_version = "2.0.1" def fuel_version = "2.0.1"
def jackson_version = "2.9.7" def jackson_version = "2.9.6"
def espresso_version = "3.1.1" def espresso_version = "3.1.1"
def test_runnner_version = "1.1.1" def test_runnner_version = "1.1.1"
def promise_version = "3.3.0" def promise_version = "3.3.0"
def android_support_version = "28.0.0" def android_support_version = "28.0.0"
def android_navigation = "1.0.0-rc02" def android_navigation = "1.0.0-rc02"
configurations { configurations {
all*.exclude group: 'com.google.guava', module: 'listenablefuture' all*.exclude group: 'com.google.guava', module: 'listenablefuture'
} }
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
...@@ -94,7 +96,8 @@ dependencies { ...@@ -94,7 +96,8 @@ dependencies {
// HTTP and promises // HTTP and promises
implementation "com.github.kittinunf.fuel:fuel:$fuel_version" implementation "com.github.kittinunf.fuel:fuel:$fuel_version"
implementation "com.github.kittinunf.fuel:fuel-android:$fuel_version" implementation "com.github.kittinunf.fuel:fuel-android:$fuel_version"
implementation "com.github.kittinunf.fuel:fuel-jackson:$fuel_version" implementation("com.github.kittinunf.fuel:fuel-jackson:$fuel_version") { transitive = false }
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
implementation "nl.komponents.kovenant:kovenant:$promise_version" implementation "nl.komponents.kovenant:kovenant:$promise_version"
implementation "nl.komponents.kovenant:kovenant-android:$promise_version" implementation "nl.komponents.kovenant:kovenant-android:$promise_version"
...@@ -113,6 +116,5 @@ dependencies { ...@@ -113,6 +116,5 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
// Debug // Debug
// implementation "com.facebook.stetho:stetho:1.5.0" // implementation "com.facebook.stetho:stetho:1.5.0"
} }
...@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationContext ...@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationContext
import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.deser.std.StringDeserializer import com.fasterxml.jackson.databind.deser.std.StringDeserializer
import fr.chenry.android.freshrss.BR import fr.chenry.android.freshrss.BR
import fr.chenry.android.freshrss.utils.escapeHtml4 import fr.chenry.android.freshrss.utils.unescapeHtml4
typealias StreamId = String typealias StreamId = String
...@@ -37,5 +37,5 @@ data class SubscriptionCategory( ...@@ -37,5 +37,5 @@ data class SubscriptionCategory(
) )
class HtmlEntitiesDeserializer: StringDeserializer() { class HtmlEntitiesDeserializer: StringDeserializer() {
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?) = super.deserialize(p, ctxt).escapeHtml4() override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?) = super.deserialize(p, ctxt).unescapeHtml4()
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment