From 27e6d813f69e2120cf45ca755a48eaf5cddc3adc Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 29 May 2023 16:17:46 +0300
Subject: [PATCH] Move retrofit to core
---
app/build.gradle | 10 ----------
.../feature/notifications/ShortcutCreator.kt | 6 +++---
core/build.gradle | 19 +++++++++++--------
3 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index dc35fb25c..1d69828ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,7 +66,6 @@ dependencies {
implementation project(path: ':core')
implementation project(path: ':auth')
-
//ExoPlayer
implementation 'com.google.android.exoplayer:exoplayer:2.18.7'
@@ -85,19 +84,10 @@ dependencies {
//Emoji
implementation "com.vanniktech:emoji-google:0.16.0"
- //Retrofit2
- def retrofit_version = '2.9.0'
- implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
- implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-
- //Gson
- implementation 'com.google.code.gson:gson:2.10'
-
//QR
implementation 'com.google.zxing:core:3.5.1'
implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
-
//Webp animations
implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.24.0'
diff --git a/app/src/main/java/org/futo/circles/feature/notifications/ShortcutCreator.kt b/app/src/main/java/org/futo/circles/feature/notifications/ShortcutCreator.kt
index 150a5f958..363097f30 100644
--- a/app/src/main/java/org/futo/circles/feature/notifications/ShortcutCreator.kt
+++ b/app/src/main/java/org/futo/circles/feature/notifications/ShortcutCreator.kt
@@ -9,10 +9,10 @@ import androidx.annotation.WorkerThread
import androidx.core.content.pm.ShortcutInfoCompat
import androidx.core.graphics.drawable.IconCompat
import org.futo.circles.MainActivity
+import org.futo.circles.core.glide.GlideApp
+import org.futo.circles.core.glide.GlideShortcutUtils.adaptiveShortcutDrawable
+import org.futo.circles.core.glide.GlideShortcutUtils.shortcutDrawable
import org.futo.circles.extensions.dpToPx
-import org.futo.circles.glide.GlideApp
-import org.futo.circles.glide.GlideShortcutUtils.adaptiveShortcutDrawable
-import org.futo.circles.glide.GlideShortcutUtils.shortcutDrawable
import org.matrix.android.sdk.api.session.room.model.RoomSummary
import org.matrix.android.sdk.api.util.toMatrixItem
diff --git a/core/build.gradle b/core/build.gradle
index dcfe4c6c7..52c56490f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -69,18 +69,21 @@ dependencies {
//Matrix
api 'org.matrix.android:matrix-sdk-android:1.5.30.6'
- //Glide
- def glide_version = '4.15.1'
- implementation "com.github.bumptech.glide:glide:$glide_version"
- kapt "com.github.bumptech.glide:compiler:$glide_version"
-
//Retrofit2
def retrofit_version = '2.9.0'
- implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
- implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+ api "com.squareup.retrofit2:retrofit:$retrofit_version"
+ api "com.squareup.retrofit2:converter-gson:$retrofit_version"
+
+ //Gson
+ api 'com.google.code.gson:gson:2.10'
//TextDrawable
- implementation 'com.alvinhkh:TextDrawable:c1c2b5b'
+ api 'com.alvinhkh:TextDrawable:c1c2b5b'
+
+ //Glide
+ def glide_version = '4.15.1'
+ implementation "com.github.bumptech.glide:glide:$glide_version"
+ kapt "com.github.bumptech.glide:compiler:$glide_version"
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
--
GitLab