Set fixed dependency versions using properties.

README.md

@@ -28,7 +28,7 @@ repositories {
 
 dependencies {
     compile 'com.github.bumptech.glide:glide:3.3.+'
-    compile 'com.android.support:support-v4:19.0.0'
+    compile 'com.android.support:support-v4:19.1.0'
 }
 ```
 

build.gradle

@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.robolectric:robolectric-gradle-plugin:0.12.+'
-        classpath 'com.android.tools.build:gradle:0.13.+'
+        classpath "org.robolectric:robolectric-gradle-plugin:${ROBOLECTRIC_GRADLE_VERSION}"
+        classpath "com.android.tools.build:gradle:${ANDROID_GRADLE_VERSION}"
     }
 }
 

gradle.properties

@@ -13,3 +13,23 @@ POM_SCM_DEV_CONNECTION=scm:git@github.com:bumptech/glide.git
 POM_DEVELOPER_ID=sjudd
 POM_DEVELOPER_NAME=Sam Judd
 POM_DEVELOPER_EMAIL=judds@google.com
+
+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
+
+ROBOLECTRIC_GRADLE_VERSION=0.12.0
+JUNIT_VERSION=4.11
+MOCKITO_VERSION=1.9.5
+ROBOLECTRIC_VERSION=2.4-SNAPSHOT
+MOCKWEBSERVER_VERSION=1.6.0
+HAMCREST_VERSION=1.3
+
+COMPILE_SDK_VERSION=19
+BUILD_TOOLS_VERSION=19.1.0
+TARGET_SDK_VERSION=19
+MIN_SDK_VERSION=10
+
+

integration/okhttp/build.gradle

@@ -7,17 +7,18 @@ repositories {
 dependencies {
     compile project(':glide')
 
-    compile 'com.squareup.okhttp:okhttp:2.0.+'
+    compile "com.squareup.okhttp:okhttp:${OK_HTTP_VERSION}"
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide.integration.okhttp'
-        minSdkVersion 10
-        targetSdkVersion 19
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
+
         versionCode = VERSION_CODE
         versionName = VERSION_NAME
     }

integration/volley/build.gradle

@@ -7,25 +7,26 @@ repositories {
 
 dependencies {
     compile project(':glide')
-    compile 'com.mcxiaoke.volley:library:1.0.+'
+    compile "com.mcxiaoke.volley:library:${VOLLEY_VERSION}"
 
-    androidTestCompile 'org.hamcrest:hamcrest-core:1.3'
-    androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
-    androidTestCompile 'junit:junit:4.11'
-    androidTestCompile 'org.mockito:mockito-all:1.9.5'
-    androidTestCompile 'org.robolectric:robolectric:2.4-SNAPSHOT'
+    androidTestCompile "org.hamcrest:hamcrest-core:${HAMCREST_VERSION}"
+    androidTestCompile "org.hamcrest:hamcrest-library:${HAMCREST_VERSION}"
+    androidTestCompile "junit:junit:${JUNIT_VERSION}"
+    androidTestCompile "org.mockito:mockito-all:${MOCKITO_VERSION}"
+    androidTestCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
     // TODO: increase this to 2.0.+ when we compile against Java 7.
-    androidTestCompile 'com.squareup.okhttp:mockwebserver:1.2.+'
+    androidTestCompile "com.squareup.okhttp:mockwebserver:${MOCKWEBSERVER_VERSION}"
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide.integration.volley'
-        minSdkVersion 10
-        targetSdkVersion 19
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
+
         versionCode = VERSION_CODE
         versionName = VERSION_NAME
     }

library/build.gradle

@@ -12,26 +12,27 @@ dependencies {
     compile project(':third_party:gif_decoder')
     compile project(':third_party:gif_encoder')
     compile project(':third_party:disklrucache')
-    compile 'com.android.support:support-v4:19.1.+'
-
-    androidTestCompile 'org.hamcrest:hamcrest-core:1.3'
-    androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
-    androidTestCompile 'junit:junit:4.11'
-    androidTestCompile 'org.mockito:mockito-all:1.9.5'
-    androidTestCompile 'org.robolectric:robolectric:2.4-SNAPSHOT'
+    compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+
+    androidTestCompile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+    androidTestCompile "org.hamcrest:hamcrest-core:${HAMCREST_VERSION}"
+    androidTestCompile "org.hamcrest:hamcrest-library:${HAMCREST_VERSION}"
+    androidTestCompile "junit:junit:${JUNIT_VERSION}"
+    androidTestCompile "org.mockito:mockito-all:${MOCKITO_VERSION}"
+    androidTestCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
     // TODO: increase this to 2.0.+ when we compile against Java 7.
-    androidTestCompile 'com.squareup.okhttp:mockwebserver:1.2.+'
+    androidTestCompile "com.squareup.okhttp:mockwebserver:${MOCKWEBSERVER_VERSION}"
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide'
-        minSdkVersion 10
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
 
-        targetSdkVersion 19
         versionCode = VERSION_CODE
         versionName = VERSION_NAME
     }

samples/flickr/build.gradle

@@ -2,19 +2,20 @@ apply plugin: 'com.android.application'
 
 dependencies {
     compile project(':library')
-    compile 'com.android.support:support-v4:19.1.+'
-    compile 'com.android.support:appcompat-v7:19.1.+'
-    compile 'com.mcxiaoke.volley:library:1.0.+'
+    compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+    compile "com.android.support:appcompat-v7:${SUPPORT_V7_VERSION}"
+    compile "com.mcxiaoke.volley:library:${VOLLEY_VERSION}"
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide.samples.flickr'
-        minSdkVersion 10
-        targetSdkVersion 19
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
+
         versionCode 1
         versionName '1.0.0'
     }

samples/giphy/build.gradle

@@ -6,13 +6,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide.samples.giphy'
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion TARGET_SDK_VERSION as int
         versionCode 1
         versionName '1.0.0'
     }

samples/svg/build.gradle

-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
 apply plugin: 'com.android.application'
 
 repositories {
@@ -13,13 +5,14 @@ repositories {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.svgsample.app'
-        minSdkVersion 10
-        targetSdkVersion 19
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
+
         versionCode 1
         versionName '1.0'
     }

disklrucache @ fb30e314

-Subproject commit 0a63fecc9408390d7343046fe289514308334ab8
+Subproject commit fb30e31469966bf2b9960a736735bb6380cbca39

third_party/gif_decoder/build.gradle

@@ -2,21 +2,21 @@ apply plugin: 'com.android.library'
 apply plugin: 'robolectric'
 
 dependencies {
-    androidTestCompile 'com.android.support:support-v4:19.1.0'
-    androidTestCompile 'org.hamcrest:hamcrest-core:1.3'
-    androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
-    androidTestCompile 'junit:junit:4.11'
-    androidTestCompile 'org.mockito:mockito-all:1.9.5'
-    androidTestCompile 'org.robolectric:robolectric:2.4-SNAPSHOT'
+    androidTestCompile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+    androidTestCompile "org.hamcrest:hamcrest-core:${HAMCREST_VERSION}"
+    androidTestCompile "org.hamcrest:hamcrest-library:${HAMCREST_VERSION}"
+    androidTestCompile "junit:junit:${JUNIT_VERSION}"
+    androidTestCompile "org.mockito:mockito-all:${MOCKITO_VERSION}"
+    androidTestCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide.gifdecoder'
-        minSdkVersion 10
-        targetSdkVersion 19
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
     }
 }

third_party/gif_encoder/build.gradle

 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion COMPILE_SDK_VERSION as int
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId 'com.bumptech.glide.gifencoder'
-        minSdkVersion 10
-        targetSdkVersion 19
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
     }
 }