Browse Source

1.优化第三方依赖版本

王鹏鹏 2 years ago
parent
commit
6172ac5755

+ 1 - 1
app/build.gradle

@@ -119,5 +119,5 @@ dependencies {
     androidTestApi(rootProject.ext.androidx.runner)
     androidTestApi(rootProject.ext.androidx.espresso_core)
     // 此处以JPush 5.0.0 版本为例,5.0.0 版本开始可以自动拉取 JCore 包,无需另外配置
-    implementation (rootProject.ext.dependencies.jpush)
+    implementation(rootProject.ext.dependencies.jpush)
 }

+ 6 - 4
config.gradle

@@ -20,8 +20,8 @@ ext {
     //androidx配置
     androidx = [
             "constraintlayout"    : 'androidx.constraintlayout:constraintlayout:2.0.1',
-            'appcompat'           : 'androidx.appcompat:appcompat:1.2.0',
-            'material'              : 'com.google.android.material:material:1.2.0',
+            'appcompat'           : 'androidx.appcompat:appcompat:1.3.1',
+            'material'              : 'com.google.android.material:material:1.4.0',
             "multidex"            : 'androidx.multidex:multidex:2.0.1',
             "annotation"          : 'androidx.annotation:annotation:1.2.0',
 
@@ -31,8 +31,9 @@ ext {
             'kotlin_lib'          : "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",
             'kotlin_core'         : "androidx.core:core-ktx:1.3.1",
             // 编写更简洁、惯用的Kotlin代码
-            'core_ktx'         : "androidx.activity:activity-ktx:1.2.0",
-            'flexbox'         : "com.google.android:flexbox:2.0.1",
+            'core_ktx'            : "androidx.activity:activity-ktx:1.2.0",
+            'flexbox'             : "com.google.android:flexbox:2.0.1",
+            'recyclerview'        :"androidx.recyclerview:recyclerview:1.1.0"
     ]
     //version配置
     versions = [
@@ -112,6 +113,7 @@ ext {
             "utilcode": 'com.blankj:utilcode:1.30.7',
             //极光推送
             "jpush": 'cn.jiguang.sdk:jpush:5.0.0',
+            "gson":"com.google.code.gson:gson:2.8.6"
 
     ]
 }

+ 6 - 5
livebroadcast/build.gradle

@@ -19,16 +19,17 @@ android {
 
 dependencies {
     implementation project(path: ':baselib')
-    implementation( rootProject.ext.androidx.kotlin_lib )
-    implementation( rootProject.ext.androidx.kotlin_core )
-    implementation( rootProject.ext.androidx.appcompat )
-    implementation( rootProject.ext.androidx.material )
-    implementation( rootProject.ext.androidx.constraintlayout)
     api project(':tuipusher')
     api project(':tuiaudioeffect')
     api project(':tuibeauty')
     api project(':tuibarrage')
     api project(':tuigift')
     api project(':tuiplayer')
+    implementation(rootProject.ext.androidx.kotlin_lib)
+    implementation(rootProject.ext.androidx.kotlin_core)
+    implementation(rootProject.ext.androidx.appcompat)
+    implementation(rootProject.ext.androidx.material)
+    implementation(rootProject.ext.androidx.constraintlayout)
+
 
 }

+ 5 - 5
login/build.gradle

@@ -15,9 +15,9 @@ android {
 
 dependencies {
     implementation project(path: ':baselib')
-    implementation( rootProject.ext.androidx.kotlin_lib )
-    implementation( rootProject.ext.androidx.kotlin_core )
-    implementation( rootProject.ext.androidx.appcompat )
-    implementation( rootProject.ext.androidx.material )
-    implementation( rootProject.ext.androidx.constraintlayout)
+    implementation(rootProject.ext.androidx.kotlin_lib)
+    implementation(rootProject.ext.androidx.kotlin_core)
+    implementation(rootProject.ext.androidx.appcompat)
+    implementation(rootProject.ext.androidx.material)
+    implementation(rootProject.ext.androidx.constraintlayout)
 }

+ 5 - 5
personalcenter/build.gradle

@@ -15,9 +15,9 @@ android {
 
 dependencies {
     implementation project(path: ':baselib')
-    implementation( rootProject.ext.androidx.kotlin_lib )
-    implementation( rootProject.ext.androidx.kotlin_core )
-    implementation( rootProject.ext.androidx.appcompat )
-    implementation( rootProject.ext.androidx.material )
-    implementation( rootProject.ext.androidx.constraintlayout)
+    implementation(rootProject.ext.androidx.kotlin_lib)
+    implementation(rootProject.ext.androidx.kotlin_core)
+    implementation(rootProject.ext.androidx.appcompat)
+    implementation(rootProject.ext.androidx.material)
+    implementation(rootProject.ext.androidx.constraintlayout)
 }

+ 5 - 5
setting/build.gradle

@@ -15,9 +15,9 @@ android {
 
 dependencies {
     implementation project(path: ':baselib')
-    implementation( rootProject.ext.androidx.kotlin_lib )
-    implementation( rootProject.ext.androidx.kotlin_core )
-    implementation( rootProject.ext.androidx.appcompat )
-    implementation( rootProject.ext.androidx.material )
-    implementation( rootProject.ext.androidx.constraintlayout)
+    implementation(rootProject.ext.androidx.kotlin_lib)
+    implementation(rootProject.ext.androidx.kotlin_core)
+    implementation(rootProject.ext.androidx.appcompat)
+    implementation(rootProject.ext.androidx.material)
+    implementation(rootProject.ext.androidx.constraintlayout)
 }

+ 3 - 4
tuiaudioeffect/build.gradle

@@ -23,11 +23,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
-    implementation "com.google.android.material:material:1.0.0"
+    api(rootProject.ext.androidx.appcompat)
+    api(rootProject.ext.androidx.material)
     implementation "de.hdodenhof:circleimageview:3.1.0"
-    
+
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release"
     api rootProject.getProperties().containsKey("liteavSdk") ? rootProject.ext.liteavSdk : "com.tencent.liteav:LiteAVSDK_TRTC:latest.release"

+ 3 - 4
tuibarrage/build.gradle

@@ -6,7 +6,6 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 26
     }
 
     buildTypes {
@@ -23,9 +22,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api "androidx.constraintlayout:constraintlayout:1.1.3"
-    api "androidx.recyclerview:recyclerview:1.2.1"
-    api "com.google.code.gson:gson:2.8.6"
+    api(rootProject.ext.androidx.constraintlayout)
+    api(rootProject.ext.androidx.recyclerview)
+    api(rootProject.ext.dependencies.gson)
 
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release"

+ 10 - 0
tuibarrage/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuibarrage/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.tencent.qcloud.tuikit.tuibarrage;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuibarrage";
+  public static final String BUILD_TYPE = "debug";
+}

+ 3 - 3
tuibeauty/build.gradle

@@ -19,10 +19,10 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    api(rootProject.ext.androidx.constraintlayout)
+    api(rootProject.ext.androidx.material)
+    api(rootProject.ext.dependencies.gson)
     api 'com.tencent.mediacloud:TencentEffect_S1-04:2.4.2.324'
-    api "androidx.constraintlayout:constraintlayout:1.1.3"
-    api 'com.google.android.material:material:1.4.0'
-    api "com.google.code.gson:gson:2.8.6"
 
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release"

+ 10 - 0
tuibeauty/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuibeauty/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.tencent.qcloud.tuikit.tuibeauty;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuibeauty";
+  public static final String BUILD_TYPE = "debug";
+}

+ 5 - 6
tuigift/build.gradle

@@ -21,14 +21,13 @@ android {
     }
 }
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api(rootProject.ext.androidx.appcompat)
+    api(rootProject.ext.androidx.material)
+    api(rootProject.ext.androidx.constraintlayout)
+    api(rootProject.ext.dependencies.glide)
+    api(rootProject.ext.dependencies.gson)
     implementation "com.airbnb.android:lottie:4.2.0"
-
     api "de.hdodenhof:circleimageview:3.1.0"
-    api "com.google.code.gson:gson:2.8.6"
-    api "com.github.bumptech.glide:glide:4.12.0"
 
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release"

+ 9 - 8
tuiplayer/build.gradle

@@ -19,15 +19,16 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'androidx.appcompat:appcompat:1.3.1'
-    api 'androidx.constraintlayout:constraintlayout:1.1.3'
-    api "com.squareup.okhttp3:logging-interceptor:3.8.1"
-    api "com.squareup.retrofit2:converter-gson:2.2.0"
-    api "com.squareup.retrofit2:retrofit:2.2.0"
-    api "com.squareup.okhttp3:okhttp:3.11.0"
-    api "com.github.bumptech.glide:glide:4.12.0"
+    api(rootProject.ext.androidx.appcompat)
+    api(rootProject.ext.androidx.constraintlayout)
+    api(rootProject.ext.dependencies.logging_interceptor)
+    api(rootProject.ext.dependencies.converter_gson)
+    api(rootProject.ext.dependencies.retrofit2)
+    api(rootProject.ext.dependencies.ohkttp3)
+    api(rootProject.ext.dependencies.glide)
+    api(rootProject.ext.dependencies.converter_gson)
+    api(rootProject.ext.dependencies.gson)
     api "de.hdodenhof:circleimageview:3.1.0"
-    api "com.google.code.gson:gson:2.8.6"
 
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release"

+ 10 - 0
tuiplayer/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuiplayer/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.tencent.qcloud.tuikit.tuiplayer;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuiplayer";
+  public static final String BUILD_TYPE = "debug";
+}

+ 8 - 8
tuipusher/build.gradle

@@ -19,15 +19,15 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'androidx.appcompat:appcompat:1.3.1'
-    api 'androidx.constraintlayout:constraintlayout:1.1.3'
-    api "com.squareup.okhttp3:logging-interceptor:3.8.1"
-    api "com.squareup.retrofit2:converter-gson:2.2.0"
-    api "com.squareup.retrofit2:retrofit:2.2.0"
-    api "com.squareup.okhttp3:okhttp:3.11.0"
-    api "com.github.bumptech.glide:glide:4.12.0"
+    api(rootProject.ext.androidx.appcompat)
+    api(rootProject.ext.androidx.constraintlayout)
+    api(rootProject.ext.dependencies.ohkttp3)
+    api(rootProject.ext.dependencies.retrofit2)
+    api(rootProject.ext.dependencies.converter_gson)
+    api(rootProject.ext.dependencies.logging_interceptor)
+    api(rootProject.ext.dependencies.glide)
+    api(rootProject.ext.dependencies.gson)
     api "de.hdodenhof:circleimageview:3.1.0"
-    api "com.google.code.gson:gson:2.8.6"
 
     def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
     api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release"

+ 10 - 0
tuipusher/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuipusher/BuildConfig.java

@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.tencent.qcloud.tuikit.tuipusher;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuipusher";
+  public static final String BUILD_TYPE = "debug";
+}

+ 8 - 10
webview/build.gradle

@@ -112,14 +112,12 @@ dependencies {
     // ARtouter
     implementation(rootProject.ext.dependencies.arouter_api)
     kapt(rootProject.ext.dependencies.arouter_compiler)
-    api( rootProject.ext.androidx.kotlin_lib )
-    api( rootProject.ext.androidx.kotlin_core )
-    api( rootProject.ext.androidx.appcompat )
-    api( rootProject.ext.androidx.material )
-    api( rootProject.ext.androidx.constraintlayout)
-    testApi( rootProject.ext.androidx.junit )
-    androidTestApi( rootProject.ext.androidx.runner )
-    androidTestApi( rootProject.ext.androidx.espresso_core )
-    api 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    api(rootProject.ext.androidx.kotlin_lib)
+    api(rootProject.ext.androidx.kotlin_core)
+    api(rootProject.ext.androidx.appcompat)
+    api(rootProject.ext.androidx.material)
+    api(rootProject.ext.androidx.constraintlayout)
+    testApi(rootProject.ext.androidx.junit)
+    androidTestApi(rootProject.ext.androidx.runner)
+    androidTestApi(rootProject.ext.androidx.espresso_core)
 }

+ 5 - 5
workbenches/build.gradle

@@ -16,10 +16,10 @@ android {
 dependencies {
     implementation project(path: ':baselib')
     api fileTree(exclude: '*.bak', dir: 'libs')
-    implementation( rootProject.ext.androidx.kotlin_lib )
-    implementation( rootProject.ext.androidx.kotlin_core )
-    implementation( rootProject.ext.androidx.appcompat )
-    implementation( rootProject.ext.androidx.material )
-    implementation( rootProject.ext.androidx.constraintlayout)
+    implementation(rootProject.ext.androidx.kotlin_lib)
+    implementation(rootProject.ext.androidx.kotlin_core)
+    implementation(rootProject.ext.androidx.appcompat)
+    implementation(rootProject.ext.androidx.material)
+    implementation(rootProject.ext.androidx.constraintlayout)
 
 }