gradle升级备份1111

WeiChat/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
-apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'me.tatarka.retrolambda'
 
 //定义时间
 def releaseTime() {
@@ -125,14 +125,28 @@ android {
         }
     }
 
-    productFlavors {
-        wandoujia {}
-        _360 {}
-        baidu {}
-        xiaomi {}
-        tencent {}
-        taobao {}
-    }
+    flavorDimensions "usoft"
+
+    /*productFlavors {
+        wandoujia {
+            dimension "usoft"
+        }
+        _360 {
+            dimension "usoft"
+        }
+        baidu {
+            dimension "usoft"
+        }
+        xiaomi {
+            dimension "usoft"
+        }
+        tencent {
+            dimension "usoft"
+        }
+        taobao {
+            dimension "usoft"
+        }
+    }*/
 
     productFlavors.all {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
@@ -172,39 +186,39 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.design
-    compile(deps.stetho) {
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    implementation deps.design
+    implementation(deps.stetho) {
         force = true
     }
-    compile deps.jodatime
-    compile deps.systembartint
-    compile deps.photoView
-    compile deps.tagGroup
-//    compile deps.analytics
-    compile deps.activityOnCrash
-    compile deps.stickyListHeaders
-    compile deps.stickyGridHeaders
-    compile deps.materialDialogs
-    compile deps.okhttp
-    compile project(':common')
-    compile project(':appmessages')
-    compile project(':network')
-    compile project(':imageload')
-    compile project(':applogin')
-    compile project(':apptasks')
-    compile project(':appcontact')
-    compile project(':appme')
-    compile project(':appworks')
-    compile project(':appbooking')
-    compile project(':appmusic')
-    compile project(':apputils')
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:support-v4:28.0.0'
-
-    compile(name: 'autoupdatesdk-release', ext: 'aar')
+    implementation deps.jodatime
+    implementation deps.systembartint
+    implementation deps.photoView
+    implementation deps.tagGroup
+//    implementation deps.analytics
+    implementation deps.activityOnCrash
+    implementation deps.stickyListHeaders
+    implementation deps.stickyGridHeaders
+    implementation deps.materialDialogs
+    implementation deps.okhttp
+    api project(':common')
+    api project(':appmessages')
+    api project(':network')
+    api project(':imageload')
+    api project(':applogin')
+    api project(':apptasks')
+    api project(':appcontact')
+    api project(':appme')
+    api project(':appworks')
+    api project(':appbooking')
+    api project(':appmusic')
+    api project(':apputils')
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:support-v4:28.0.0'
+
+    implementation(name: 'autoupdatesdk-release', ext: 'aar')
 }
 
 buildscript {

app_core/common/build.gradle

@@ -22,29 +22,29 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.fastjson
-    compile deps.materialDialogs
-    compile deps.multidex
-    compile(deps.stetho)
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    api deps.fastjson
+    implementation deps.materialDialogs
+    implementation deps.multidex
+    implementation(deps.stetho)
             {
                 force = true
             }
-    compile deps.gif
-    compile deps.circleimageview
-    compile deps.activityOnCrash
-//    compile 'com.umeng.analytics:analytics:6.1.2'
-    compile deps.analytics
-    compile deps.photoView
-    compile deps.stickyListHeaders
-    compile deps.stickyGridHeaders
-    compile deps.cardviewV7
-    compile deps.BaseRecyclerViewAdapterHelper
-    compile deps.design
-    compile deps.banner
-    compile(deps.smartRefreshLayout) {
+    implementation deps.gif
+    implementation deps.circleimageview
+    implementation deps.activityOnCrash
+//    implementation 'com.umeng.analytics:analytics:6.1.2'
+    implementation deps.analytics
+    implementation deps.photoView
+    implementation deps.stickyListHeaders
+    implementation deps.stickyGridHeaders
+    implementation deps.cardviewV7
+    implementation deps.BaseRecyclerViewAdapterHelper
+    implementation deps.design
+    implementation deps.banner
+    implementation(deps.smartRefreshLayout) {
         exclude group: 'com.squareup.leakcanary'
         exclude group: 'com.umeng.analytics'
         exclude group: 'com.android.support'
@@ -52,7 +52,7 @@ dependencies {
         exclude group: 'com.sun.xml.stream.buffer'
         exclude group: 'javax.annotation.processing'
     }
-    compile(deps.smartRefreshHeader) {
+    implementation(deps.smartRefreshHeader) {
         exclude group: 'com.squareup.leakcanary'
         exclude group: 'com.umeng.analytics'
         exclude group: 'com.android.support'
@@ -61,23 +61,23 @@ dependencies {
         exclude group: 'javax.annotation.processing'
     }
 
-    compile project(':network')
-    compile project(':applocation')
-    compile project(':pullToRefershLibraryMy')
-    compile project(':MPAndroidChart')
-    compile project(':libedittextformlibrary')
-    compile project(':libfloatingactionbutton')
-    compile project(':libbdupdatesdk')
-    compile project(':library-swipemenu_lv')
-    compile project(':library-viewpager-indicator')
-    compile project(':lib-zxing')
-    compile project(':library-refreshlayout')
-    compile project(':recyclerlibrary')
-    compile files('libs/hellocharts-library-1.5.8.jar')
-    compile deps.wechatSdk
-    compile 'com.github.hss01248:NotifyUtil:1.0.1'
-    compile deps.basePopup
-    compile deps.acprogress
+    api project(':network')
+    api project(':applocation')
+    api project(':pullToRefershLibraryMy')
+    api project(':MPAndroidChart')
+    api project(':libedittextformlibrary')
+    api project(':libfloatingactionbutton')
+    api project(':libbdupdatesdk')
+    api project(':library-swipemenu_lv')
+    api project(':library-viewpager-indicator')
+    api project(':lib-zxing')
+    api project(':library-refreshlayout')
+    api project(':recyclerlibrary')
+    api files('libs/hellocharts-library-1.5.8.jar')
+    implementation deps.wechatSdk
+    implementation 'com.github.hss01248:NotifyUtil:1.0.1'
+    implementation deps.basePopup
+    implementation deps.acprogress
 
 //    androidTestCompile deps.leakcanaryNp
 //    debugCompile deps.leakcanary

app_core/imageload/build.gradle

@@ -18,11 +18,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 
 
-    compile deps.glide
+    implementation deps.glide
     
 }

app_core/message/build.gradle

@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }

app_core/network/build.gradle

@@ -34,17 +34,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.logger
-    compile deps.rxjava
-    compile deps.rxandroid
-    compile deps.okhttp
-    compile deps.retrofit
-    compile deps.converterGson
-    compile deps.adapterRxjava
-    compile deps.fastjson
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    api deps.appcompatV7
+    implementation deps.logger
+    api deps.rxjava
+    api deps.rxandroid
+    api deps.okhttp
+    api deps.retrofit
+    api deps.converterGson
+    api deps.adapterRxjava
+    api deps.fastjson
 }
 
 /********************start upload bintray config******************************************/

app_modular/appbooking/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileOptions {
@@ -23,11 +23,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile deps.appcompatV7
-    compile deps.bottomsheet
-    testCompile deps.junit
-    compile project(':common')
-    compile project(':appcontact')
-    compile project(path: ':apputils')
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation deps.appcompatV7
+    implementation deps.bottomsheet
+    testImplementation deps.junit
+    api project(':common')
+    api project(':appcontact')
+    api project(path: ':apputils')
 }

app_modular/appcontact/build.gradle

@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile project(path: ':apputils')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    api project(path: ':apputils')
 }

app_modular/applocation/build.gradle

@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile deps.appcompatV7
-    compile project(':network')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api deps.appcompatV7
+    api project(':network')
 }

app_modular/applogin/build.gradle

@@ -18,9 +18,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile project(':common')
-    compile project(':network')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    api project(':common')
+    api project(':network')
 }

