From c0af24f25b3dd1f3aee8b1920da8b3fa93c9c9da Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 30 Apr 2021 11:56:37 +0200 Subject: [PATCH 1/2] replace forks: chatkit, fresco, popupBubble Signed-off-by: Marcel Hibbe --- app/build.gradle | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f3054a3d5..10d1e1272 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,8 +3,10 @@ * * @author Mario Danic * @author Andy Scherzinger + * @author Marcel Hibbe * Copyright (C) 2021 Andy Scherzinger * Copyright (C) 2017-2019 Mario Danic + * Copyright (C) 2021 Marcel Hibbe * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -238,15 +240,15 @@ 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.mario:chatkit:c6a61767291ddb212a2f4f792a2b6aaf295e69a5', { + implementation('com.github.mahibi:ChatKit:master-SNAPSHOT', { exclude group: 'com.facebook.fresco' }) - implementation 'com.github.mario.fresco:fresco:111' - implementation 'com.github.mario.fresco:animated-webp:111' - implementation 'com.github.mario.fresco:webpsupport:111' - implementation 'com.github.mario.fresco:animated-gif:111' - implementation 'com.github.mario.fresco:imagepipeline-okhttp3:111' + implementation 'com.github.mahibi.fresco:fresco:111' + implementation 'com.github.mahibi.fresco:animated-webp:111' + implementation 'com.github.mahibi.fresco:webpsupport:111' + implementation 'com.github.mahibi.fresco:animated-gif:111' + implementation 'com.github.mahibi.fresco:imagepipeline-okhttp3:111' implementation 'joda-time:joda-time:2.10.10' implementation "io.coil-kt:coil:${coilKtVersion}" implementation "io.coil-kt:coil-gif:${coilKtVersion}" @@ -258,7 +260,7 @@ dependencies { implementation 'com.novoda:merlin:1.2.1' implementation 'com.github.Kennyc1012:BottomSheet:2.4.1' - implementation 'com.github.mario:PopupBubble:a365177d96' + implementation 'com.github.mahibi:PopupBubble:master-SNAPSHOT' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'eu.medsea.mimeutil:mime-util:2.1.3' From 0649d9daa771f31f95fa8212fc2b6d89487742ae Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 5 May 2021 11:03:50 +0200 Subject: [PATCH 2/2] update to forked releases from Nextcloud organisation Signed-off-by: Andy Scherzinger --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 10d1e1272..4c087c206 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -240,15 +240,15 @@ 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.mahibi:ChatKit:master-SNAPSHOT', { + implementation('com.github.nextcloud:ChatKit:c6a6176729', { exclude group: 'com.facebook.fresco' }) - implementation 'com.github.mahibi.fresco:fresco:111' - implementation 'com.github.mahibi.fresco:animated-webp:111' - implementation 'com.github.mahibi.fresco:webpsupport:111' - implementation 'com.github.mahibi.fresco:animated-gif:111' - implementation 'com.github.mahibi.fresco:imagepipeline-okhttp3:111' + implementation 'com.github.nextcloud.fresco:fresco:v111' + implementation 'com.github.nextcloud.fresco:animated-webp:v111' + implementation 'com.github.nextcloud.fresco:webpsupport:v111' + implementation 'com.github.nextcloud.fresco:animated-gif:v111' + implementation 'com.github.nextcloud.fresco:imagepipeline-okhttp3:v111' implementation 'joda-time:joda-time:2.10.10' implementation "io.coil-kt:coil:${coilKtVersion}" implementation "io.coil-kt:coil-gif:${coilKtVersion}" @@ -260,7 +260,7 @@ dependencies { implementation 'com.novoda:merlin:1.2.1' implementation 'com.github.Kennyc1012:BottomSheet:2.4.1' - implementation 'com.github.mahibi:PopupBubble:master-SNAPSHOT' + implementation 'com.github.nextcloud:PopupBubble:master-SNAPSHOT' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'eu.medsea.mimeutil:mime-util:2.1.3'