From 3d6440bae13aa86d98bbda62a9cd87bbb7c6dfde Mon Sep 17 00:00:00 2001
From: guoshuyu <guoshuyu@ygsoft.com>
Date: Wed, 20 Dec 2017 13:45:15 +0800
Subject: [PATCH] update gradle to 4.1

---
 app/build.gradle                         | 8 +++++---
 build.gradle                             | 3 +--
 dependencies.gradle                      | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index de6db6aa8..57c9a606a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
+
 
 android {
 
@@ -16,7 +16,9 @@ android {
         versionCode 3
         versionName "1.4.9"
 
-
+        javaCompileOptions {
+            annotationProcessorOptions.includeCompileClasspath = true
+        }
         ndk {
             //设置支持的SO库架构
             abiFilters 'armeabi', 'armeabi-v7a', 'x86'
@@ -49,7 +51,7 @@ dependencies {
     def viewDependencies = rootProject.ext.viewDependencies
     def androidDependencies = rootProject.ext.androidDependencies
     def dataDependencies = rootProject.ext.dataDependencies
-    apt viewDependencies.apt_butterKnife
+    annotationProcessor  viewDependencies.apt_butterKnife
     compile viewDependencies.butterKnife
     compile androidDependencies.recyclerView
     compile viewDependencies.DanmakuFlameMaster
diff --git a/build.gradle b/build.gradle
index 64d9dc78c..5889cf5f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
diff --git a/dependencies.gradle b/dependencies.gradle
index af96e57a7..17a746903 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -6,7 +6,7 @@ allprojects {
 
 ext {
     //Android
-    androidBuildToolsVersion = "25.0.0"
+    androidBuildToolsVersion = "26.0.2"
     androidMinSdkVersion = 16
     androidTargetSdkVersion = 22
     androidCompileSdkVersion = 22
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a778d681..e47d7ef76 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Dec 20 13:35:33 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip