wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move EmptyCursor to core:android:common

Browse source
This commit is contained in:
Wolf Montwé 2023-03-01 18:08:38 +01:00
parent 58e6f97580
commit be5894e743
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -23,7 +23,7 @@ import androidx.annotation.Nullable;
import androidx.loader.content.AsyncTaskLoader; import androidx.loader.content.AsyncTaskLoader;
import androidx.core.content.ContextCompat; 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.ui.R;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.view.RecipientSelectView.Recipient; import com.fsck.k9.view.RecipientSelectView.Recipient;

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

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

2
app/core/src/main/java/com/fsck/k9/helper/EmptyCursor.kt → core/android/common/src/main/kotlin/app/k9mail/core/android/common/database/EmptyCursor.kt
View file

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

4
gradle/libs.versions.toml
View file

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