From c5ab68dec30c43e3e31d9ebfedb889dac3231b16 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 12 May 2021 18:02:24 +0800
Subject: [PATCH] Optimize dependencies

---
 app/build.gradle                        |  5 +----
 build.gradle                            |  2 +-
 dependencies.gradle                     | 28 +++++++++++++++----------
 gsyVideoPlayer-exo_player2/build.gradle |  3 +--
 gsyVideoPlayer-java/build.gradle        |  2 +-
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5938d6a..a53e42f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,11 +51,8 @@ dependencies {
     implementation androidDependencies.recyclerView
     implementation androidDependencies.core
     implementation viewDependencies.DanmakuFlameMaster
-    implementation viewDependencies.ndkbitmap_armv7a
-    implementation viewDependencies.ndkbitmap_armv5
-    implementation viewDependencies.ndkbitmap_x86
+    implementation viewDependencies.ndkBitmap
     implementation viewDependencies.glide
-    implementation viewDependencies.glideProcessor
     implementation androidDependencies.support_v4
     implementation androidDependencies.design
     implementation androidDependencies.viewpager2
diff --git a/build.gradle b/build.gradle
index 601bbb4..f9c3c3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        maven { url "https://maven.aliyun.com/repository/public" }
         mavenCentral()
+        maven { url "https://maven.aliyun.com/repository/public" }
         maven { url 'https://jitpack.io' }
     }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index b5b3a0f..268ce81 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -20,7 +20,7 @@ ext {
 
     leakcanary = '2.7'
 
-    imageLoader = '4.12.0'
+    glideVersion = '4.12.0'
 
     gsyVideoVersion = '8.1.2'
 
@@ -30,11 +30,11 @@ ext {
 
     androidDependencies = [
             recyclerView: "androidx.recyclerview:recyclerview:1.2.0",
-            appcompat_v7: "androidx.appcompat:appcompat:1.2.0",
+            appCompat   : "androidx.appcompat:appcompat:1.2.0",
             support_v4  : "androidx.legacy:legacy-support-v4:${otherVersion}",
             design      : "com.google.android.material:material:1.3.0",
             viewpager2  : "androidx.viewpager2:viewpager2:${otherVersion}",
-            core        : "androidx.core:core:1.3.2",
+            core        : "androidx.core:core:1.3.2"
     ]
 
     viewDependencies = [
@@ -43,18 +43,24 @@ ext {
             ijkplayer_java       : "com.github.CarGuo:GSYIjkJava:${CarGuoIjk}",
             transitionseverywhere: "com.andkulikov:transitionseverywhere:${transitionseverywhere}",
             DanmakuFlameMaster   : "com.github.ctiao:DanmakuFlameMaster:${DanmakuFlameMaster}",
-            ndkbitmap_armv7a     : "com.github.ctiao:ndkbitmap-armv7a:${DanmakuFlameMasterSo}",
-            ndkbitmap_armv5      : "com.github.ctiao:ndkbitmap-armv5:${DanmakuFlameMasterSo}",
-            ndkbitmap_x86        : "com.github.ctiao:ndkbitmap-x86:${DanmakuFlameMasterSo}",
-
-            glide                : "com.github.bumptech.glide:glide:${imageLoader}",
-            glideProcessor       : "com.github.bumptech.glide:compiler:${imageLoader}",
             floatWindow          : "com.github.yhaolpz:FloatWindow:${floatWindow}",
-            exo_player2          : "com.google.android.exoplayer:exoplayer:${exo_player2}",
-            exo_player2_rtmp     : "com.google.android.exoplayer:extension-rtmp:${exo_player2}",
 
+            ndkBitmap            : [
+                    "com.github.ctiao:ndkbitmap-armv7a:${DanmakuFlameMasterSo}",
+                    "com.github.ctiao:ndkbitmap-armv5:${DanmakuFlameMasterSo}",
+                    "com.github.ctiao:ndkbitmap-x86:${DanmakuFlameMasterSo}",
+            ],
+            glide                : [
+                    "com.github.bumptech.glide:glide:${glideVersion}",
+                    "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
+            ],
+            exoPlayer2           : [
+                    "com.google.android.exoplayer:exoplayer:${exo_player2}",
+                    "com.google.android.exoplayer:extension-rtmp:${exo_player2}"
+            ]
     ]
 
+
     dataDependencies = [
             videocache                    : "com.shuyu:gsyvideoplayer-androidvideocache:${gsyVideoVersion}",
             leakcanary                    : "com.squareup.leakcanary:leakcanary-android:${leakcanary}",
diff --git a/gsyVideoPlayer-exo_player2/build.gradle b/gsyVideoPlayer-exo_player2/build.gradle
index dd95a28..db9015e 100644
--- a/gsyVideoPlayer-exo_player2/build.gradle
+++ b/gsyVideoPlayer-exo_player2/build.gradle
@@ -3,8 +3,7 @@ apply plugin: 'com.android.library'
 apply from: "${rootDir.path}/gradle/base.gradle"
 
 dependencies {
-    api viewDependencies.exo_player2
-    api viewDependencies.exo_player2_rtmp
+    api viewDependencies.exoPlayer2
     api project(':gsyVideoPlayer-base')
     //api "com.shuyu:gsyVideoPlayer-base:$gsyVideoVersion"
 }
diff --git a/gsyVideoPlayer-java/build.gradle b/gsyVideoPlayer-java/build.gradle
index 661c026..b21ebc1 100644
--- a/gsyVideoPlayer-java/build.gradle
+++ b/gsyVideoPlayer-java/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 apply from: "${rootDir.path}/gradle/base.gradle"
 
 dependencies {
-    implementation androidDependencies.appcompat_v7
+    implementation androidDependencies.appCompat
 
     api viewDependencies.ijkplayer_java
     //api viewDependencies.ijkplayer_exo
-- 
GitLab