zengjiebin лет назад: 7
Родитель
Сommit
886a07a064
2 измененных файлов с 85 добавлено и 70 удалено
  1. 26 11
      app/build.gradle
  2. 59 59
      build.gradle

+ 26 - 11
app/build.gradle

@@ -133,21 +133,23 @@ repositories {
 
 dependencies {
     //noinspection GradleCompatible
-    implementation 'com.android.support:cardview-v7:28.0.0-rc01'
+    implementation "com.android.support:cardview-v7:$supportLibVersion"
     implementation "com.android.support:design:$supportLibVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
 //    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation('com.jcodecraeer:xrecyclerview:1.5.9') {
         //    implementation 'com.shark:screencapture:1.0.0'
+    implementation('com.jcodecraeer:xrecyclerview:1.5.9') {
         exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.android.support', module: 'recyclerview'
+        exclude group: 'com.android.support', module: 'appcompat'
     }
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
-    implementation 'com.zhy:base-adapter:3.0.3'
+//    implementation 'com.zhy:base-adapter:3.0.3'
 
     //    implementation 'com.liulishuo.filedownloader:library:1.6.9'
-    implementation 'com.tencent.bugly:crashreport_upgrade:1.3.4'
+    implementation 'com.tencent.bugly:crashreport_upgrade:1.3.5'
 
     //其中latest.release指代最新版本号,也可以指定明确的版本号,例如1.2.0
     implementation 'com.tencent.bugly:nativecrashreport:3.3.1'
@@ -157,16 +159,23 @@ dependencies {
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.6'
     debugImplementation('com.readystatesoftware.chuck:library:1.1.0') {
         exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.google.code.gson', module: 'gson'
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+        exclude group: 'nl.qbusict', module: 'cupboard'
     }
 
     //    implementation 'de.hdodenhof:circleimageview:2.2.0'
     releaseImplementation('com.readystatesoftware.chuck:library-no-op:1.1.0') {
         exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
     implementation 'org.xutils:xutils:3.5.0'
-    implementation 'com.mylhyl:acp:1.1.7'
+//    implementation 'com.mylhyl:acp:1.1.7'
 
-    implementation 'cn.yipianfengye.android:zxing-library:2.2'
+    implementation ('cn.yipianfengye.android:zxing-library:2.2') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
 //    implementation 'com.github.huburt-Hu:NewbieGuide:v1.2.0'
     debugImplementation 'com.android.support:multidex:1.0.1'
 
@@ -175,7 +184,12 @@ dependencies {
     implementation(name: 'com.kfzs.safe-201809211354', ext: 'aar')
 
     //butterknife
-    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation ('com.jakewharton:butterknife:8.8.1') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+        exclude group: 'com.android.support', module: 'support-compat'
+//        exclude group: 'com.jakewharton', module: 'butterknife-annotations'
+    }
+
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
     //dagger2
@@ -183,12 +197,13 @@ dependencies {
     //    implementation 'com.google.dagger:dagger:+'
 
     //    implementation 'com.google.dagger:dagger-compiler:+'
-    compileOnly 'org.glassfish:javax.annotation:10.0-b28'
-    implementation 'com.google.dagger:dagger:2.12'
+    compileOnly 'org.glassfish:javax.annotation:10.0-b28'//javax.annotation » jsr250-api
+    implementation 'com.google.dagger:dagger:2.12'//javax.inject » javax.inject
     annotationProcessor 'com.google.dagger:dagger-compiler:2.12'
 
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+
 //    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'org.ligboy.retrofit2:converter-fastjson-android:2.1.0'
 //    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'

+ 59 - 59
build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        supportLibVersion = "27.1.0"
+        supportLibVersion = "28.0.0"
     }
     repositories {
         jcenter()
@@ -47,61 +47,61 @@ task clean(type: Delete) {
 }
 
 
-ext {
-
-    android = [
-            compileSdkVersion: 27,
-            minSdkVersion    : 15,
-            targetSdkVersion : 27,
-            buildToolsVersion: '28.0.2',
-            /**
-             * app-module
-             */
-            versionCode_app  : 1,
-            versionName_app  : "1.0",
-
-    ]
-
-    dependencies = [
-            support_appcompat_v7       : 'com.android.support:appcompat-v7:27.0.2',
-            support_constraint_layout  : 'com.android.support.constraint:constraint-layout:1.0.2',
-            recyclerview               : 'com.android.support:recyclerview-v7:27.0.2',
-            /**
-             * butterknife注解
-             */
-            butterknife                : 'com.jakewharton:butterknife:8.6.0',
-            butterknife_compiler       : 'com.jakewharton:butterknife-compiler:8.6.0',
-            /**
-             * rxjava
-             */
-            rxbinding                  : 'com.jakewharton.rxbinding:rxbinding:1.0.0',
-            rxjava                     : 'io.reactivex:rxjava:1.2.4',
-            /**
-             * rxandroid
-             */
-            rxandroid                  : 'io.reactivex:rxandroid:1.2.1',
-            /**
-             * retrofit
-             */
-            retrofit2                  : 'com.squareup.retrofit2:retrofit:2.4.0',
-            retrofit2_converter_gson   : 'com.squareup.retrofit2:converter-gson:2.4.0',
-            okhttp3_logging_interceptor: 'com.squareup.okhttp3:logging-interceptor:3.10.0',
-            retrofit2_adapter_rxjava   : 'com.squareup.retrofit2:adapter-rxjava:2.1.0',
-            /**
-             * GSON
-             */
-            gson                       : 'com.google.code.gson:gson:2.8.2',
-            /**
-             * Dagger
-             */
-            javax_annotation           : 'org.glassfish:javax.annotation:10.0-b28',
-            dagger                     : 'com.google.dagger:dagger:2.12',
-            dagger_compiler            : 'com.google.dagger:dagger-compiler:2.12'
-    ]
-
-
-
-
-    androidConfigs = rootProject.ext.android
-    dependenciesLibs = rootProject.ext.dependencies
-}
+//ext {
+//
+//    android = [
+//            compileSdkVersion: 27,
+//            minSdkVersion    : 15,
+//            targetSdkVersion : 27,
+//            buildToolsVersion: '28.0.2',
+//            /**
+//             * app-module
+//             */
+//            versionCode_app  : 1,
+//            versionName_app  : "1.0",
+//
+//    ]
+//
+//    dependencies = [
+//            support_appcompat_v7       : 'com.android.support:appcompat-v7:27.0.2',
+//            support_constraint_layout  : 'com.android.support.constraint:constraint-layout:1.0.2',
+//            recyclerview               : 'com.android.support:recyclerview-v7:27.0.2',
+//            /**
+//             * butterknife注解
+//             */
+//            butterknife                : 'com.jakewharton:butterknife:8.6.0',
+//            butterknife_compiler       : 'com.jakewharton:butterknife-compiler:8.6.0',
+//            /**
+//             * rxjava
+//             */
+//            rxbinding                  : 'com.jakewharton.rxbinding:rxbinding:1.0.0',
+//            rxjava                     : 'io.reactivex:rxjava:1.2.4',
+//            /**
+//             * rxandroid
+//             */
+//            rxandroid                  : 'io.reactivex:rxandroid:1.2.1',
+//            /**
+//             * retrofit
+//             */
+//            retrofit2                  : 'com.squareup.retrofit2:retrofit:2.4.0',
+//            retrofit2_converter_gson   : 'com.squareup.retrofit2:converter-gson:2.4.0',
+//            okhttp3_logging_interceptor: 'com.squareup.okhttp3:logging-interceptor:3.10.0',
+//            retrofit2_adapter_rxjava   : 'com.squareup.retrofit2:adapter-rxjava:2.1.0',
+//            /**
+//             * GSON
+//             */
+//            gson                       : 'com.google.code.gson:gson:2.8.2',
+//            /**
+//             * Dagger
+//             */
+//            javax_annotation           : 'org.glassfish:javax.annotation:10.0-b28',
+//            dagger                     : 'com.google.dagger:dagger:2.12',
+//            dagger_compiler            : 'com.google.dagger:dagger-compiler:2.12'
+//    ]
+//
+//
+//
+//
+//    androidConfigs = rootProject.ext.android
+//    dependenciesLibs = rootProject.ext.dependencies
+//}