From 42a631a22b8b9a68eb51fa1fc33f7aeadcc7fb6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 01:57:27 +0000 Subject: [PATCH 1/3] Build(deps): Bump com.vanniktech:emoji-google from 0.15.0 to 0.16.0 Bumps [com.vanniktech:emoji-google](https://github.com/vanniktech/Emoji) from 0.15.0 to 0.16.0. - [Release notes](https://github.com/vanniktech/Emoji/releases) - [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md) - [Commits](https://github.com/vanniktech/Emoji/compare/0.15.0...0.16.0) --- updated-dependencies: - dependency-name: com.vanniktech:emoji-google dependency-type: direct:production update-type: version-update:semver-minor ... 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 b511755d7..dbca8aba7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation "com.vanniktech:emoji-google:0.15.0" + implementation "com.vanniktech:emoji-google:0.16.0" implementation "androidx.emoji2:emoji2:${emojiVersion}" implementation "androidx.emoji2:emoji2-bundled:${emojiVersion}" implementation "androidx.emoji2:emoji2-views:${emojiVersion}" From c033b0367e8edc156b2a7fbf856824f3fccd681a Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 30 Mar 2023 17:23:50 +0200 Subject: [PATCH 2/3] update to compatible flexbox Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index dbca8aba7..32c9625e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -187,7 +187,7 @@ dependencies { implementation "androidx.work:work-rxjava2:${workVersion}" implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' androidTestImplementation "androidx.work:work-testing:${workVersion}" - implementation 'com.google.android:flexbox:2.0.1' + implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation ('com.gitlab.bitfireAT:dav4jvm:2.1.3', { exclude group: 'org.ogce', module: 'xpp3' // Android comes with its own XmlPullParser }) From 16b930fac8fcc5ec365ad20b1dab7d406422ec26 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 30 Mar 2023 22:08:31 +0200 Subject: [PATCH 3/3] prevent duplicate classes due to dependency rename Signed-off-by: Andy Scherzinger --- app/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 32c9625e3..49fbfcce0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -248,7 +248,9 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'com.github.wooplr:Spotlight:1.3' implementation 'com.google.code.findbugs:jsr305:3.0.2' - implementation 'com.github.nextcloud-deps:ChatKit:0.4.0' + implementation ('com.github.nextcloud-deps:ChatKit:0.4.0', { + exclude group: 'com.google.android', module: 'flexbox' // replaced by v3 not yet used here + }) implementation 'joda-time:joda-time:2.12.4' implementation "io.coil-kt:coil:${coilKtVersion}"