From 5e23dc4b4c4cf0c65156b8a4bd34abfe7f263a9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 01:03:51 +0000 Subject: [PATCH 1/3] Bump jackson-core from 2.10.1 to 2.12.3 Bumps [jackson-core](https://github.com/FasterXML/jackson-core) from 2.10.1 to 2.12.3. - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.10.1...jackson-core-2.12.3) Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ea2a974ba..3d20df1c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -178,7 +178,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2' implementation 'com.bluelinelabs:logansquare:1.3.7' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.1' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.3' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' implementation 'com.squareup.retrofit2:retrofit:2.7.1' From fa1360090a51e2fa200b0f7bdfdacdb60c7b7994 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 23 Apr 2021 10:23:41 +0200 Subject: [PATCH 2/3] improve logging for LoganSquareJodaTimeConverter Signed-off-by: Andy Scherzinger --- .../models/json/converters/LoganSquareJodaTimeConverter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java index 65f5d792a..becd71dc7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java @@ -31,6 +31,7 @@ import org.joda.time.DateTime; import java.io.IOException; public class LoganSquareJodaTimeConverter implements TypeConverter { + private static final String TAG = LoganSquareJodaTimeConverter.class.getSimpleName(); @Override public DateTime parse(JsonParser jsonParser) throws IOException { @@ -41,7 +42,7 @@ public class LoganSquareJodaTimeConverter implements TypeConverter { try { return DateTime.parse(dateString); } catch (final RuntimeException exception) { - Log.e("NC", exception.getLocalizedMessage()); + Log.e(TAG, exception.getLocalizedMessage(), exception); } return null; } @@ -54,4 +55,4 @@ public class LoganSquareJodaTimeConverter implements TypeConverter { jsonGenerator.writeString(object != null ? object.toString() : null); } } -} \ No newline at end of file +} From 7fa43ba9e25dad6722ac07d310957a7b360fa941 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 23 Apr 2021 10:49:02 +0200 Subject: [PATCH 3/3] unify dependency syntax and bump joda-time to latest patch version Signed-off-by: Andy Scherzinger --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3d20df1c7..28bc439ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -178,7 +178,7 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2' implementation 'com.bluelinelabs:logansquare:1.3.7' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.3' + implementation 'com.fasterxml.jackson.core:jackson-core:2.12.3' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' 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:animated-gif: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-gif:${coilKtVersion}" implementation "io.coil-kt:coil-svg:${coilKtVersion}"