From f0ee7884d5b4939461eca6a9338658094f3f70ef Mon Sep 17 00:00:00 2001 From: Simon Bergeron Date: Fri, 10 Sep 2021 11:45:21 -0600 Subject: [PATCH] Android X update --- .../android/dbflow/rx/language/CursorResultSubscriber.java | 2 +- .../android/dbflow/rx/language/RXModelQueriable.java | 4 ++-- .../android/dbflow/rx/language/RXModelQueriableImpl.java | 2 +- .../raizlabs/android/dbflow/rx/language/RXQueriable.java | 2 +- .../android/dbflow/rx/language/RXQueriableImpl.java | 2 +- .../com/raizlabs/android/dbflow/rx/language/RXSQLite.java | 2 +- .../dbflow/rx/language/TableChangeListenerEmitter.java | 4 ++-- .../raizlabs/android/dbflow/rx/structure/BaseRXModel.java | 2 +- .../android/dbflow/rx2/language/CursorResultFlowable.java | 4 ++-- .../android/dbflow/rx2/language/RXModelQueriable.java | 4 ++-- .../android/dbflow/rx2/language/RXModelQueriableImpl.java | 2 +- .../raizlabs/android/dbflow/rx2/language/RXQueriable.java | 2 +- .../android/dbflow/rx2/language/RXQueriableImpl.java | 7 ++++--- .../com/raizlabs/android/dbflow/rx2/language/RXSQLite.java | 2 +- .../dbflow/rx2/language/TableChangeOnSubscribe.java | 4 ++-- .../android/dbflow/sqlcipher/SQLCipherDatabase.java | 4 ++-- .../android/dbflow/sqlcipher/SQLCipherOpenHelper.java | 4 ++-- .../android/dbflow/sqlcipher/SQLCipherStatement.java | 2 +- dbflow/build.gradle | 2 +- .../com/raizlabs/android/dbflow/config/DatabaseConfig.java | 4 ++-- .../raizlabs/android/dbflow/config/DatabaseDefinition.java | 4 ++-- .../com/raizlabs/android/dbflow/config/FlowConfig.java | 4 ++-- .../com/raizlabs/android/dbflow/config/FlowManager.java | 6 +++--- .../com/raizlabs/android/dbflow/config/TableConfig.java | 4 ++-- .../raizlabs/android/dbflow/list/FlowCursorIterator.java | 4 ++-- .../com/raizlabs/android/dbflow/list/FlowCursorList.java | 4 ++-- .../com/raizlabs/android/dbflow/list/FlowQueryList.java | 4 ++-- .../raizlabs/android/dbflow/list/IFlowCursorIterator.java | 4 ++-- .../android/dbflow/runtime/BaseContentProvider.java | 2 +- .../android/dbflow/runtime/BaseTransactionManager.java | 2 +- .../android/dbflow/runtime/ContentResolverNotifier.java | 4 ++-- .../raizlabs/android/dbflow/runtime/DBBatchSaveQueue.java | 4 ++-- .../android/dbflow/runtime/DirectModelNotifier.java | 4 ++-- .../android/dbflow/runtime/FlowContentObserver.java | 4 ++-- .../com/raizlabs/android/dbflow/runtime/ModelNotifier.java | 2 +- .../raizlabs/android/dbflow/runtime/NotifyDistributor.java | 4 ++-- .../android/dbflow/runtime/OnTableChangedListener.java | 4 ++-- .../android/dbflow/runtime/StubContentProvider.java | 4 ++-- .../android/dbflow/runtime/TableNotifierRegister.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/BaseAsyncObject.java | 4 ++-- .../java/com/raizlabs/android/dbflow/sql/SqlUtils.java | 4 ++-- .../raizlabs/android/dbflow/sql/language/Actionable.java | 2 +- .../android/dbflow/sql/language/BaseModelQueriable.java | 4 ++-- .../raizlabs/android/dbflow/sql/language/BaseOperator.java | 4 ++-- .../android/dbflow/sql/language/BaseQueriable.java | 2 +- .../android/dbflow/sql/language/BaseTransformable.java | 2 +- .../com/raizlabs/android/dbflow/sql/language/Case.java | 4 ++-- .../android/dbflow/sql/language/CaseCondition.java | 4 ++-- .../android/dbflow/sql/language/CompletedTrigger.java | 2 +- .../raizlabs/android/dbflow/sql/language/CursorResult.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/Delete.java | 2 +- .../android/dbflow/sql/language/ExistenceOperator.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/From.java | 4 ++-- .../raizlabs/android/dbflow/sql/language/IConditional.java | 2 +- .../raizlabs/android/dbflow/sql/language/IOperator.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/Index.java | 2 +- .../raizlabs/android/dbflow/sql/language/IndexedBy.java | 2 +- .../com/raizlabs/android/dbflow/sql/language/Insert.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/Join.java | 2 +- .../com/raizlabs/android/dbflow/sql/language/Method.java | 2 +- .../raizlabs/android/dbflow/sql/language/NameAlias.java | 2 +- .../com/raizlabs/android/dbflow/sql/language/Operator.java | 4 ++-- .../android/dbflow/sql/language/OperatorGroup.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/OrderBy.java | 2 +- .../raizlabs/android/dbflow/sql/language/SQLOperator.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/SQLite.java | 4 ++-- .../com/raizlabs/android/dbflow/sql/language/Select.java | 2 +- .../java/com/raizlabs/android/dbflow/sql/language/Set.java | 2 +- .../android/dbflow/sql/language/Transformable.java | 2 +- .../com/raizlabs/android/dbflow/sql/language/Trigger.java | 2 +- .../android/dbflow/sql/language/TriggerMethod.java | 2 +- .../android/dbflow/sql/language/UnSafeStringOperator.java | 6 +++--- .../com/raizlabs/android/dbflow/sql/language/Update.java | 2 +- .../com/raizlabs/android/dbflow/sql/language/Where.java | 2 +- .../raizlabs/android/dbflow/sql/language/WhereBase.java | 2 +- .../android/dbflow/sql/language/property/IProperty.java | 2 +- .../dbflow/sql/language/property/IndexProperty.java | 2 +- .../android/dbflow/sql/language/property/Property.java | 4 ++-- .../dbflow/sql/language/property/PropertyFactory.java | 4 ++-- .../sql/language/property/TypeConvertedProperty.java | 2 +- .../dbflow/sql/language/property/WrapperProperty.java | 2 +- .../android/dbflow/sql/migration/AlterTableMigration.java | 4 ++-- .../android/dbflow/sql/migration/BaseMigration.java | 2 +- .../android/dbflow/sql/migration/IndexMigration.java | 5 +++-- .../dbflow/sql/migration/IndexPropertyMigration.java | 2 +- .../raizlabs/android/dbflow/sql/migration/Migration.java | 2 +- .../android/dbflow/sql/migration/UpdateTableMigration.java | 6 +++--- .../raizlabs/android/dbflow/sql/queriable/AsyncQuery.java | 2 +- .../dbflow/sql/queriable/CacheableListModelLoader.java | 4 ++-- .../android/dbflow/sql/queriable/CacheableModelLoader.java | 4 ++-- .../android/dbflow/sql/queriable/ListModelLoader.java | 4 ++-- .../raizlabs/android/dbflow/sql/queriable/ModelLoader.java | 4 ++-- .../android/dbflow/sql/queriable/ModelQueriable.java | 6 +++--- .../raizlabs/android/dbflow/sql/queriable/Queriable.java | 4 ++-- .../sql/queriable/SingleKeyCacheableListModelLoader.java | 4 ++-- .../sql/queriable/SingleKeyCacheableModelLoader.java | 4 ++-- .../android/dbflow/sql/queriable/SingleModelLoader.java | 4 ++-- .../raizlabs/android/dbflow/sql/queriable/StringQuery.java | 2 +- .../dbflow/sql/saveable/AutoIncrementModelSaver.java | 2 +- .../dbflow/sql/saveable/CacheableListModelSaver.java | 2 +- .../android/dbflow/sql/saveable/ListModelSaver.java | 2 +- .../raizlabs/android/dbflow/sql/saveable/ModelSaver.java | 2 +- .../com/raizlabs/android/dbflow/structure/AsyncModel.java | 4 ++-- .../com/raizlabs/android/dbflow/structure/BaseModel.java | 2 +- .../raizlabs/android/dbflow/structure/BaseQueryModel.java | 2 +- .../raizlabs/android/dbflow/structure/InstanceAdapter.java | 2 +- .../raizlabs/android/dbflow/structure/InternalAdapter.java | 7 ++++--- .../java/com/raizlabs/android/dbflow/structure/Model.java | 2 +- .../raizlabs/android/dbflow/structure/ModelAdapter.java | 4 ++-- .../android/dbflow/structure/ModelViewAdapter.java | 2 +- .../android/dbflow/structure/NoModificationModel.java | 2 +- .../android/dbflow/structure/QueryModelAdapter.java | 2 +- .../raizlabs/android/dbflow/structure/ReadOnlyModel.java | 2 +- .../android/dbflow/structure/RetrievalAdapter.java | 5 +++-- .../dbflow/structure/cache/IMultiKeyCacheConverter.java | 2 +- .../android/dbflow/structure/cache/ModelCache.java | 4 ++-- .../android/dbflow/structure/cache/ModelLruCache.java | 4 ++-- .../android/dbflow/structure/cache/SimpleMapCache.java | 4 ++-- .../dbflow/structure/cache/SparseArrayBasedCache.java | 4 ++-- .../android/dbflow/structure/database/AndroidDatabase.java | 4 ++-- .../structure/database/AndroidDatabaseStatement.java | 4 ++-- .../dbflow/structure/database/BaseDatabaseHelper.java | 2 +- .../dbflow/structure/database/BaseDatabaseStatement.java | 2 +- .../dbflow/structure/database/DatabaseHelperDelegate.java | 4 ++-- .../dbflow/structure/database/DatabaseHelperListener.java | 2 +- .../dbflow/structure/database/DatabaseStatement.java | 4 ++-- .../structure/database/DatabaseStatementWrapper.java | 4 ++-- .../android/dbflow/structure/database/DatabaseWrapper.java | 4 ++-- .../android/dbflow/structure/database/FlowCursor.java | 4 ++-- .../dbflow/structure/database/FlowSQLiteOpenHelper.java | 4 ++-- .../android/dbflow/structure/database/OpenHelper.java | 4 ++-- .../database/transaction/DefaultTransactionManager.java | 2 +- .../database/transaction/DefaultTransactionQueue.java | 2 +- .../database/transaction/FastStoreModelTransaction.java | 2 +- .../structure/database/transaction/ITransactionQueue.java | 2 +- .../database/transaction/PriorityTransactionQueue.java | 2 +- .../database/transaction/PriorityTransactionWrapper.java | 4 ++-- .../database/transaction/ProcessModelTransaction.java | 2 +- .../structure/database/transaction/QueryTransaction.java | 4 ++-- .../dbflow/structure/database/transaction/Transaction.java | 4 ++-- .../dbflow/structure/listener/LoadFromCursorListener.java | 2 +- .../dbflow/structure/listener/SQLiteStatementListener.java | 2 +- .../dbflow/structure/provider/BaseProviderModel.java | 4 ++-- .../structure/provider/BaseSyncableProviderModel.java | 4 ++-- .../android/dbflow/structure/provider/ModelProvider.java | 4 ++-- gradle.properties | 4 +++- 146 files changed, 236 insertions(+), 230 deletions(-) diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/CursorResultSubscriber.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/CursorResultSubscriber.java index db0f5fd63..f4d78ed52 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/CursorResultSubscriber.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/CursorResultSubscriber.java @@ -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; diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriable.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriable.java index e168ec708..a2ae43b14 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriable.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriable.java @@ -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; @@ -103,4 +103,4 @@ public interface RXModelQueriable extends RXQueriable { */ @NonNull Observable> observeOnTableChanges(); -} \ No newline at end of file +} diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriableImpl.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriableImpl.java index c88955951..15ec8fa33 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriableImpl.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXModelQueriableImpl.java @@ -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; diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriable.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriable.java index 4c86a2e77..d8db590bf 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriable.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriable.java @@ -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; diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriableImpl.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriableImpl.java index e50e73f12..b86cc1738 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriableImpl.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXQueriableImpl.java @@ -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; diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXSQLite.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXSQLite.java index aeafc9fbf..80098a3fd 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXSQLite.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/RXSQLite.java @@ -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; diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/TableChangeListenerEmitter.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/TableChangeListenerEmitter.java index 3dcc48bd1..d4f732eed 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/TableChangeListenerEmitter.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/language/TableChangeListenerEmitter.java @@ -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; diff --git a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/structure/BaseRXModel.java b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/structure/BaseRXModel.java index be2d94817..7cee643ed 100644 --- a/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/structure/BaseRXModel.java +++ b/dbflow-rx/src/main/java/com/raizlabs/android/dbflow/rx/structure/BaseRXModel.java @@ -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; diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/CursorResultFlowable.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/CursorResultFlowable.java index d6922f376..073b0e008 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/CursorResultFlowable.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/CursorResultFlowable.java @@ -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; diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriable.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriable.java index 278c2b16c..dd6f5c661 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriable.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriable.java @@ -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; @@ -105,4 +105,4 @@ public interface RXModelQueriable extends RXQueriable { */ @NonNull Flowable> observeOnTableChanges(); -} \ No newline at end of file +} diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriableImpl.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriableImpl.java index a24105a2d..48c905009 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriableImpl.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXModelQueriableImpl.java @@ -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; diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriable.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriable.java index e2c121101..a278ae560 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriable.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriable.java @@ -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; diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriableImpl.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriableImpl.java index a33c8acf9..e95122447 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriableImpl.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXQueriableImpl.java @@ -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; @@ -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. */ diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXSQLite.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXSQLite.java index ad710392b..ede726c2a 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXSQLite.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/RXSQLite.java @@ -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; diff --git a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/TableChangeOnSubscribe.java b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/TableChangeOnSubscribe.java index e98a0288d..9cf7279ea 100644 --- a/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/TableChangeOnSubscribe.java +++ b/dbflow-rx2/src/main/java/com/raizlabs/android/dbflow/rx2/language/TableChangeOnSubscribe.java @@ -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; diff --git a/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherDatabase.java b/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherDatabase.java index eb78f63ef..84290db2c 100644 --- a/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherDatabase.java +++ b/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherDatabase.java @@ -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; diff --git a/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherOpenHelper.java b/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherOpenHelper.java index ea34301a5..728eba0f6 100644 --- a/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherOpenHelper.java +++ b/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherOpenHelper.java @@ -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; diff --git a/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherStatement.java b/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherStatement.java index 6c51130d7..f0bf1387f 100644 --- a/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherStatement.java +++ b/dbflow-sqlcipher/src/main/java/com/raizlabs/android/dbflow/sqlcipher/SQLCipherStatement.java @@ -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; diff --git a/dbflow/build.gradle b/dbflow/build.gradle index 896bdc472..3a9e901b2 100644 --- a/dbflow/build.gradle +++ b/dbflow/build.gradle @@ -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' diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseConfig.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseConfig.java index 11c3d50cd..f05db1c67 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseConfig.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseConfig.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseDefinition.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseDefinition.java index 637246f61..db0e294e9 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseDefinition.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/DatabaseDefinition.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowConfig.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowConfig.java index 8a6136917..0af16e0e0 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowConfig.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowConfig.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowManager.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowManager.java index 569c02173..0eca12c0f 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowManager.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/FlowManager.java @@ -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; @@ -532,4 +532,4 @@ public ModuleNotFoundException(Throwable throwable) { } } -} \ No newline at end of file +} diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/TableConfig.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/TableConfig.java index c01aefa7c..64cc07cb2 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/config/TableConfig.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/config/TableConfig.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorIterator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorIterator.java index e6a1347ae..6985e0eec 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorIterator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorIterator.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorList.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorList.java index 411ab6eac..c547ffb15 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorList.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorList.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowQueryList.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowQueryList.java index 3cf92935b..f96b9230e 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowQueryList.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowQueryList.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/IFlowCursorIterator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/IFlowCursorIterator.java index 31b890603..f0e0556f2 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/list/IFlowCursorIterator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/list/IFlowCursorIterator.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseContentProvider.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseContentProvider.java index c15a761bf..948d05629 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseContentProvider.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseContentProvider.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseTransactionManager.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseTransactionManager.java index ffdb2f7c1..9e538462a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseTransactionManager.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/BaseTransactionManager.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ContentResolverNotifier.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ContentResolverNotifier.java index fcf0eb1d9..84aae4dba 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ContentResolverNotifier.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ContentResolverNotifier.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DBBatchSaveQueue.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DBBatchSaveQueue.java index db91ff429..e1666be8c 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DBBatchSaveQueue.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DBBatchSaveQueue.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DirectModelNotifier.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DirectModelNotifier.java index d82ac32ab..bbbfb78de 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DirectModelNotifier.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/DirectModelNotifier.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/FlowContentObserver.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/FlowContentObserver.java index 32a667779..077062046 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/FlowContentObserver.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/FlowContentObserver.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ModelNotifier.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ModelNotifier.java index 279df9926..6cf86bc70 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ModelNotifier.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/ModelNotifier.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/NotifyDistributor.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/NotifyDistributor.java index af8279455..69492ad10 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/NotifyDistributor.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/NotifyDistributor.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/OnTableChangedListener.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/OnTableChangedListener.java index bc0285541..5d7300cf7 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/OnTableChangedListener.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/OnTableChangedListener.java @@ -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/StubContentProvider.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/StubContentProvider.java index fd498ca43..1e8c77846 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/StubContentProvider.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/StubContentProvider.java @@ -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} diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/TableNotifierRegister.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/TableNotifierRegister.java index 6ff597db6..c61da096f 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/TableNotifierRegister.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/runtime/TableNotifierRegister.java @@ -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; /** * Description: Defines how {@link ModelNotifier} registers listeners. Abstracts that away. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/BaseAsyncObject.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/BaseAsyncObject.java index 310012975..2ba7e15ee 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/BaseAsyncObject.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/BaseAsyncObject.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql; -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.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/SqlUtils.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/SqlUtils.java index 0916a74a6..22bfd6a40 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/SqlUtils.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/SqlUtils.java @@ -3,8 +3,8 @@ import android.content.ContentValues; import android.database.ContentObserver; import android.net.Uri; -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Actionable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Actionable.java index f461f91d8..169c49a5d 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Actionable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Actionable.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.BaseModel.Action; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseModelQueriable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseModelQueriable.java index bb7651f9a..1aa5b0906 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseModelQueriable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseModelQueriable.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.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.FlowLog; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseOperator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseOperator.java index 5b7535e63..f71e35099 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseOperator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseOperator.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.sql.language; import android.database.DatabaseUtils; -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.converter.TypeConverter; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseQueriable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseQueriable.java index ca72febec..d4faad83a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseQueriable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseQueriable.java @@ -3,7 +3,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDoneException; import android.database.sqlite.SQLiteStatement; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowLog; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseTransformable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseTransformable.java index ea768bf70..7af238a3a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseTransformable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/BaseTransformable.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.language.property.IProperty; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Case.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Case.java index f18a31924..d553e8539 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Case.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Case.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CaseCondition.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CaseCondition.java index 400fa818f..c2b6697c1 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CaseCondition.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CaseCondition.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CompletedTrigger.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CompletedTrigger.java index 135ff6c3d..5f4ae9c06 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CompletedTrigger.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CompletedTrigger.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.DatabaseDefinition; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CursorResult.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CursorResult.java index 27ff0ce74..8dbc145dd 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CursorResult.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/CursorResult.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.sql.language; import android.database.Cursor; -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.list.FlowCursorIterator; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Delete.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Delete.java index 5e2048d21..c3bfabe1b 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Delete.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Delete.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/ExistenceOperator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/ExistenceOperator.java index ae5786307..410b2d442 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/ExistenceOperator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/ExistenceOperator.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/From.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/From.java index 57a60389c..20748a9d3 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/From.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/From.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.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.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IConditional.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IConditional.java index 817c55c28..2798f71cb 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IConditional.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IConditional.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IOperator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IOperator.java index 701b6bb07..291c1c111 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IOperator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IOperator.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Index.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Index.java index c79f5e476..87636657e 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Index.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Index.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IndexedBy.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IndexedBy.java index b585984da..998b8defb 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IndexedBy.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/IndexedBy.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Insert.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Insert.java index 8a3ffd590..e879ae965 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Insert.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Insert.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.sql.language; 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.annotation.ConflictAction; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Join.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Join.java index b607935f6..7988a941a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Join.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Join.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Method.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Method.java index 73b7e0172..f47741f7c 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Method.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Method.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.SQLiteType; import com.raizlabs.android.dbflow.sql.language.property.IProperty; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/NameAlias.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/NameAlias.java index c45b5e4da..57adbef3c 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/NameAlias.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/NameAlias.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.StringUtils; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Operator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Operator.java index 5fc78e755..10a2f06e2 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Operator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Operator.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.annotation.Collate; import com.raizlabs.android.dbflow.config.FlowLog; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OperatorGroup.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OperatorGroup.java index 11280ecf2..97aca9b2c 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OperatorGroup.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OperatorGroup.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OrderBy.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OrderBy.java index 6b21c0f1a..24ea714ae 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OrderBy.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/OrderBy.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.Collate; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLOperator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLOperator.java index 22fb92b5b..fe564fee8 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLOperator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLOperator.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLite.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLite.java index e0be50892..4f623792f 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLite.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/SQLite.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.language.property.IProperty; import com.raizlabs.android.dbflow.sql.language.property.Property; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Select.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Select.java index 76986122b..07bb3b081 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Select.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Select.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Set.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Set.java index f685e0959..a4bdea92d 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Set.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Set.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; import android.content.ContentValues; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Transformable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Transformable.java index 298e411b1..675512da3 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Transformable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Transformable.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.language.property.IProperty; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Trigger.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Trigger.java index f264fddcf..a5dee16ab 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Trigger.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Trigger.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/TriggerMethod.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/TriggerMethod.java index 270045074..522c96f4e 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/TriggerMethod.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/TriggerMethod.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/UnSafeStringOperator.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/UnSafeStringOperator.java index f9d225000..5ded7b4f9 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/UnSafeStringOperator.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/UnSafeStringOperator.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; -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.sql.Query; @@ -73,4 +73,4 @@ public String getQuery() { appendConditionToQuery(queryBuilder); return queryBuilder.getQuery(); } -} \ No newline at end of file +} diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Update.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Update.java index ea1764d3e..4da5da099 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Update.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Update.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.ConflictAction; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Where.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Where.java index 6c73082f4..0a494b66b 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Where.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/Where.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.provider.ContentProvider; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/WhereBase.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/WhereBase.java index cd5ff9b3e..96428328d 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/WhereBase.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/WhereBase.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IProperty.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IProperty.java index 7ffc60677..a1f108778 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IProperty.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IProperty.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language.property; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.language.Join; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IndexProperty.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IndexProperty.java index dcb2d5061..10e12b90c 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IndexProperty.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/IndexProperty.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language.property; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.Table; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/Property.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/Property.java index 863308993..ac6d1b021 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/Property.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/Property.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language.property; -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.language.BaseModelQueriable; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/PropertyFactory.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/PropertyFactory.java index 6b6457b5d..e6414ba9c 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/PropertyFactory.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/PropertyFactory.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.language.property; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.language.NameAlias; import com.raizlabs.android.dbflow.sql.language.Operator; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/TypeConvertedProperty.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/TypeConvertedProperty.java index 0fa7eca83..70bd663d3 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/TypeConvertedProperty.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/TypeConvertedProperty.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language.property; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.converter.TypeConverter; import com.raizlabs.android.dbflow.sql.language.NameAlias; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/WrapperProperty.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/WrapperProperty.java index e7e3dba35..a5accd609 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/WrapperProperty.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/language/property/WrapperProperty.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.language.property; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.language.NameAlias; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/AlterTableMigration.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/AlterTableMigration.java index 75d17f6de..0c9c4d465 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/AlterTableMigration.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/AlterTableMigration.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.sql.migration; import android.database.Cursor; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.sql.QueryBuilder; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/BaseMigration.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/BaseMigration.java index d2a6ff687..b6f9f3865 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/BaseMigration.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/BaseMigration.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.migration; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexMigration.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexMigration.java index 668a05152..b582839fa 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexMigration.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexMigration.java @@ -1,7 +1,8 @@ package com.raizlabs.android.dbflow.sql.migration; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; + +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.language.Index; import com.raizlabs.android.dbflow.sql.language.property.IProperty; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexPropertyMigration.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexPropertyMigration.java index 6a7a7ab68..ab854abaa 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexPropertyMigration.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/IndexPropertyMigration.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.migration; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.language.property.IndexProperty; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/Migration.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/Migration.java index 3b4980d0a..cabe1dfe9 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/Migration.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/Migration.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.migration; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/UpdateTableMigration.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/UpdateTableMigration.java index 5d4824444..9338a7de6 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/UpdateTableMigration.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/migration/UpdateTableMigration.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.sql.migration; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.language.BaseQueriable; import com.raizlabs.android.dbflow.sql.language.OperatorGroup; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/AsyncQuery.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/AsyncQuery.java index b44cd8fd6..a99fbae4b 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/AsyncQuery.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/AsyncQuery.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.queriable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.BaseAsyncObject; import com.raizlabs.android.dbflow.structure.database.transaction.QueryTransaction; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableListModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableListModelLoader.java index 99a7c07f6..d53223128 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableListModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableListModelLoader.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -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.structure.ModelAdapter; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableModelLoader.java index cfe9744f8..0706a3d63 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/CacheableModelLoader.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -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.structure.ModelAdapter; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ListModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ListModelLoader.java index 296bdacfc..941608867 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ListModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ListModelLoader.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -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.DatabaseWrapper; import com.raizlabs.android.dbflow.structure.database.FlowCursor; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelLoader.java index 3d79d59d2..ffe736ede 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelLoader.java @@ -2,8 +2,8 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -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.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelQueriable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelQueriable.java index e40edf87b..9c7c42435 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelQueriable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/ModelQueriable.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.sql.queriable; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.list.FlowCursorList; import com.raizlabs.android.dbflow.list.FlowQueryList; @@ -107,4 +107,4 @@ public interface ModelQueriable extends Queriable { */ @NonNull ModelQueriable disableCaching(); -} \ No newline at end of file +} diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/Queriable.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/Queriable.java index e6d70f665..e7f54465a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/Queriable.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/Queriable.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.Query; import com.raizlabs.android.dbflow.sql.language.Delete; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableListModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableListModelLoader.java index d6614275e..f03dfd91a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableListModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableListModelLoader.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -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.FlowCursor; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableModelLoader.java index 4bb81e459..606559f2a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleKeyCacheableModelLoader.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.structure.Model; import com.raizlabs.android.dbflow.structure.database.FlowCursor; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleModelLoader.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleModelLoader.java index e1e4cabe4..9b8c65a76 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleModelLoader.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/SingleModelLoader.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; -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.FlowCursor; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/StringQuery.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/StringQuery.java index 230dd0c44..893010827 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/StringQuery.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/queriable/StringQuery.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.queriable; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.sql.Query; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/AutoIncrementModelSaver.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/AutoIncrementModelSaver.java index 43d7c1dd6..e077a3d50 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/AutoIncrementModelSaver.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/AutoIncrementModelSaver.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.saveable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowLog; import com.raizlabs.android.dbflow.runtime.NotifyDistributor; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/CacheableListModelSaver.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/CacheableListModelSaver.java index c44478cd9..6009e6d4e 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/CacheableListModelSaver.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/CacheableListModelSaver.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.saveable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.ModelAdapter; import com.raizlabs.android.dbflow.structure.database.DatabaseStatement; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ListModelSaver.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ListModelSaver.java index 2c10e30cd..8bacdef3f 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ListModelSaver.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ListModelSaver.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.sql.saveable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.database.DatabaseStatement; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ModelSaver.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ModelSaver.java index e19c828e8..fc4aebb8d 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ModelSaver.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/saveable/ModelSaver.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.sql.saveable; import android.content.ContentValues; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.ConflictAction; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/AsyncModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/AsyncModel.java index a477d8b5f..b14186226 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/AsyncModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/AsyncModel.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure; -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.BaseAsyncObject; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseModel.java index 1deeaa793..5277b604e 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseModel.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.ColumnIgnore; import com.raizlabs.android.dbflow.config.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseQueryModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseQueryModel.java index 36333d667..a74120f4a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseQueryModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/BaseQueryModel.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.QueryModel; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InstanceAdapter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InstanceAdapter.java index 4be57ecb5..fb391eb45 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InstanceAdapter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InstanceAdapter.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.DatabaseDefinition; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InternalAdapter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InternalAdapter.java index 064414487..a177fe4de 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InternalAdapter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/InternalAdapter.java @@ -2,9 +2,10 @@ import android.content.ContentValues; import android.database.sqlite.SQLiteStatement; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; + +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.annotation.PrimaryKey; import com.raizlabs.android.dbflow.structure.database.DatabaseStatement; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/Model.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/Model.java index 12ea1a6f3..c5c1d7c98 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/Model.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/Model.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; import com.raizlabs.android.dbflow.structure.database.transaction.DefaultTransactionQueue; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelAdapter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelAdapter.java index fe603a977..6ce3225eb 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelAdapter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelAdapter.java @@ -2,8 +2,8 @@ import android.content.ContentValues; import android.database.sqlite.SQLiteStatement; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.annotation.ConflictAction; import com.raizlabs.android.dbflow.annotation.ForeignKey; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelViewAdapter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelViewAdapter.java index 337e4cd1a..dc697f193 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelViewAdapter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ModelViewAdapter.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.DatabaseDefinition; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/NoModificationModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/NoModificationModel.java index fdb59a9d7..a6f5be96f 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/NoModificationModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/NoModificationModel.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowManager; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/QueryModelAdapter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/QueryModelAdapter.java index f00637fae..ef47e36cb 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/QueryModelAdapter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/QueryModelAdapter.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.annotation.QueryModel; import com.raizlabs.android.dbflow.config.DatabaseDefinition; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ReadOnlyModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ReadOnlyModel.java index d0bb43f31..4471097a6 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ReadOnlyModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/ReadOnlyModel.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.sql.migration.Migration; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/RetrievalAdapter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/RetrievalAdapter.java index 83a853814..77d6c4059 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/RetrievalAdapter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/RetrievalAdapter.java @@ -1,8 +1,9 @@ package com.raizlabs.android.dbflow.structure; import android.database.Cursor; -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/IMultiKeyCacheConverter.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/IMultiKeyCacheConverter.java index afc294e1e..486f69050 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/IMultiKeyCacheConverter.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/IMultiKeyCacheConverter.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.cache; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.Model; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelCache.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelCache.java index 1bf321a05..cba0f0164 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelCache.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelCache.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.cache; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Description: A generic cache for models that is implemented or can be implemented to your liking. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelLruCache.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelLruCache.java index e7b72b431..e1d3a38de 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelLruCache.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/ModelLruCache.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.cache; -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SimpleMapCache.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SimpleMapCache.java index 59bbdeb5e..6ea3d9c6e 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SimpleMapCache.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SimpleMapCache.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.cache; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.config.FlowLog; import com.raizlabs.android.dbflow.structure.Model; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SparseArrayBasedCache.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SparseArrayBasedCache.java index 4db00dca0..081ce4cda 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SparseArrayBasedCache.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/cache/SparseArrayBasedCache.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.cache; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.SparseArray; import com.raizlabs.android.dbflow.config.FlowLog; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabase.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabase.java index bad1e661b..8479f8161 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabase.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabase.java @@ -3,8 +3,8 @@ import android.content.ContentValues; import android.database.sqlite.SQLiteDatabase; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Description: Specifies the android default implementation of a database. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabaseStatement.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabaseStatement.java index df44ce5c8..04e5e2171 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabaseStatement.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/AndroidDatabaseStatement.java @@ -5,8 +5,8 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteStatement; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Description: diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseHelper.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseHelper.java index 807056552..3ebd49420 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseHelper.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseHelper.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database; import android.database.sqlite.SQLiteException; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.DatabaseDefinition; import com.raizlabs.android.dbflow.config.FlowLog; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseStatement.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseStatement.java index 4918b70bb..890ed77da 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseStatement.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/BaseDatabaseStatement.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.database; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Description: Default implementation for some {@link DatabaseStatement} methods. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperDelegate.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperDelegate.java index edfb62be7..ad67c0d6f 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperDelegate.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperDelegate.java @@ -2,8 +2,8 @@ import android.content.Context; import android.database.sqlite.SQLiteOpenHelper; -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; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperListener.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperListener.java index 7d787642a..ec3db3d64 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperListener.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseHelperListener.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.database; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Description: Provides callbacks for {@link OpenHelper} methods diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatement.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatement.java index 99c1c9d06..c2b4b1fe9 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatement.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatement.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.structure.database; import android.database.sqlite.SQLiteStatement; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Description: Abstracts out a {@link SQLiteStatement}. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatementWrapper.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatementWrapper.java index 1eac49388..ad6dc0cda 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatementWrapper.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseStatementWrapper.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.runtime.NotifyDistributor; import com.raizlabs.android.dbflow.sql.language.BaseQueriable; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseWrapper.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseWrapper.java index 8e7d8ffb2..071c6c4b7 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseWrapper.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/DatabaseWrapper.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.structure.database; import android.content.ContentValues; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Description: Provides a base implementation that wraps a database, so other database engines potentially can diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowCursor.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowCursor.java index 2f30379fd..be6723c2b 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowCursor.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowCursor.java @@ -2,8 +2,8 @@ import android.database.Cursor; import android.database.CursorWrapper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Common {@link Cursor} class that wraps cursors we use in this library with convenience loading methods. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowSQLiteOpenHelper.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowSQLiteOpenHelper.java index 922fff94c..6a3675f26 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowSQLiteOpenHelper.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/FlowSQLiteOpenHelper.java @@ -3,8 +3,8 @@ import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -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.FlowManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/OpenHelper.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/OpenHelper.java index 280e3b80a..f7e05bb4d 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/OpenHelper.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/OpenHelper.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Description: Abstracts out the {@link DatabaseHelperDelegate} into the one used in this library. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionManager.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionManager.java index 4f8d81ced..5d8f08a11 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionManager.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionManager.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.database.transaction; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.DatabaseDefinition; import com.raizlabs.android.dbflow.runtime.BaseTransactionManager; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionQueue.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionQueue.java index 75503e926..c52dadc7b 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionQueue.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/DefaultTransactionQueue.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database.transaction; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowLog; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/FastStoreModelTransaction.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/FastStoreModelTransaction.java index da5ba517c..0f8c5a539 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/FastStoreModelTransaction.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/FastStoreModelTransaction.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.database.transaction; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.InternalAdapter; import com.raizlabs.android.dbflow.structure.Model; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ITransactionQueue.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ITransactionQueue.java index 581b39374..ad0c2df41 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ITransactionQueue.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ITransactionQueue.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.database.transaction; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Description: Interface for a queue that manages transactions. diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionQueue.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionQueue.java index 280e5e431..d27d3ef83 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionQueue.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionQueue.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database.transaction; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.config.FlowLog; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionWrapper.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionWrapper.java index 84902201d..57c104621 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionWrapper.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/PriorityTransactionWrapper.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database.transaction; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ProcessModelTransaction.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ProcessModelTransaction.java index 3ae0c3bd7..ade035f07 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ProcessModelTransaction.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/ProcessModelTransaction.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.database.transaction; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.Model; import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/QueryTransaction.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/QueryTransaction.java index f96b7e562..2316f81d9 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/QueryTransaction.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/QueryTransaction.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.database.transaction; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.language.CursorResult; import com.raizlabs.android.dbflow.sql.queriable.ModelQueriable; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/Transaction.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/Transaction.java index 5f5a4bd64..499547e34 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/Transaction.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/database/transaction/Transaction.java @@ -2,8 +2,8 @@ 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.config.DatabaseDefinition; import com.raizlabs.android.dbflow.config.FlowLog; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/LoadFromCursorListener.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/LoadFromCursorListener.java index e0d52053a..a95765472 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/LoadFromCursorListener.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/LoadFromCursorListener.java @@ -1,7 +1,7 @@ package com.raizlabs.android.dbflow.structure.listener; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.Model; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/SQLiteStatementListener.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/SQLiteStatementListener.java index 788f89a6c..63ffdd44d 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/SQLiteStatementListener.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/listener/SQLiteStatementListener.java @@ -1,6 +1,6 @@ package com.raizlabs.android.dbflow.structure.listener; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.raizlabs.android.dbflow.structure.InternalAdapter; import com.raizlabs.android.dbflow.structure.Model; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseProviderModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseProviderModel.java index 99442795f..a302b765a 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseProviderModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseProviderModel.java @@ -2,8 +2,8 @@ import android.content.ContentProvider; import android.database.Cursor; -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.language.OperatorGroup; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseSyncableProviderModel.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseSyncableProviderModel.java index 8699e99d8..9407bd5bf 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseSyncableProviderModel.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/BaseSyncableProviderModel.java @@ -1,8 +1,8 @@ package com.raizlabs.android.dbflow.structure.provider; import android.content.ContentProvider; -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.language.OperatorGroup; diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/ModelProvider.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/ModelProvider.java index d1d8eae33..f5b0556f7 100644 --- a/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/ModelProvider.java +++ b/dbflow/src/main/java/com/raizlabs/android/dbflow/structure/provider/ModelProvider.java @@ -2,8 +2,8 @@ import android.content.ContentResolver; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.raizlabs.android.dbflow.sql.language.Operator; import com.raizlabs.android.dbflow.sql.language.OperatorGroup; diff --git a/gradle.properties b/gradle.properties index fa23c81e8..5deb56233 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,6 @@ dbflow_build_tools_version=26.0.2 dbflow_min_sdk=4 dbflow_min_sdk_rx=15 -dbflow_target_sdk=26 \ No newline at end of file +dbflow_target_sdk=26 + +android.useAndroidX=true