summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Bendowski <bendowski@google.com>2015-06-11 10:07:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-11 10:07:38 +0000
commit43fdda9f41edd7b88b74119de5df294a5212a51d (patch)
tree674c948a92b76098d6cec9ee2686bc1576e79804
parenteab2d113ac6452288e54d9279530f04eb43aa00e (diff)
parent1ba6c2f2ba8fec62d6e5fc0fb20025f2c82bd728 (diff)
downloadvolley-43fdda9f41edd7b88b74119de5df294a5212a51d.tar.gz
am 1ba6c2f2: Merge "Update tool versions in build.gradle."
* commit '1ba6c2f2ba8fec62d6e5fc0fb20025f2c82bd728': Update tool versions in build.gradle.
-rw-r--r--build.gradle16
-rw-r--r--rules.gradle2
2 files changed, 14 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index e88a6c5..83acd6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,21 +5,29 @@
// Any other changes to the build config belong in rules.gradle, which
// is used by projects that depend on Volley but define their own
// tools versions across all dependencies to ensure a consistent build.
+//
+// Most users should just add this line to settings.gradle:
+// include(":volley")
+//
+// If you have a more complicated Gradle setup you can choose to use
+// this instead:
+// include(":volley")
+// project(':volley').buildFileName = 'rules.gradle'
buildscript {
repositories {
- mavenCentral()
+ jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.14.+'
+ classpath 'com.android.tools.build:gradle:1.2.3'
}
}
apply plugin: 'com.android.library'
android {
- compileSdkVersion 19
- buildToolsVersion = '21.1.0'
+ compileSdkVersion 22
+ buildToolsVersion = '22.0.1'
}
apply from: 'rules.gradle'
diff --git a/rules.gradle b/rules.gradle
index 1ec9ee4..40508d0 100644
--- a/rules.gradle
+++ b/rules.gradle
@@ -1 +1,3 @@
+// See build.gradle for an explanation of what this file is.
+
apply plugin: 'com.android.library'