From 6783766b394365f02e26dd0175a030a74fb4cdc2 Mon Sep 17 00:00:00 2001 From: Johan Walles Date: Thu, 7 Apr 2016 15:15:57 +0200 Subject: [PATCH] Get CI working again Before this change: * We used to have the wrong build requirements in .travis.yml * The Android linter crashed during CI The Android linter crash is this problem: https://github.com/JakeWharton/timber/issues/109 We work around it in this change by explicitly calling .toString() on a parameter to a logging call. As for the wrong requirements, this change simply updates them. --- .travis.yml | 3 +-- src/main/java/com/todoroo/andlib/data/DatabaseDao.java | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc8ef21d6..25ae7b37d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ android: - tools # https://github.com/travis-ci/travis-ci/issues/5049 - android-23 - platform-tools-23.1 - - build-tools-23.0.2 + - build-tools-23.0.3 - extra-android-m2repository - extra-google-m2repository licenses: @@ -28,4 +28,3 @@ script: after_success: - mv build/reports/coverage/googleplay/debug/report.xml build/reports/coverage/googleplay/debug/coverage.xml - bash <(curl -s https://codecov.io/bash) - diff --git a/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/src/main/java/com/todoroo/andlib/data/DatabaseDao.java index c66abaa86..301e37de7 100644 --- a/src/main/java/com/todoroo/andlib/data/DatabaseDao.java +++ b/src/main/java/com/todoroo/andlib/data/DatabaseDao.java @@ -12,6 +12,8 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Query; import com.todoroo.astrid.dao.Database; +import org.tasks.BuildConfig; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -219,7 +221,9 @@ public class DatabaseDao { if (result.get()) { onModelUpdated(item); item.markSaved(); - Timber.d("%s %s", op, item); + if (BuildConfig.DEBUG) { + Timber.d("%s %s", op, item.toString()); + } } } return result.get();