Move EmptyCursor to core:android:common

app/core/src/main/java/com/fsck/k9/helper/Contacts.java

@@ -6,7 +6,6 @@ import java.util.HashMap;
 import android.Manifest;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
@@ -15,6 +14,7 @@ import android.provider.ContactsContract.CommonDataKinds.Photo;
 
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import app.k9mail.core.android.common.database.EmptyCursor;
 import com.fsck.k9.mail.Address;
 import timber.log.Timber;
 

app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java

@@ -23,7 +23,7 @@ import androidx.annotation.Nullable;
 import androidx.loader.content.AsyncTaskLoader;
 import androidx.core.content.ContextCompat;
 
-import com.fsck.k9.helper.EmptyCursor;
+import app.k9mail.core.android.common.database.EmptyCursor;
 import com.fsck.k9.ui.R;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.view.RecipientSelectView.Recipient;

build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts

@@ -27,5 +27,6 @@ android {
 
 dependencies {
     implementation(libs.bundles.shared.jvm.main)
+    implementation(libs.bundles.shared.jvm.android)
     testImplementation(libs.bundles.shared.jvm.test)
 }

core/android/common/src/main/kotlin/app/k9mail/core/android/common/database/EmptyCursor.kt

@@ -1,4 +1,4 @@
-package com.fsck.k9.helper
+package app.k9mail.core.android.common.database
 
 import android.database.AbstractCursor
 

gradle/libs.versions.toml

@@ -69,7 +69,6 @@ androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayo
 androidx-work-ktx = "androidx.work:work-runtime-ktx:2.7.1"
 androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidxFragment" }
 androidx-localbroadcastmanager = "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0"
-androidx-core = { module = "androidx.core:core", version.ref = "androidxCore" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
 androidx-preference = { module = "androidx.preference:preference", version.ref = "androidxPreference" }
 androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -140,6 +139,9 @@ shared-jvm-main = [
   "koin-core",
   "kotlinx-datetime",
 ]
+shared-jvm-android = [
+  "androidx-core-ktx",
+]
 shared-jvm-test = [
   "junit",
   "truth",