updated library version

This commit is contained in:
Mariotaku Lee 2015-08-16 17:34:49 +08:00
parent 641a61cb65
commit e119c6f8b1
8 changed files with 30 additions and 16 deletions

View File

@ -22,7 +22,7 @@ android:
# - sys-img-armeabi-v7a-android-19
# - sys-img-x86-android-17
jdk:
- openjdk7
- oraclejdk7
sudo: false

View File

@ -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'

View File

@ -80,6 +80,6 @@ public class ObjectCursor<E> extends AbstractList<E> {
}
abstract T newObject(Cursor cursor);
public abstract T newObject(Cursor cursor);
}
}

View File

@ -624,7 +624,7 @@ public class ParcelableStatus implements Parcelable, Comparable<ParcelableStatus
}
@Override
ParcelableStatus newObject(Cursor cursor) {
public ParcelableStatus newObject(Cursor cursor) {
final long time = System.currentTimeMillis();
final ParcelableStatus status = new ParcelableStatus(cursor, this);
TwitterContentUtils.checkTime(status.timestamp, time);

View File

@ -856,13 +856,12 @@ public interface TwidereDataStore {
String TARGET_OBJECT_STATUSES = "target_object_statuses";
String TARGET_OBJECT_USER_LISTS = "target_object_user_lists";
}
interface AboutMe extends Activities {
interface ActivitiesAboutMe extends Activities {
String CONTENT_PATH = "activities_about_me";
String CONTENT_PATH = "activities_about_me";
Uri CONTENT_URI = Uri.withAppendedPath(BASE_CONTENT_URI, CONTENT_PATH);
Uri CONTENT_URI = Uri.withAppendedPath(BASE_CONTENT_URI, CONTENT_PATH);
}
}
interface Tabs extends BaseColumns {

View File

@ -29,6 +29,7 @@ android {
targetSdkVersion 22
versionCode 1
versionName "1.0"
multiDexEnabled true
}
compileOptions {

View File

@ -65,7 +65,7 @@ dependencies {
compile 'com.android.support:recyclerview-v7:22.2.1'
compile 'com.twitter:twitter-text:1.12.1'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
compile 'com.squareup:otto:1.3.7'
compile 'com.squareup:otto:1.3.8'
compile 'dnsjava:dnsjava:2.1.7'
compile 'com.commonsware.cwac:merge:1.1.1'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.1.4'
@ -78,21 +78,21 @@ dependencies {
compile 'com.github.mariotaku:DragSortListView:0.6.1'
compile 'com.github.uucky:ColorPicker-Android:0.9.7@aar'
compile 'com.github.boxme:asyncmanager:1.0.0'
compile 'com.sprylab.android.texturevideoview:texturevideoview:1.0.0'
compile 'com.squareup:pollexor:2.0.2'
compile 'com.sprylab.android.texturevideoview:texturevideoview:1.0.1'
compile 'com.squareup:pollexor:2.0.3'
compile 'com.squareup:tape:1.2.3'
compile 'org.apache.commons:commons-lang3:3.4'
compile 'com.bluelinelabs:logansquare:1.1.0'
compile 'ch.acra:acra:4.6.2'
compile 'org.jraf:android-switch-backport:2.0.1'
compile 'com.fasterxml.jackson.jr:jackson-jr-objects:2.3.0'
compile 'com.fasterxml.jackson.jr:jackson-jr-objects:2.6.1'
compile 'com.makeramen:roundedimageview:2.1.1'
compile 'com.soundcloud.android:android-crop:1.0.0@aar'
compile 'com.hannesdorfmann.parcelableplease:annotation:1.0.1'
compile 'com.github.mariotaku:PickNCrop:44b09cbc69'
compile 'com.diogobernardino:williamchart:1.7.0'
compile 'com.diogobernardino:williamchart:2.0.1'
googleCompile 'com.google.android.gms:play-services-maps:7.5.0'
googleCompile 'com.google.maps.android:android-maps-utils:0.3.4'
googleCompile 'com.google.maps.android:android-maps-utils:0.4'
fdroidCompile 'org.osmdroid:osmdroid-android:4.3'
fdroidCompile 'org.slf4j:slf4j-simple:1.7.12'
debugCompile 'com.facebook.stetho:stetho:1.1.1'

View File

@ -19,6 +19,7 @@
package org.mariotaku.twidere.model;
import android.database.Cursor;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
@ -29,6 +30,7 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import com.hannesdorfmann.parcelableplease.annotation.ParcelableThisPlease;
import org.mariotaku.twidere.api.twitter.model.Activity;
import org.mariotaku.twidere.loader.support.ObjectCursorLoader;
import java.util.Arrays;
@ -157,4 +159,16 @@ public class ParcelableActivity implements Comparable<ParcelableActivity>, Parce
public void writeToParcel(Parcel dest, int flags) {
ParcelableActivityParcelablePlease.writeToParcel(this, dest, flags);
}
public static class CursorIndices extends ObjectCursor.CursorIndices<ParcelableActivity> {
public CursorIndices(@NonNull Cursor cursor) {
super(cursor);
}
@Override
public ParcelableActivity newObject(Cursor cursor) {
throw new UnsupportedOperationException();
}
}
}