From 8c4b80a2e3cc5003638838b42a06f7cfd5869592 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 23 Jan 2014 22:25:14 -0600
Subject: [PATCH] Update to Android Studio 0.4.3

* Gradle 1.10
* Gradle plugin 0.8.+
* Reenable lint on Travis
---
 .travis.yml                              |   2 +-
 android-aac-enc/build.gradle             |   2 +-
 api/build.gradle                         |   5 ++++-
 astrid/build.gradle                      |   6 +++++-
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 50508 -> 50557 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 lint.xml                                 |   5 ++++-
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8864f959..71612c9de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,5 +37,5 @@ before_install:
   #- adb shell input keyevent 82 &
 
 script:
-  - ./gradlew test
+  - ./gradlew check
   #- ./gradlew :astrid:connectedInstrumentTest --stacktrace --info
diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle
index 5615cadaa..4f75483c0 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.7.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
 
diff --git a/api/build.gradle b/api/build.gradle
index 037915985..bcd8c4be1 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
 
@@ -14,6 +14,9 @@ repositories {
 }
 
 android {
+    lintOptions {
+        lintConfig file("../lint.xml")
+    }
     compileSdkVersion 19
     buildToolsVersion "19.0.1"
 
diff --git a/astrid/build.gradle b/astrid/build.gradle
index ea63ad3e6..ded43fb2e 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
         classpath 'com.squareup.gradle:gradle-android-test-plugin:0.9.1-SNAPSHOT'
     }
 }
@@ -22,6 +22,10 @@ repositories {
 }
 
 android {
+    lintOptions {
+        lintConfig file("../lint.xml")
+    }
+
     compileSdkVersion 19
     buildToolsVersion "19.0.1"
 
diff --git a/build.gradle b/build.gradle
index 631baecbf..0ce5dc8c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,3 @@
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.9'
+    gradleVersion = '1.10'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d5c591c9c532da774b062aa6d7ab16405ff8700a..5838598129719e795cc5633f411468bdec311016 100644
GIT binary patch
delta 3330
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

delta 3190
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
IghD^SKZDj&^Z)<=

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3f5e4108d..5b8876320 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 19 15:34:04 CST 2013
+#Thu Jan 23 22:07:16 CST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
diff --git a/lint.xml b/lint.xml
index 0722840be..ddfded2df 100644
--- a/lint.xml
+++ b/lint.xml
@@ -2,5 +2,8 @@
 <lint>
     <issue id="InconsistentArrays" severity="error"/>
     <issue id="MissingTranslation" severity="ignore"/>
-    <issue id="TypographyEllipsis" severity="ignore"/>
+    <issue id="MissingQuantity" severity="ignore"/>
+    <issue id="InvalidPackage" severity="ignore"/>
+    <issue id="NewApi" severity="ignore"/>
+    <issue id="ValidFragment" severity="ignore"/>
 </lint>