From ef9eab9bc78469a69617e4f325fce386028986dd Mon Sep 17 00:00:00 2001 From: Jamie McDonald Date: Tue, 18 Mar 2014 10:20:35 +0100 Subject: [PATCH] Make MonitoredActivity abstract --- .travis.yml | 5 +++-- build.gradle | 2 +- .../java/com/soundcloud/android/crop/MonitoredActivity.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54e0b27..c4a0b43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: # For a full list, run `android list sdk -a --extended` # Note that sysimg-19 downloads only ARM, because only the first license query is accepted. - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null - - echo yes | android update sdk --all --filter build-tools-19.0.0 --no-ui --force > /dev/null + - echo yes | android update sdk --all --filter build-tools-19.0.3 --no-ui --force > /dev/null - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null @@ -27,7 +27,8 @@ before_install: - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - emulator -avd test -no-skin -no-audio -no-window & -install: true +install: + - ./gradlew :lib:build before_script: - adb wait-for-device diff --git a/build.gradle b/build.gradle index dff7ae9..ee56be6 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { allprojects { group = 'com.soundcloud.android' - version = '0.9.5' + version = '0.9.6' repositories { mavenCentral() diff --git a/lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java b/lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java index da6ac58..ac85473 100644 --- a/lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java +++ b/lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java @@ -24,7 +24,7 @@ import java.util.ArrayList; /* * Modified from original in AOSP. */ -public class MonitoredActivity extends Activity { +public abstract class MonitoredActivity extends Activity { private final ArrayList mListeners = new ArrayList();