Update Android gradle plugin to 1.x

bumptech · Dec 21, 2014 · ba32d32 · TWiStErRob · Dec 27, 2014 · ba32d32
1 parent 7d68353
commit ba32d32
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,5 +47,5 @@ subprojects { project ->
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.1'
+    gradleVersion = '2.2'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -18,9 +18,9 @@ SUPPORT_V4_VERSION=19.1.0
 SUPPORT_V7_VERSION=19.1.0
 VOLLEY_VERSION=1.0.7
 OK_HTTP_VERSION=2.0.0
-ANDROID_GRADLE_VERSION=0.13.3
+ANDROID_GRADLE_VERSION=1.0.0
 
-ROBOLECTRIC_GRADLE_VERSION=0.12.0
+ROBOLECTRIC_GRADLE_VERSION=0.14.0
 COVERALLS_GRADLE_VERSION=2.0.1
 JUNIT_VERSION=4.11
 MOCKITO_VERSION=1.9.5

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 19 07:33:32 PDT 2014
+#Sat Dec 20 22:55:19 PST 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-bin.zip
diff --git a/integration/okhttp/build.gradle b/integration/okhttp/build.gradle
@@ -15,7 +15,6 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.integration.okhttp'
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
 

diff --git a/integration/volley/build.gradle b/integration/volley/build.gradle
@@ -23,7 +23,6 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.integration.volley'
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -38,7 +38,6 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId 'com.bumptech.glide'
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
 

diff --git a/third_party/gif_decoder/build.gradle b/third_party/gif_decoder/build.gradle
@@ -15,7 +15,6 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.gifdecoder'
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
     }

diff --git a/third_party/gif_encoder/build.gradle b/third_party/gif_encoder/build.gradle
@@ -5,7 +5,6 @@ android {
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.gifencoder'
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
     }