aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-09-29 02:50:40 -0700
committerGitHub <noreply@github.com>2019-09-29 02:50:40 -0700
commit980c8ded82e5d8aba4626aed09650dba1992ebf9 (patch)
tree9a9ec07e0673cfecd67e4c1e5a803f1c70092dd8
parentc8b32c0b37e0aae1a6df607806c6511ed91082f8 (diff)
parent9021295afa84ebd4839027f56d4c594f3b8cd0da (diff)
downloadfrost-980c8ded82e5d8aba4626aed09650dba1992ebf9.tar.gz
frost-980c8ded82e5d8aba4626aed09650dba1992ebf9.tar.bz2
frost-980c8ded82e5d8aba4626aed09650dba1992ebf9.zip
Merge pull request #1564 from AllanWang/remove-jackson
Remove jackson dependency
-rw-r--r--app/build.gradle2
-rw-r--r--app/proguard-rules.pro9
-rw-r--r--app/src/main/play/en-US/whatsnew2
-rw-r--r--buildSrc/src/main/kotlin/Versions.kt2
4 files changed, 1 insertions, 14 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 745a1559..ee8cf5d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -269,8 +269,6 @@ dependencies {
//noinspection GradleDependency
kapt kau.Dependencies.glideKapt
- implementation "com.fasterxml.jackson.core:jackson-databind:${Versions.jackson}"
-
//noinspection GradleDependency
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanary}"
//noinspection GradleDependency
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cdb57300..bd716244 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -21,15 +21,6 @@
**[] $VALUES;
public *;
}
-# Jackson
--keep @com.fasterxml.jackson.annotation.JsonIgnoreProperties class * { *; }
--keep @com.fasterxml.jackson.annotation.JsonCreator class * { *; }
--keep @com.fasterxml.jackson.annotation.JsonValue class * { *; }
--keep class com.fasterxml.** { *; }
--keepnames class com.fasterxml.jackson.** { *; }
--keepclassmembers public final enum com.fasterxml.jackson.annotation.JsonAutoDetect$Visibility {
- public static final com.fasterxml.jackson.annotation.JsonAutoDetect$Visibility *;
-}
# Kotlin coroutines
-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 02fdef9b..2c68cc55 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -3,4 +3,4 @@ v2.4.1
* Add better support for mobile url conversions
* Notification tab will keep first page in the same window; fixes marking notifications as read
* Fix nav and status bar icon colors for custom themes (Android O+)
-* Fix biometric prompt, and prompt on activity resume
+* Fix biometric prompt, and prompt on activity resume \ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 1e0d972e..9ddde207 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -16,8 +16,6 @@ object Versions {
// https://mvnrepository.com/artifact/androidx.core/core-ktx?repo=google
const val ktx = "1.1.0"
- // https://github.com/FasterXML/jackson-core/releases
- const val jackson = "2.9.8"
// https://github.com/jhy/jsoup/releases
const val jsoup = "1.11.3"
// https://github.com/square/leakcanary/releases