diff options
| author | Allan Wang <me@allanwang.ca> | 2019-09-29 02:51:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 02:51:02 -0700 |
| commit | 2da6aef03b8a3aba0a76964764f01cd1b26ab401 (patch) | |
| tree | b40f3f7d1b291b0d38b84f7bb36d44863e4cad43 | |
| parent | 8b6daa04fcf0541977defa91b3b624713f831123 (diff) | |
| parent | 980c8ded82e5d8aba4626aed09650dba1992ebf9 (diff) | |
| download | frost-2da6aef03b8a3aba0a76964764f01cd1b26ab401.tar.gz frost-2da6aef03b8a3aba0a76964764f01cd1b26ab401.tar.bz2 frost-2da6aef03b8a3aba0a76964764f01cd1b26ab401.zip | |
Merge branch 'dev' into notification-shortcut
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/proguard-rules.pro | 9 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/Versions.kt | 2 |
3 files changed, 0 insertions, 13 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/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 |