From eb2eec42ab7fc137945af1f5be8d0b4d940ed9b0 Mon Sep 17 00:00:00 2001
From: maning <ning.ma@12301.cn>
Date: Fri, 1 Dec 2017 16:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7gradle=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=88=B03.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                           | 15 +---------
 app/build.gradle                         | 36 +++++++++++++-----------
 app/src/main/AndroidManifest.xml         |  4 ++-
 build.gradle                             |  4 +--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..ba7052b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 0af9d48..bdcd954 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,6 +18,8 @@ android {
 
         // 设置MultiDex可用
         multiDexEnabled true
+        flavorDimensions "versionCode"
+        javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
     }
 
     signingConfigs {//签名信息
@@ -57,16 +59,16 @@ android {
             proguardFiles customerproguardFile.path
             buildConfigField "boolean", "LOG_DEBUG", "false"
             // 自定义输出配置
-            applicationVariants.all { variant ->
-                variant.outputs.each { output ->
-                    def outputFile = output.outputFile
-                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                        // 输出apk名称为xxx_release_v1.0_wandoujia.apk
-                        def fileName = "gankmm_${variant.buildType.name}_v${defaultConfig.versionName}_${variant.productFlavors[0].name}.apk"
-                        output.outputFile = new File(outputFile.parent + "/${variant.buildType.name}", fileName)
-                    }
-                }
-            }
+//            applicationVariants.all { variant ->
+//                variant.outputs.each { output ->
+//                    def outputFile = output.outputFile
+//                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
+//                        // 输出apk名称为xxx_release_v1.0_wandoujia.apk
+//                        def fileName = "gankmm_${variant.buildType.name}_v${defaultConfig.versionName}_${variant.productFlavors[0].name}.apk"
+//                        output.outputFile = new File(outputFile.parent + "/${variant.buildType.name}", fileName)
+//                    }
+//                }
+//            }
         }
         debug {
             //混淆
@@ -77,7 +79,6 @@ android {
         }
 
     }
-
 }
 
 repositories{
@@ -88,10 +89,10 @@ repositories{
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:support-v4:25.2.0'
-    compile 'com.android.support:design:25.2.0'
-    compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
     /* Dex分包 */
     compile 'com.android.support:multidex:1.0.1'
     /*RecycleView的间隔线*/
@@ -103,8 +104,7 @@ dependencies {
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
     /*图片加载Glide*/
-//    compile 'com.github.bumptech.glide:glide:4.0.0-RC1'
-//    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'com.github.bumptech.glide:glide:4.0.0'
     compile 'jp.wasabeef:glide-transformations:2.0.2'
     /*日志*/
     compile 'com.github.zhaokaiqiang.klog:library:1.6.0'
@@ -162,5 +162,7 @@ dependencies {
     compile 'com.contrarywind:Android-PickerView:3.2.5'
     /* 图片选择 */
     compile 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.0'
+    /* 提示框 */
+    compile 'com.github.maning0303:MNProgressHUD:V1.0.2'
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ef09d8..15bf509 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,7 +57,9 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/DayTheme">
+        android:theme="@style/DayTheme"
+        tools:replace="icon,label,theme,allowBackup"
+        >
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
diff --git a/build.gradle b/build.gradle
index bac4030..e8ae7b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -32,7 +32,7 @@ task clean(type: Delete) {
 
 ext {
     compileSdkVersion = 25
-    buildToolsVersion = "25.0.2"
+    buildToolsVersion = "26.0.2"
     minSdkVersion = 16
     targetSdkVersion = 25
     versionCode = 24
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9be6bfb..c0a5c17 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip