diff --git a/.travis.yml b/.travis.yml index d85cf7cda..d8b29a727 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ android: # - sys-img-armeabi-v7a-android-19 # - sys-img-x86-android-17 jdk: - - openjdk7 + - oraclejdk7 sudo: false diff --git a/build.gradle b/build.gradle index b58f3e952..4d4f5cb27 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ buildscript { } dependencies { classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3' - classpath 'com.android.tools.build:gradle:1.2.3' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.5.1' + classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7' classpath('fr.avianey.androidsvgdrawable:gradle-plugin:1.0.2') { // should be excluded to avoid conflict exclude group: 'xerces' diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ObjectCursor.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ObjectCursor.java index 255d74a4f..9da18ed4a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ObjectCursor.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ObjectCursor.java @@ -80,6 +80,6 @@ public class ObjectCursor extends AbstractList { } - abstract T newObject(Cursor cursor); + public abstract T newObject(Cursor cursor); } } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java index c745ef5e4..6ffcfe27d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java @@ -624,7 +624,7 @@ public class ParcelableStatus implements Parcelable, Comparable, Parce public void writeToParcel(Parcel dest, int flags) { ParcelableActivityParcelablePlease.writeToParcel(this, dest, flags); } + + public static class CursorIndices extends ObjectCursor.CursorIndices { + + public CursorIndices(@NonNull Cursor cursor) { + super(cursor); + } + + @Override + public ParcelableActivity newObject(Cursor cursor) { + throw new UnsupportedOperationException(); + } + } }