[Android] Upgrade to gradle 1.0.0 and SDK build tools 21.1.1

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Dec  9 13:20:15 2014 +0100| [e6fa8f5b574ae15c92bd81434f36b74d991ab1ee] | committer: Geoffrey Métais

Upgrade to gradle 1.0.0 and SDK build tools 21.1.1

To sync with Android Studio 1.0 release, we should switch to this version of gradle.
So upgrade your Android Studio set up and Android SDK build tools

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=e6fa8f5b574ae15c92bd81434f36b74d991ab1ee
---

 build.gradle                             |    4 ++--
 gradle/wrapper/gradle-wrapper.properties |    4 ++--
 java-libs/WheelView/build.gradle         |   24 +++++++++---------------
 libvlc/build.gradle                      |    1 -
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index b218696..f6e3cf6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.2'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 
@@ -15,6 +15,6 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "21.0.2"
+    buildToolsVersion = "21.1.1"
     compileSdkVersion = 21
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1731cd..23cde32 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 13 10:27:49 CET 2014
+#Tue Dec 09 10:54:34 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/java-libs/WheelView/build.gradle b/java-libs/WheelView/build.gradle
index d0f71fe..9ed7678 100644
--- a/java-libs/WheelView/build.gradle
+++ b/java-libs/WheelView/build.gradle
@@ -5,21 +5,15 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     sourceSets {
-    main {
-	manifest.srcFile 'AndroidManifest.xml'
-	java.srcDirs = ['src']
-	resources.srcDirs = ['src']
-	aidl.srcDirs = ['src']
-	renderscript.srcDirs = ['src']
-	res.srcDirs = ['res']
-	assets.srcDirs = ['assets']
-    }
-    }
-
-    defaultConfig {
-        applicationId "kankan.wheel"
-        minSdkVersion 5
-        targetSdkVersion 7
+        main {
+        manifest.srcFile 'AndroidManifest.xml'
+        java.srcDirs = ['src']
+        resources.srcDirs = ['src']
+        aidl.srcDirs = ['src']
+        renderscript.srcDirs = ['src']
+        res.srcDirs = ['res']
+        assets.srcDirs = ['assets']
+        }
     }
 
     buildTypes {
diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index af89563..173739c 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -19,7 +19,6 @@ android {
     }
 
     defaultConfig {
-        applicationId "org.videolan"
         minSdkVersion 7
         targetSdkVersion 21
     }