chore: Move core module to core.main

app/build.gradle.kts

@@ -144,7 +144,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.core)
+    implementation(projects.core.main)
     implementation(projects.data)
     implementation(projects.domain)
     implementation(projects.i18n)

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.network
 
+import java.io.IOException
 import okhttp3.MediaType
 import okhttp3.ResponseBody
 import okio.Buffer
@@ -7,7 +8,6 @@ import okio.BufferedSource
 import okio.ForwardingSource
 import okio.Source
 import okio.buffer
-import java.io.IOException
 
 class ProgressResponseBody(private val responseBody: ResponseBody, private val progressListener: ProgressListener) : ResponseBody() {
 

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/Requests.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.network
 
+import java.util.concurrent.TimeUnit.MINUTES
 import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
@@ -7,7 +8,6 @@ import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.RequestBody
-import java.util.concurrent.TimeUnit.*
 
 private val DEFAULT_CACHE_CONTROL = CacheControl.Builder().maxAge(10, MINUTES).build()
 private val DEFAULT_HEADERS = Headers.Builder().build()

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt

@@ -1,11 +1,11 @@
 package eu.kanade.tachiyomi.network.interceptor
 
 import android.os.SystemClock
+import java.io.IOException
+import java.util.concurrent.TimeUnit
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
-import java.io.IOException
-import java.util.concurrent.*
 
 /**
  * An OkHttp interceptor that handles rate limiting.

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt

@@ -1,12 +1,12 @@
 package eu.kanade.tachiyomi.network.interceptor
 
 import android.os.SystemClock
+import java.io.IOException
+import java.util.concurrent.TimeUnit
 import okhttp3.HttpUrl
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
-import java.io.IOException
-import java.util.concurrent.*
 
 /**
  * An OkHttp interceptor that handles given url host's rate limiting.

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.network.interceptor
 
+import java.io.IOException
 import okhttp3.Interceptor
 import okhttp3.Response
-import java.io.IOException
 
 /**
  * Catches any uncaught exceptions from later in the chain and rethrows as a non-fatal

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt

@@ -10,13 +10,14 @@ import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.launchUI
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import eu.kanade.tachiyomi.util.system.toast
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import yokai.i18n.MR
-import java.util.*
-import java.util.concurrent.*
 
 abstract class WebViewInterceptor(
     private val context: Context,

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt

@@ -5,7 +5,6 @@ import android.widget.Toast
 import androidx.annotation.StringRes
 import dev.icerock.moko.resources.StringResource
 import yokai.util.lang.getString
-import dev.icerock.moko.resources.compose.stringResource
 
 /**
  * Display a toast in this context.

core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/UniFileExtensions.kt

@@ -7,7 +7,6 @@ import android.os.ParcelFileDescriptor
 import com.hippo.unifile.UniFile
 import java.io.BufferedOutputStream
 import java.io.File
-import java.nio.channels.SeekableByteChannel
 
 val UniFile.nameWithoutExtension: String?
     get() = name?.substringBeforeLast('.')

core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt

@@ -1,10 +1,10 @@
 package yokai.core.archive
 
+import java.nio.ByteBuffer
+import kotlin.concurrent.Volatile
 import me.zhanghai.android.libarchive.Archive
 import me.zhanghai.android.libarchive.ArchiveEntry
 import me.zhanghai.android.libarchive.ArchiveException
-import java.nio.ByteBuffer
-import kotlin.concurrent.Volatile
 
 class AndroidArchiveInputStream(buffer: Long, size: Long) : ArchiveInputStream() {
     private val lock = Any()

core/main/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt

@@ -6,8 +6,8 @@ import android.system.Os
 import android.system.OsConstants
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.system.openFileDescriptor
-import me.zhanghai.android.libarchive.ArchiveException
 import java.io.InputStream
+import me.zhanghai.android.libarchive.ArchiveException
 
 class AndroidArchiveReader(pfd: ParcelFileDescriptor) : ArchiveReader {
     val size = pfd.statSize

core/main/src/androidMain/kotlin/yokai/core/archive/ZipWriter.kt

@@ -5,11 +5,11 @@ import android.system.Os
 import android.system.StructStat
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.system.openFileDescriptor
+import java.io.Closeable
+import java.nio.ByteBuffer
 import me.zhanghai.android.libarchive.Archive
 import me.zhanghai.android.libarchive.ArchiveEntry
 import me.zhanghai.android.libarchive.ArchiveException
-import java.io.Closeable
-import java.nio.ByteBuffer
 
 class ZipWriter(val context: Context, file: UniFile) : Closeable {
     private val pfd = file.openFileDescriptor(context, "wt")

core/main/src/androidMain/kotlin/yokai/util/lang/RxCoroutineBridge.kt

@@ -1,5 +1,8 @@
 package yokai.util.lang
 
+import kotlin.coroutines.cancellation.CancellationException
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -12,9 +15,6 @@ import rx.Emitter
 import rx.Observable
 import rx.Subscriber
 import rx.Subscription
-import kotlin.coroutines.cancellation.CancellationException
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 /*
  * Util functions for bridging RxJava and coroutines. Taken from TachiyomiEH/SY.

core/main/src/commonMain/kotlin/eu/kanade/tachiyomi/util/system/CoroutinesExtensions.kt

@@ -5,7 +5,6 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.IO
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch

presentation/widget/build.gradle.kts

@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.core)
+    implementation(projects.core.main)
     implementation(projects.data)
     implementation(projects.domain)
     implementation(projects.i18n)

settings.gradle.kts

@@ -31,7 +31,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "Yokai"
 include(":app")
-include(":core")
+include(":core:main")
 include(":data")
 include(":domain")
 include(":i18n")

source/api/build.gradle.kts

@@ -21,7 +21,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation(projects.core)
+                implementation(projects.core.main)
                 api(androidx.preference)
 
                 // Workaround for https://youtrack.jetbrains.com/issue/KT-57605