From bb9e1afee877a957490e9435277c77f240b6ace0 Mon Sep 17 00:00:00 2001 From: Eddie Ringle Date: Mon, 30 Dec 2013 13:59:20 -0600 Subject: [PATCH 1/3] Update gradle plugin and wrapper * Android Gradle plugin updated to 0.7.+ * Bundled Gradle wrapper updated to 1.9 * These versions are required for Android Studio 0.4 Signed-off-by: Eddie Ringle --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 4 ++-- sample/build.gradle | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index d98bca1..a307325 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.6.3' + classpath 'com.android.tools.build:gradle:0.7.+' } } @@ -19,4 +19,4 @@ allprojects { repositories { mavenCentral() } -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb29364..1f36edb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/library/build.gradle b/library/build.gradle index 38dc82e..58044ba 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.3' + classpath 'com.android.tools.build:gradle:0.7.+' } } apply plugin: 'android-library' @@ -26,4 +26,4 @@ android { } } -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' \ No newline at end of file +apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/sample/build.gradle b/sample/build.gradle index d4ecd82..3a3ff93 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.3' + classpath 'com.android.tools.build:gradle:0.7.+' } } apply plugin: 'android' From 2349123f58773d624b997366aa2e80485aa702e6 Mon Sep 17 00:00:00 2001 From: Eddie Ringle Date: Mon, 30 Dec 2013 14:04:24 -0600 Subject: [PATCH 2/3] Also update README with dependency change Signed-off-by: Eddie Ringle --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47107f3..aad8454 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Alternatively import the `/library` project into your Android Studio project and The library is currently configured to be built via Gradle only. It has the following dependencies: - * Android Gradle plugin v0.6.3 - `com.android.tools.build:gradle:0.6.3` + * Android Gradle plugin v0.7.+ - `com.android.tools.build:gradle:0.7.+` * Android Support Library v19 - `com.android.support:support-v4:19.0.+` Still use Eclipse/building with Ant? You can still use AndroidStaggeredGrid, it's just a few extra steps (left up to the read). From 013a8b3582c13ccd68ea0624c526486161851b96 Mon Sep 17 00:00:00 2001 From: Eddie Ringle Date: Tue, 31 Dec 2013 08:01:41 -0600 Subject: [PATCH 3/3] Compile for and target 4.4 Signed-off-by: Eddie Ringle --- library/build.gradle | 4 ++-- library/src/main/AndroidManifest.xml | 2 +- sample/build.gradle | 4 ++-- sample/src/main/AndroidManifest.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 58044ba..5d6eef2 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -17,12 +17,12 @@ dependencies { } android { - compileSdkVersion 17 + compileSdkVersion 19 buildToolsVersion "19" defaultConfig { minSdkVersion 10 - targetSdkVersion 17 + targetSdkVersion 19 } } diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index b3c09bf..c6f15b9 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ android:versionCode="1" android:versionName="1.0.0"> - + diff --git a/sample/build.gradle b/sample/build.gradle index 3a3ff93..7eb8630 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -13,12 +13,12 @@ repositories { } android { - compileSdkVersion 17 + compileSdkVersion 19 buildToolsVersion "19" defaultConfig { minSdkVersion 10 - targetSdkVersion 17 + targetSdkVersion 19 } } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index f5ad011..da416a5 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ + android:targetSdkVersion="19" />