Skip to content

Commit

Permalink
Merge pull request #34 from MichaelEvans/master
Browse files Browse the repository at this point in the history
Update the Gradle plugin and Android build tools versions
  • Loading branch information
broady committed Dec 29, 2013
2 parents 8bace73 + 98fb947 commit f862ec3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath 'com.android.tools.build:gradle:0.7.+'
classpath 'com.github.townsfolk:gradle-release:1.2'
}
}
Expand Down
2 changes: 1 addition & 1 deletion demo/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="18"/>
android:targetSdkVersion="19"/>

<permission
android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE"
Expand Down
6 changes: 3 additions & 3 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath 'com.android.tools.build:gradle:0.7.+'
}
}

Expand All @@ -18,8 +18,8 @@ dependencies {
}

android {
compileSdkVersion 17
buildToolsVersion "17.0"
compileSdkVersion 19
buildToolsVersion "19.0.1"

sourceSets {
main {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath 'com.android.tools.build:gradle:0.7.+'
}
}

Expand All @@ -20,8 +20,8 @@ dependencies {
}

android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
compileSdkVersion 19
buildToolsVersion "19.0.1"

sourceSets {
main {
Expand Down

0 comments on commit f862ec3

Please sign in to comment.