Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android X Update #1726

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android X Update #1726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/CursorResultSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.config.FlowLog;
import com.raizlabs.android.dbflow.list.FlowCursorIterator;
Expand Down
4 changes: 2 additions & 2 deletions dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.list.FlowCursorList;
import com.raizlabs.android.dbflow.list.FlowQueryList;
Expand Down Expand Up @@ -103,4 +103,4 @@ public interface RXModelQueriable<TModel> extends RXQueriable {
*/
@NonNull
Observable<ModelQueriable<TModel>> observeOnTableChanges();
}
}
2 changes: 1 addition & 1 deletion dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.list.FlowCursorList;
import com.raizlabs.android.dbflow.list.FlowQueryList;
Expand Down
2 changes: 1 addition & 1 deletion dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.rx.language;

import android.database.Cursor;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.sql.language.Delete;
import com.raizlabs.android.dbflow.sql.language.Insert;
Expand Down
2 changes: 1 addition & 1 deletion dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.rx.language;

import android.database.Cursor;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.config.FlowManager;
import com.raizlabs.android.dbflow.sql.language.BaseQueriable;
Expand Down
2 changes: 1 addition & 1 deletion dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXSQLite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.sql.queriable.ModelQueriable;
import com.raizlabs.android.dbflow.sql.queriable.Queriable;
Expand Down
4 changes: 2 additions & 2 deletions ...-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/TableChangeListenerEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.rx.language;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.FlowManager;
import com.raizlabs.android.dbflow.runtime.OnTableChangedListener;
Expand Down
2 changes: 1 addition & 1 deletion dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/structure/BaseRXModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx.structure;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.annotation.ColumnIgnore;
import com.raizlabs.android.dbflow.config.FlowManager;
Expand Down
4 changes: 2 additions & 2 deletions dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/CursorResultFlowable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.rx2.language;

import android.support.annotation.NonNull;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;

import com.raizlabs.android.dbflow.config.FlowLog;
import com.raizlabs.android.dbflow.list.FlowCursorIterator;
Expand Down
4 changes: 2 additions & 2 deletions dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx2.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.list.FlowCursorList;
import com.raizlabs.android.dbflow.list.FlowQueryList;
Expand Down Expand Up @@ -105,4 +105,4 @@ public interface RXModelQueriable<TModel> extends RXQueriable {
*/
@NonNull
Flowable<ModelQueriable<TModel>> observeOnTableChanges();
}
}
2 changes: 1 addition & 1 deletion dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx2.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.list.FlowCursorList;
import com.raizlabs.android.dbflow.list.FlowQueryList;
Expand Down
2 changes: 1 addition & 1 deletion dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.rx2.language;

import android.database.Cursor;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.sql.language.Delete;
import com.raizlabs.android.dbflow.sql.language.Insert;
Expand Down
7 changes: 4 additions & 3 deletions dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.raizlabs.android.dbflow.rx2.language;

import static io.reactivex.Single.fromCallable;

import android.database.Cursor;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.config.FlowManager;
import com.raizlabs.android.dbflow.sql.language.BaseQueriable;
Expand All @@ -15,8 +18,6 @@
import io.reactivex.Maybe;
import io.reactivex.Single;

import static io.reactivex.Single.fromCallable;

/**
* Description: Represents {@link BaseQueriable} with RX constructs.
*/
Expand Down
2 changes: 1 addition & 1 deletion dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXSQLite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.rx2.language;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.sql.language.SQLite;
import com.raizlabs.android.dbflow.sql.queriable.ModelQueriable;
Expand Down
4 changes: 2 additions & 2 deletions ...ow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/TableChangeOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.rx2.language;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.FlowManager;
import com.raizlabs.android.dbflow.runtime.OnTableChangedListener;
Expand Down
4 changes: 2 additions & 2 deletions dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.sqlcipher;

import android.content.ContentValues;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.structure.database.DatabaseStatement;
import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper;
Expand Down
4 changes: 2 additions & 2 deletions ...ow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherOpenHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.sqlcipher;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.DatabaseConfig;
import com.raizlabs.android.dbflow.config.DatabaseDefinition;
Expand Down
2 changes: 1 addition & 1 deletion dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.sqlcipher;

import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.structure.database.BaseDatabaseStatement;
import com.raizlabs.android.dbflow.structure.database.DatabaseStatement;
Expand Down
2 changes: 1 addition & 1 deletion dbflow/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {

dependencies {
api project("${dbflow_project_prefix}dbflow-core")
api "com.android.support:support-annotations:26.0.1"
api "androidx.annotation:annotation:1.2.0"
}

apply from: '../android-artifacts.gradle'
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.config;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.StringUtils;
import com.raizlabs.android.dbflow.runtime.BaseTransactionManager;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.config;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.annotation.Database;
import com.raizlabs.android.dbflow.annotation.QueryModel;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.config;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.util.Collections;
import java.util.HashMap;
Expand Down
6 changes: 3 additions & 3 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.config;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.annotation.Table;
import com.raizlabs.android.dbflow.converter.TypeConverter;
Expand Down Expand Up @@ -532,4 +532,4 @@ public ModuleNotFoundException(Throwable throwable) {
}
}

}
}
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/config/TableConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.config;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.sql.queriable.ListModelLoader;
import com.raizlabs.android.dbflow.sql.queriable.SingleModelLoader;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.list;

import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.util.ConcurrentModificationException;
import java.util.ListIterator;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.list;

import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.widget.ListView;

import com.raizlabs.android.dbflow.config.FlowLog;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowQueryList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.StringUtils;
import com.raizlabs.android.dbflow.config.FlowManager;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/list/IFlowCursorIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.list;

import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.io.Closeable;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.content.ContentProvider;
import android.content.ContentValues;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.config.DatabaseDefinition;
import com.raizlabs.android.dbflow.config.DatabaseHolder;
Expand Down
2 changes: 1 addition & 1 deletion dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.runtime;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.config.DatabaseDefinition;
import com.raizlabs.android.dbflow.config.FlowLog;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ContentResolverNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.runtime;

import android.content.ContentResolver;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.FlowManager;
import com.raizlabs.android.dbflow.sql.SqlUtils;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DBBatchSaveQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.runtime;

import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.DatabaseDefinition;
import com.raizlabs.android.dbflow.config.FlowLog;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DirectModelNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.runtime;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.DatabaseConfig;
import com.raizlabs.android.dbflow.structure.BaseModel;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/FlowContentObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.DatabaseConfig;
import com.raizlabs.android.dbflow.config.FlowManager;
Expand Down
2 changes: 1 addition & 1 deletion dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ModelNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.raizlabs.android.dbflow.runtime;

import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.raizlabs.android.dbflow.structure.BaseModel;
import com.raizlabs.android.dbflow.structure.ModelAdapter;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/NotifyDistributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raizlabs.android.dbflow.runtime;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.config.FlowManager;
import com.raizlabs.android.dbflow.structure.BaseModel;
Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/OnTableChangedListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.raizlabs.android.dbflow.runtime;

import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.raizlabs.android.dbflow.structure.BaseModel;

Expand Down
4 changes: 2 additions & 2 deletions dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/StubContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import android.content.ContentValues;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

/**
* Description: Used as a stub, include this in order to work around Android O changes to {@link ContentProvider}
Expand Down
Loading