diff --git a/.travis.yml b/.travis.yml
index 58b9276d9..cf6512b81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,4 @@ before_install:
- adb shell input keyevent 82 &
script:
- - ./gradlew test
- ./gradlew connectedAndroidTest
\ No newline at end of file
diff --git a/README.md b/README.md
index fa3d9cee3..2abab1216 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Visit the wiki to [get started with development](https://github.com/abaker/tasks/wiki/Getting-Started-with-Development).
-
-[![Build Status](https://travis-ci.org/abaker/tasks.svg?branch=master)](https://travis-ci.org/abaker/tasks)
+[![Make a contribution](https://pledgie.com/campaigns/24281.png?skin_name=chrome)](https://pledgie.com/campaigns/24281)
[![Get it on Google Play](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=org.tasks)
-[![Make a contribution](https://pledgie.com/campaigns/24281.png?skin_name=chrome)](https://pledgie.com/campaigns/24281)
+[![Build Status](https://travis-ci.org/abaker/tasks.svg?branch=master)](https://travis-ci.org/abaker/tasks)
+
+Visit the wiki to [get started with development](https://github.com/abaker/tasks/wiki/Getting-Started-with-Development).
diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle
index 9e634bc98..9fb792ea6 100644
--- a/android-aac-enc/build.gradle
+++ b/android-aac-enc/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.10.+'
}
}
@@ -24,7 +24,7 @@ android {
defaultConfig {
minSdkVersion 7
- targetSdkVersion 18
+ targetSdkVersion 19
}
}
diff --git a/android-aac-enc/src/main/AndroidManifest.xml b/android-aac-enc/src/main/AndroidManifest.xml
index e7160dd8d..b4749979d 100644
--- a/android-aac-enc/src/main/AndroidManifest.xml
+++ b/android-aac-enc/src/main/AndroidManifest.xml
@@ -8,8 +8,6 @@
-
-
diff --git a/api/build.gradle b/api/build.gradle
index f49eea41f..ce3d6c070 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.10.+'
}
}
@@ -27,7 +27,7 @@ android {
defaultConfig {
minSdkVersion 7
- targetSdkVersion 18
+ targetSdkVersion 19
}
}
diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml
index 2e3729ade..2badb00eb 100644
--- a/api/src/main/AndroidManifest.xml
+++ b/api/src/main/AndroidManifest.xml
@@ -8,7 +8,4 @@
package="org.tasks.api"
android:versionCode="1"
android:versionName="1.0">
-
-
-
-
+
diff --git a/astrid/build.gradle b/astrid/build.gradle
index 8d6f8ae88..944b9c64b 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -1,24 +1,16 @@
buildscript {
repositories {
mavenCentral()
- maven {
- url 'https://oss.sonatype.org/content/repositories/snapshots/'
- }
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
- classpath 'com.squareup.gradle:gradle-android-test-plugin:0.9.1-SNAPSHOT'
+ classpath 'com.android.tools.build:gradle:0.10.+'
}
}
apply plugin: 'android'
-apply plugin: 'android-test'
repositories {
mavenCentral()
- maven {
- url 'https://oss.sonatype.org/content/repositories/snapshots/'
- }
}
android {
@@ -31,7 +23,7 @@ android {
defaultConfig {
minSdkVersion 7
- targetSdkVersion 18
+ targetSdkVersion 19
}
signingConfigs {
@@ -99,11 +91,6 @@ dependencies {
compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.6.0-beta', transitive: false
compile group: 'com.google.oauth-client', name: 'google-oauth-client-extensions', version: '1.6.0-beta', transitive: false
- testCompile group: 'junit', name: 'junit', version: '4.10'
- testCompile group: 'org.robolectric', name: 'robolectric', version: '2.3-SNAPSHOT'
- testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
- // hack to get android studio to import libraries
androidTestCompile group: 'junit', name: 'junit', version: '4.10', transitive: false
- androidTestCompile group: 'org.robolectric', name: 'robolectric', version: '2.3-SNAPSHOT', transitive: false
androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false
}
diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index e74457981..a62e03453 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -72,10 +72,6 @@
-
-
diff --git a/build.gradle b/build.gradle
index 0ce5dc8c0..f32b4df70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,3 @@
task wrapper(type: Wrapper) {
- gradleVersion = '1.10'
+ gradleVersion = '1.12'
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 583859812..3c7abdf12 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 042402038..9db8d83c0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 07 10:32:46 CST 2014
+#Mon May 12 12:57:48 CDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip