gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-24 06:00:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1151 from nextcloud/50f4dependabot/gradle/com.fasterxml.jackson.core-jackson-core-2.12.3

Browse Source 
Bump jackson-core from 2.10.1 to 2.12.3 + joda-time
This commit is contained in:
Andy Scherzinger 2021-04-27 15:01:12 +02:00 committed by GitHub
commit 42dab815af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -178,7 +178,7 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2' implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2'
implementation 'com.bluelinelabs:logansquare:1.3.7' implementation 'com.bluelinelabs:logansquare:1.3.7'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.1' implementation 'com.fasterxml.jackson.core:jackson-core:2.12.3'
kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7'
implementation 'com.squareup.retrofit2:retrofit:2.7.1' implementation 'com.squareup.retrofit2:retrofit:2.7.1'
@ -224,7 +224,7 @@ dependencies {
implementation 'com.github.mario.fresco:webpsupport:111' implementation 'com.github.mario.fresco:webpsupport:111'
implementation 'com.github.mario.fresco:animated-gif:111' implementation 'com.github.mario.fresco:animated-gif:111'
implementation 'com.github.mario.fresco:imagepipeline-okhttp3:111' implementation 'com.github.mario.fresco:imagepipeline-okhttp3:111'
implementation group: 'joda-time', name: 'joda-time', version: '2.10.3' implementation 'joda-time:joda-time:2.10.10'
implementation "io.coil-kt:coil:${coilKtVersion}" implementation "io.coil-kt:coil:${coilKtVersion}"
implementation "io.coil-kt:coil-gif:${coilKtVersion}" implementation "io.coil-kt:coil-gif:${coilKtVersion}"
implementation "io.coil-kt:coil-svg:${coilKtVersion}" implementation "io.coil-kt:coil-svg:${coilKtVersion}"

3
app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java
View File

@ -31,6 +31,7 @@ import org.joda.time.DateTime;
import java.io.IOException; import java.io.IOException;
public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> { public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
private static final String TAG = LoganSquareJodaTimeConverter.class.getSimpleName();
@Override @Override
public DateTime parse(JsonParser jsonParser) throws IOException { public DateTime parse(JsonParser jsonParser) throws IOException {
@ -41,7 +42,7 @@ public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
try { try {
return DateTime.parse(dateString); return DateTime.parse(dateString);
} catch (final RuntimeException exception) { } catch (final RuntimeException exception) {
Log.e("NC", exception.getLocalizedMessage()); Log.e(TAG, exception.getLocalizedMessage(), exception);
} }
return null; return null;
} }