diff --git a/build.gradle b/build.gradle index 977b2d77e..ac94b550c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.1.51' + ext.kotlin_version = '1.9.24' repositories { - jcenter() + mavenCentral() google() + maven { url "https://www.jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + classpath 'com.android.tools.build:gradle:8.2.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() google() maven { url "https://www.jitpack.io" } } diff --git a/dbflow-core/build.gradle b/dbflow-core/build.gradle index 8a3deae9b..85818d487 100644 --- a/dbflow-core/build.gradle +++ b/dbflow-core/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' project.ext.artifactId = bt_name -targetCompatibility = JavaVersion.VERSION_1_7 -sourceCompatibility = JavaVersion.VERSION_1_7 - -apply from: '../java-artifacts.gradle' \ No newline at end of file +java { + targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 +} \ No newline at end of file diff --git a/dbflow-processor/build.gradle b/dbflow-processor/build.gradle index b78e31608..e4c31a4bd 100644 --- a/dbflow-processor/build.gradle +++ b/dbflow-processor/build.gradle @@ -1,21 +1,30 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + apply plugin: 'java' apply plugin: 'kotlin' project.ext.artifactId = bt_name -targetCompatibility = JavaVersion.VERSION_1_8 -sourceCompatibility = JavaVersion.VERSION_1_8 +java { + targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 +} + +tasks.withType(KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = "17" + } +} dependencies { - compile project("${dbflow_project_prefix}dbflow-core") - compile 'com.squareup:javapoet:1.9.0' - compile 'com.github.agrosner:KPoet:1.0.0' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + implementation project("${dbflow_project_prefix}dbflow-core") + implementation 'com.squareup:javapoet:1.9.0' + // Only library that is added to POM. + implementation 'com.github.agrosner:KPoet:1.0.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compileOnly 'org.glassfish:javax.annotation:10.0-b28' testImplementation 'junit:junit:4.12' } - -apply from: '../java-artifacts.gradle' diff --git a/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/ClassNames.kt b/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/ClassNames.kt index 409802bf2..b92fd85d5 100644 --- a/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/ClassNames.kt +++ b/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/ClassNames.kt @@ -93,7 +93,7 @@ object ClassNames { val SINGLE_KEY_CACHEABLE_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleKeyCacheableModelLoader") val SINGLE_KEY_CACHEABLE_LIST_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleKeyCacheableListModelLoader") - val NON_NULL = ClassName.get("android.support.annotation", "NonNull") + val NON_NULL = ClassName.get("androidx.annotation", "NonNull") val GENERATED = ClassName.get("javax.annotation", "Generated") } diff --git a/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/definition/column/ColumnDefinition.kt b/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/definition/column/ColumnDefinition.kt index 1fb2ee096..fa8b968ea 100644 --- a/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/definition/column/ColumnDefinition.kt +++ b/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/definition/column/ColumnDefinition.kt @@ -125,7 +125,7 @@ constructor(processorManager: ProcessorManager, element: Element, isNullableType = false } - // android support annotation + // androidx annotation element.annotationMirrors .find { it.annotationType.toTypeElement().toClassName() == ClassNames.NON_NULL }?.let { isNotNullType = true diff --git a/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/utils/CodeExtensions.kt b/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/utils/CodeExtensions.kt index ad1a58f68..2bf732a38 100644 --- a/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/utils/CodeExtensions.kt +++ b/dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/utils/CodeExtensions.kt @@ -37,7 +37,7 @@ fun MethodSpec.Builder.statement(codeBlock: CodeBlock?): MethodSpec.Builder inline fun CodeBlock.Builder.catch(exception: KClass, function: CodeBlock.Builder.() -> CodeBlock.Builder) - = nextControl("catch", statement = "\$T e", args = exception.java, function = function).end() + = nextControl("catch", statement = "\$T e", args = *arrayOf(exception.java), function = function).end() fun codeBlock(function: CodeBlock.Builder.() -> CodeBlock.Builder) = CodeBlock.builder().function().build() diff --git a/dbflow/build.gradle b/dbflow/build.gradle index 896bdc472..2b03f01f7 100644 --- a/dbflow/build.gradle +++ b/dbflow/build.gradle @@ -1,8 +1,7 @@ apply plugin: 'com.android.library' -project.ext.artifactId = bt_name - android { + namespace 'com.raizlabs.android.dbflow' compileSdkVersion Integer.valueOf(dbflow_target_sdk) buildToolsVersion dbflow_build_tools_version @@ -17,15 +16,14 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } dependencies { + // Both are added to POM. 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/AndroidManifest.xml b/dbflow/src/main/AndroidManifest.xml deleted file mode 100644 index 166b778f3..000000000 --- a/dbflow/src/main/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - 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..d7e74715f 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; 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..9e61e1c22 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,6 @@ package com.raizlabs.android.dbflow.runtime; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; 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..cefa64b17 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,6 @@ package com.raizlabs.android.dbflow.sql.language; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; 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..96b324128 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; 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..81b24a5d1 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,7 @@ 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..f04086eaf 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; 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..2b4d13d25 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,9 @@ 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..59564ca17 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,8 @@ 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..25afce2fa 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,7 @@ 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.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..223fbb233 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,8 +8,9 @@ bt_licenseUrl=http://opensource.org/licenses/MIT bt_repo=Libraries dbflow_project_prefix=: kotlin.incremental=false -dbflow_build_tools_version=26.0.2 +dbflow_build_tools_version=34.0.0 -dbflow_min_sdk=4 -dbflow_min_sdk_rx=15 -dbflow_target_sdk=26 \ No newline at end of file +android.useAndroidX=true + +dbflow_min_sdk=26 +dbflow_target_sdk=34 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a8..7f93135c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4227ae5c7..ac72c34e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri Jul 14 11:05:04 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/gradlew b/gradlew index 91a7e269e..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -1,79 +1,127 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -82,83 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@"