浏览代码

1.统一依赖版本

王鹏鹏 2 年之前
父节点
当前提交
846dc0ebaa
共有 4 个文件被更改,包括 14 次插入10 次删除
  1. 2 0
      .idea/misc.xml
  2. 1 1
      common/build.gradle
  3. 6 4
      config.gradle
  4. 5 5
      superplayerkit/build.gradle

+ 2 - 0
.idea/misc.xml

@@ -30,6 +30,8 @@
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/drawable-v21/cv_bg_material.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_layout_calendar_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_week_bar.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/common_activity_qr_code_scan.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/common_content_loading_dialog.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/ugckit_fragment_dialog_permission_introduction.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/anim_loading.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_buttom_game.xml" value="0.219" />

+ 1 - 1
common/build.gradle

@@ -29,6 +29,6 @@ dependencies {
         exclude group: 'com.google.zxing', module: 'core'
     })
     api(rootProject.ext.dependencies.Zxing)
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    api(rootProject.ext.androidx.constraintlayout)
 }
 

+ 6 - 4
config.gradle

@@ -19,12 +19,11 @@ ext {
     ]
     //androidx配置
     androidx = [
-            "constraintlayout": 'androidx.constraintlayout:constraintlayout:2.0.1',
+            "constraintlayout": 'androidx.constraintlayout:constraintlayout:2.1.3',
             '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',
-
+            "annotation"      : 'androidx.annotation:annotation:1.4.0',
             'junit'           : "junit:junit:4.12",
             'runner'          : 'androidx.test.ext:junit:1.1.2',
             'espresso_core'   : 'androidx.test.espresso:espresso-core:3.3.0',
@@ -114,6 +113,9 @@ ext {
             "imsdk"                    : 'com.tencent.imsdk:imsdk:5.1.66',
             "rxbus"                    : 'lib.gorden.rxbus2:rxbus:2.0.1',
             "Zxing"                    : 'com.github.open-android:Zxing:v1.0.3',
-
+            "fastjson"                 : 'com.alibaba:fastjson:1.1.70.android',
+            "exifinterface"            : 'androidx.exifinterface:exifinterface:1.2.0',
+            "DanmakuFlameMaster"       : 'com.github.ctiao:DanmakuFlameMaster:0.5.3',
+            "vectordrawable_animated"  : 'androidx.vectordrawable:vectordrawable-animated:1.1.0',
     ]
 }

+ 5 - 5
superplayerkit/build.gradle

@@ -26,11 +26,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(path: ':common')
-    implementation 'com.github.ctiao:DanmakuFlameMaster:0.5.3'
-    api( rootProject.ext.androidx.appcompat )
-    api( rootProject.ext.androidx.material )
+    api(rootProject.ext.dependencies.DanmakuFlameMaster)
+    api(rootProject.ext.dependencies.exifinterface)
+    api(rootProject.ext.dependencies.vectordrawable_animated)
+    api(rootProject.ext.androidx.appcompat)
+    api(rootProject.ext.androidx.material)
     api(rootProject.ext.dependencies.glide)
-    implementation 'androidx.exifinterface:exifinterface:1.2.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     api(rootProject.ext.dependencies.LiteAVSDK_Player)
 }