From 9b6b3db796ca23a36d4e5998236fddf473228bb6 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Sat, 19 Dec 2020 22:57:28 +0100 Subject: [PATCH 1/2] update version of dav4jvm to 2.1.2 Version 1.0 of dav4jvm had a dependency on okio 2.+ This led to the use of okio 2.10.0-SNAPSHOT, which caused "Unresolved reference: ByteString" so talk-android failed to build. This commit sets version 2.1.2 for dav4jvm, which even has no direct dependency for okio any more (but for okhttp instead, which still uses okio 2.9.0). Signed-off-by: Marcel Hibbe --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e60b49a3a..adfcd5bf8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -255,7 +255,7 @@ dependencies { implementation group: 'androidx.emoji', name: 'emoji-bundled', version: '1.0.0' implementation 'org.michaelevans.colorart:library:0.0.3' implementation 'com.google.android:flexbox:2.0.0' - implementation 'com.gitlab.bitfireAT:dav4jvm:1.0' + implementation 'com.gitlab.bitfireAT:dav4jvm:2.1.2' implementation 'org.conscrypt:conscrypt-android:2.4.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' From 731905ef4b6918eb0da12a249369abb3f3b2255e Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 7 Jan 2021 13:18:23 +0100 Subject: [PATCH 2/2] change number of lint warnings (as a workaround because last update was a long time ago) Signed-off-by: Marcel Hibbe --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index caacdd279..0b709a6fe 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 11 errors and 557 warnings + Lint Report: 11 errors and 562 warnings