Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03a44a6 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'issue-130' into 'master'

Updates based on greatest version code

See merge request e/apps/apps!25
parents 183c02c5 d8b07401
Loading
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ dependencies {
    implementation 'androidx.recyclerview:recyclerview:1.0.0'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
    testImplementation 'junit:junit:4.12'
    implementation files('libs/jackson-databind-2.9.7.jar')
    implementation files('libs/jackson-annotations-2.9.7.jar')
    implementation files('libs/jackson-core-2.9.7.jar')
    implementation group: 'commons-codec', name: 'commons-codec', version: '1.11'
    implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
    implementation 'org.bouncycastle:bcpg-jdk15on:1.60'
@@ -82,7 +79,11 @@ dependencies {
    implementation 'com.trello.rxlifecycle3:rxlifecycle-components-preference:3.1.0'
    implementation 'com.makeramen:roundedimageview:2.3.0'

    implementation 'com.github.chrisbanes:PhotoView:2.3.0'

    // Jackson
    implementation "com.fasterxml.jackson.core:jackson-core:2.11.1"
    implementation "com.fasterxml.jackson.core:jackson-annotations:2.11.1"
    implementation "com.fasterxml.jackson.core:jackson-databind:2.11.1"
    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1"

    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
}
−65.4 KiB

File deleted.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

app/libs/jackson-core-2.9.7.jar

deleted100644 → 0
−316 KiB

File deleted.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

−1.29 MiB

File deleted.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

+14 −0
Original line number Diff line number Diff line
@@ -19,3 +19,17 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

# Without these lines, jackson will fail to create any immutable/nonnull kotlin classes
-keep class kotlin.* { *; }
-keep class kotlin.Metadata { *; }
-dontwarn kotlin.**
-keepclassmembers class **$WhenMappings {
    <fields>;
}
-keepclassmembers class kotlin.Metadata {
    public <methods>;
}
-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
}
Loading