app_modular/appme/build.gradle

@@ -26,12 +26,12 @@ repositories{
     }
 }
 dependencies {
-    compile project(':common')
-    compile project(':appworks')
-    compile project(':applogin')
-    compile project(':appcontact')
-    compile project(path: ':appmusic')
-    compile(name: 'autoupdatesdk-release', ext: 'aar')
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    api project(':common')
+    api project(':appworks')
+    api project(':applogin')
+    api project(':appcontact')
+    api project(path: ':appmusic')
+    implementation(name: 'autoupdatesdk-release', ext: 'aar')
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
    
 }

app_modular/appmessages/build.gradle

@@ -20,12 +20,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.recyclerviewV7
-    compile project(':apputils')
-    compile project(':appworks')
-    compile project(':appbooking')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    implementation deps.recyclerviewV7
+    api project(':apputils')
+    api project(':appworks')
+    api project(':appbooking')
 
 }

app_modular/appmoments/build.gradle

@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }

app_modular/appmusic/build.gradle

@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':common')
-    testCompile deps.junit
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api project(':common')
+    testImplementation deps.junit
 }

app_modular/apptasks/build.gradle

@@ -19,9 +19,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile project(':apputils')
-    compile project(':appworks')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    api project(':apputils')
+    api project(':appworks')
 }

