Skip to content

Fix #115 by updating gradle build info and manifest #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
broady merged 1 commit into from
Oct 20, 2014
Merged

Fix #115 by updating gradle build info and manifest #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.7.+'
classpath 'com.android.tools.build:gradle:0.12.2'
classpath 'com.github.townsfolk:gradle-release:1.2'
}
}

apply plugin: 'release'
2 changes: 1 addition & 1 deletion demo/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:versionName="1.0">

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

<permission
Expand Down
2 changes: 1 addition & 1 deletion demo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {

android {
compileSdkVersion 19
buildToolsVersion "19.0.1"
buildToolsVersion "19.1.0"

sourceSets {
main {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Wed Oct 08 10:43:50 MDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
5 changes: 3 additions & 2 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ dependencies {
compile 'com.google.android.gms:play-services:4.3+'
}


android {
compileSdkVersion 19
buildToolsVersion "19.0.1"
buildToolsVersion "19.1.0"

sourceSets {
main {
Expand All @@ -30,7 +31,7 @@ android {
res.srcDirs = ['res']
}

instrumentTest {
androidTest {
java.srcDirs = ['tests/src']
}
}
Expand Down