Merge pull request #17 from eddieringle/update-gradle

Merge pull request #17 - Update gradle plugin and wrapper
etsy · Dec 31, 2013 · 728f12d · 728f12d
2 parents 33aa569 + 013a8b3
commit 728f12d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git 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).

diff --git a/build.gradle b/build.gradle
@@ -19,4 +19,4 @@ allprojects {
     repositories {
         mavenCentral()
     }
-}
+}
diff --git a/library/build.gradle b/library/build.gradle
@@ -17,13 +17,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 17
+    compileSdkVersion 19
     buildToolsVersion "19"
 
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 17
+        targetSdkVersion 19
     }
 }
 
-apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
+apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     android:versionCode="1"
     android:versionName="1.0.0">
 
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" />
     <application />
 
 </manifest>
diff --git 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
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="10"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="19" />
 
     <application
         android:allowBackup="true"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ allprojects { @@
         repositories {
             mavenCentral()
         }
-    }
+    }