Jetified 4.2.4 branch

build.gradle

@@ -1,20 +1,20 @@
 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"
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
         maven { url "https://www.jitpack.io" }
     }

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'
+java {
+    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
+}

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'

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")
 }

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

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 <T : Throwable> CodeBlock.Builder.catch(exception: KClass<T>,
                                                    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()
 

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'

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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}

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.

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;

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;

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;
 

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;