From 94800043ea13e1c8bfdde3df74e7b78d3c5d46fc Mon Sep 17 00:00:00 2001
From: ctiao <calmer91@gmail.com>
Date: Fri, 6 Feb 2015 19:16:17 +0800
Subject: [PATCH] Upgrade to Gradle 2.2.1

---
 .travis.yml                              | 6 +++---
 DanmakuFlameMaster/build.gradle          | 4 ++--
 Sample/build.gradle                      | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 0
 5 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/.travis.yml b/.travis.yml
index c24521ac..6d82a06c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ before_install:
   # Install base Android SDK
   - sudo apt-get update -qq
   - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
-  - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
-  - tar xzf android-sdk_r22.3-linux.tgz
+  - wget http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz
+  - tar xzf android-sdk_r24.0.2-linux.tgz
   - export ANDROID_HOME=$PWD/android-sdk-linux
   - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
@@ -17,7 +17,7 @@ before_install:
   # For a full list, run `android list sdk -a --extended`
   # Note that sysimg-19 downloads only ARM, because only the first license query is accepted.
   - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --all --filter build-tools-19.0.0 --no-ui --force > /dev/null
+  - echo yes | android update sdk --all --filter build-tools-21.1.2 --no-ui --force > /dev/null
   - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
   - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
diff --git a/DanmakuFlameMaster/build.gradle b/DanmakuFlameMaster/build.gradle
index 31e804f6..445b9b1a 100644
--- a/DanmakuFlameMaster/build.gradle
+++ b/DanmakuFlameMaster/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:1.0.1+'
     }
 }
 //apply plugin: 'android'
@@ -27,7 +27,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.0"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/Sample/build.gradle b/Sample/build.gradle
index 0ee7634c..ebc02566 100644
--- a/Sample/build.gradle
+++ b/Sample/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:1.0.1+'
     }
 }
 apply plugin: 'android'
@@ -29,7 +29,7 @@ dependencies {
 }
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.0"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
@@ -41,7 +41,7 @@ android {
         into new File(buildDir, 'native-libs')
     }
 
-    tasks.withType(Compile) {
+    tasks.withType(JavaCompile) {
         compileTask -> compileTask.dependsOn copyNativeLibs
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7c4bf18a..3970ad42 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755