app_modular/apputils/build.gradle

@@ -20,9 +20,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':common')
-    compile project(':network')
-    compile project(':imageload')
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api project(':common')
+    api project(':network')
+    api project(':imageload')
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 }

app_modular/appworks/build.gradle

@@ -20,13 +20,13 @@ android {
 }
 dependencies {
     //project
-    compile project(':apputils')
-    compile project(path: ':imageload')
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile project(':facesdk')
-    compile project(path: ':appbooking')
-    compile 'com.android.support:support-v4:28.0.0'
+    api project(':apputils')
+    api project(path: ':imageload')
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    api project(':facesdk')
+    api project(path: ':appbooking')
+    implementation 'com.android.support:support-v4:28.0.0'
 
-    compile project(path: ':scancardlibrary')
-    compile deps.circleprogressbar
+    api project(path: ':scancardlibrary')
+    implementation deps.circleprogressbar
 }

app_modular/facesdk/build.gradle

@@ -20,8 +20,8 @@ android {
 
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':apputils')
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':apputils')
 
 
 

app_third/MPAndroidChart/build.gradle

@@ -1,8 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '27.0.0'
+//    compileSdkVersion 26
+//    buildToolsVersion '27.0.0'
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion

app_third/lib-zxing/build.gradle

@@ -18,9 +18,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }
 
 ext {

app_third/libbdupdatesdk/build.gradle

@@ -20,8 +20,8 @@ android {
 
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 
 }

app_third/libedittextformlibrary/build.gradle

@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }

app_third/libfloatingactionbutton/build.gradle

@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }

app_third/library-refreshlayout/build.gradle

@@ -12,8 +12,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }
 

app_third/library-swipemenu_lv/build.gradle

@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }
 

app_third/library-viewpager-indicator/build.gradle

@@ -19,6 +19,6 @@ android {
 }
 
 dependencies {
-    testCompile deps.junit
-    compile deps.appcompatV7
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }

app_third/materialdialogs/build.gradle

@@ -18,9 +18,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.design
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    implementation deps.design
 
 }

app_third/pullToRefershLibraryMy/build.gradle

@@ -18,6 +18,6 @@ android {
 }
 
 dependencies {
-    testCompile deps.junit
-    compile deps.appcompatV7
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 }

app_third/recyclerlibrary/build.gradle

@@ -17,9 +17,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.recyclerviewV7
-    compile deps.gif
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
+    implementation deps.recyclerviewV7
+    implementation deps.gif
 }

build.gradle

@@ -2,6 +2,11 @@ apply from: "version.gradle"
 
 buildscript {
     repositories {
+//        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+        google()
         jcenter()
         maven { url "https://jcenter.bintray.com" }
         maven { url "https://jitpack.io" }
@@ -10,24 +15,26 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+//        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.2'
+//        classpath 'me.tatarka:gradle-retrolambda:3.2.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
     }
 }
 
 allprojects {
     repositories {
-        maven { url 'https://maven.google.com' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
         jcenter()
         mavenCentral()
         maven { url "https://jitpack.io" }
-
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+//task clean(type: Delete) {
+//    delete rootProject.buildDir
+//}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Jun 05 09:47:35 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

scancardlibrary/build.gradle

@@ -19,8 +19,8 @@ android {
 
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation deps.junit
+    implementation deps.appcompatV7
 
 }

version.gradle

@@ -20,7 +20,7 @@ ext {
             supportVersion                      : '28.0.0',
             multidex                            : '1.0.1',
             butterknifeVersion                  : '8.2.1',
-            fastjsonVersion                     : '1.2.24',
+            fastjsonVersion                     : '1.2.75',
             logVersion                          : '1.15',
             rxJavaVersion                       : '1.1.8',
             rxAndroidVersion                    : '1.2.1',