处理上传后单独引用出问题的逻辑

吴奎庆
1 parent 207259be
Showing 5 changed files with 38 additions and 37 deletions
app/build.gradle
build.gradle
config.gradle
lib_media/build.gradle
lib_media/maven_push.gradle
 apply plugin: 'com.android.application'
  
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
  
     defaultConfig {
         applicationId "com.cnlive.strike.debug"
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
-            abiFilters 'armeabi-v7a'
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
+
     }
  
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    dataBinding {
-        enabled true
+
+    repositories {
+        flatDir {
+            dirs "lib"
+        }
     }
  
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures{
+        dataBinding = true
+    }
+
+    dexOptions {
+        javaMaxHeapSize '4g'
+    }
 }
  
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'com.cnlive.media:NewMediaPicker:1.1.4.28'
 //    implementation project(path: ':lib_media')
-    //ARouter
-//    implementation "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
-//    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.arouterCompilerVersion"
-    implementation 'androidx.multidex:multidex:2.0.0'
-    implementation project(path: ':lib_media')
  
 }
 \ No newline at end of file
@@ -7,7 +7,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/umsdk/release' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
  
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -44,7 +44,7 @@ task clean(type: Delete) {
 ext {
     //androidX
  
-    androidXAppcompat = '1.0.0'
+    androidXAppcompat = '1.2.0'
     androidXRecyclerview = '1.0.0'
     androidXConstraintlayout = '1.1.3'
  
@@ -57,24 +57,19 @@ ext {
     easypermissions = '3.0.0'
     rotatephotoview = '1.0.5'
  
-    libCnUtil = '3.1.0'
-    libCnVideo = '3.2.3'
-
     qmui = '1.1.5'
  
     libLargeImage = '1.0.4-androidx'
     libBase = '1.9.9.0'
-    libVideoQiniu = '1.0.7.2'
  
     //阿里路由框架
     arouterApiVersion = '1.5.0'
     arouterCompilerVersion = '1.2.1'
  
-    libCnUtil = '3.1.5'
-    libCnVideo = '3.3.24'
+    libCnUtil = '3.1.8'
+    libCnVideo = '3.3.25'
     libCnencipher = '1.1.1'
  
-
     //视频库
     libVideoQiniu = '1.0.7-androidx'
     qiniuAndroidSdk = '7.4.3'
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.1.3.9.2",
+            version: "1.1.4.4",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -60,9 +60,8 @@ dependencies {
     implementation "com.cnlive.libs:video_qiniu:$rootProject.libVideoQiniu"
     implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
  
-    implementation "com.cnlive:lib_cnutil:$rootProject.libCnUtil"
-    implementation "com.cnlive:lib_cnvideo2.0:$rootProject.libCnVideo"
-
+    implementation "com.cnlive.base:lib_util:$rootProject.libCnUtil"
+    implementation "com.cnlive.base:lib_video:$rootProject.libCnVideo"
     implementation "com.umeng.umsdk:analytics:8.0.0"
     implementation "com.umeng.umsdk:common:2.0.0"
  
@@ -16,17 +16,17 @@ uploadArchives() {
                 artifactId lib.name
                 version = lib.debug ? lib.version.concat("-SNAPSHOT") : lib.version
             }
-            pom.whenConfigured { pom ->
-                //TODO POM文件目前无法区分 compile 和 implementation
-                List list = new ArrayList()
-                //手动增加过滤项
-                pom.dependencies.findAll {
-                    dep -> dep.groupId == "pub.devrel" || dep.groupId == "com.chensl.rotatephotoview"
-                }.collect { dep -> list.add(dep) }
-                //移除支持库
-                pom.dependencies.clear()
-                pom.dependencies.addAll(list)
-            }
+//            pom.whenConfigured { pom ->
+//                //TODO POM文件目前无法区分 compile 和 implementation
+//                List list = new ArrayList()
+//                //手动增加过滤项
+//                pom.dependencies.findAll {
+//                    dep -> dep.groupId == "pub.devrel" || dep.groupId == "com.chensl.rotatephotoview"
+//                }.collect { dep -> list.add(dep) }
+//                //移除支持库
+//                pom.dependencies.clear()
+//                pom.dependencies.addAll(list)
+//            }
  
         }
     }