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 d5c591c9c..583859812 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 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 @@ - + + + +