将可能下载失败的依赖，直接放到项目里面，避免编译错误

Lutherjon · Sep 3, 2024 · 23a4022 · 23a4022
1 parent 4f2bad3
commit 23a4022
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 10 deletions.
diff --git a/chat/build.gradle b/chat/build.gradle
@@ -61,6 +61,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
+    implementation fileTree(dir: "../push-aar-dep", include: ["*.aar"])
+    implementation fileTree(dir: "../uikit-aar-dep", include: ["zxing-lite-1.1.1.aar"])
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1'
     implementation 'com.tencent.bugly:crashreport:4.0.4'
     implementation 'com.tencent.bugly:nativecrashreport:3.9.2'

diff --git a/push-aar-dep/push-internal-3.4.2.aar b/push-aar-dep/push-internal-3.4.2.aar
diff --git a/push/build.gradle b/push/build.gradle
@@ -43,12 +43,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    compileOnly fileTree(dir: '../push-aar-dep', include: ['*.aar'])
 
     implementation 'com.huawei.hms:push:6.12.0.300'
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation project(':client')
-    implementation 'com.meizu.flyme.internet:push-internal:3.4.2@aar'
+//    implementation 'com.meizu.flyme.internet:push-internal:3.4.2@aar'
     implementation platform('com.google.firebase:firebase-bom:33.2.0')
     implementation 'com.google.firebase:firebase-messaging:24.0.1'
     implementation 'com.google.android.gms:play-services-base:18.5.0'

diff --git a/settings.gradle b/settings.gradle
@@ -7,6 +7,7 @@ include ':client',
     ':webrtc',
     ':badgeview',
     ':uvccamera',
+    ':uikit-aar-dep',
     ':emojilibrary',
     ':imagepicker',
 //    ':momentclient',

diff --git a/uikit-aar-dep/WheelPicker-1.1.3.aar b/uikit-aar-dep/WheelPicker-1.1.3.aar
diff --git a/uikit-aar-dep/build.gradle b/uikit-aar-dep/build.gradle
@@ -0,0 +1,9 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('com.cjt2325.cameralibrary-library-1.1.9.aar'))
+artifacts.add("default", file('flexbox-2.0.1.aar'))
+artifacts.add("default", file('com.lqr.adapter-library-1.0.2.aar'))
+artifacts.add("default", file('statusbarutil-library-1.3.5.aar'))
+artifacts.add("default", file('viewpagerdotsindicator-2.1.2.aar'))
+artifacts.add("default", file('WheelPicker-1.1.3.aar'))
+artifacts.add("default", file('zxing-lite-1.1.1.aar'))
+artifacts.add("default", file('io.kvh-amr-1.1.2.aar'))
diff --git a/uikit-aar-dep/com.cjt2325.cameralibrary-library-1.1.9.aar b/uikit-aar-dep/com.cjt2325.cameralibrary-library-1.1.9.aar
diff --git a/uikit-aar-dep/com.lqr.adapter-library-1.0.2.aar b/uikit-aar-dep/com.lqr.adapter-library-1.0.2.aar
diff --git a/uikit-aar-dep/flexbox-2.0.1.aar b/uikit-aar-dep/flexbox-2.0.1.aar
diff --git a/chat/libs/amr-release.aar → uikit-aar-dep/io.kvh-amr-1.1.2.aar b/chat/libs/amr-release.aar → uikit-aar-dep/io.kvh-amr-1.1.2.aar
diff --git a/uikit-aar-dep/statusbarutil-library-1.3.5.aar b/uikit-aar-dep/statusbarutil-library-1.3.5.aar
diff --git a/uikit-aar-dep/viewpagerdotsindicator-2.1.2.aar b/uikit-aar-dep/viewpagerdotsindicator-2.1.2.aar
diff --git a/uikit-aar-dep/zxing-lite-1.1.1.aar b/uikit-aar-dep/zxing-lite-1.1.1.aar
diff --git a/uikit/build.gradle b/uikit/build.gradle
@@ -58,6 +58,7 @@ dependencies {
 
     // wfc kit start
     implementation project(':webrtc')
+    implementation project(':uikit-aar-dep')
 
     api project(':client')
     api project(':avenginekit')
@@ -67,12 +68,12 @@ dependencies {
     implementation project(':emojilibrary')
     implementation project(':imagepicker')
 
-    implementation 'com.lqr.adapter:library:1.0.2'
-    implementation 'com.jaeger.statusbaruitl:library:1.3.5'
+//    implementation 'com.lqr.adapter:library:1.0.2'
+//    implementation 'com.jaeger.statusbaruitl:library:1.3.5'
 
     api 'androidx.appcompat:appcompat:1.7.0-alpha03'
     api 'com.google.android.material:material:1.10.0'
-    implementation 'cjt.library.wheel:camera:1.1.9'
+//    implementation 'cjt.library.wheel:camera:1.1.9'
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
     annotationProcessor 'androidx.annotation:annotation:1.7.0'
@@ -81,21 +82,21 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.0'
 
     api "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    api 'com.king.zxing:zxing-lite:1.1.1'
-    api 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
+//    api 'com.king.zxing:zxing-lite:1.1.1'
+//    api 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android:flexbox:2.0.1'
+//    implementation 'com.google.android:flexbox:2.0.1'
 
     implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.6'
     compileOnly 'io.kvh:amr:1.1.1'
-    implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:2.1.2'
+//    implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:2.1.2'
 
     // moment start
     // momentclient module is just for dev, do not uncomment
-    // implementation project(':momentclient')
+//    implementation project(':momentclient')
     //over scroller helper
-//    implementation 'me.everything:overscroll-decor-android:1.0.4'
+    implementation 'me.everything:overscroll-decor-android:1.0.4'
     // moment end
 
     // kit wfc end

diff --git a/uikit/libs/com.google.zxing.core-3.3.3.jar b/uikit/libs/com.google.zxing.core-3.3.3.jar