Merge :core and :utils (#8927)

buildSrc/src/main/kotlin/lib-multisrc.gradle.kts

@@ -38,7 +38,7 @@ kotlinter {
 
 dependencies {
     compileOnly(versionCatalogs.named("libs").findBundle("common").get())
-    implementation(project(":utils"))
+    implementation(project(":core"))
 }
 
 tasks {

common.gradle

@@ -103,7 +103,6 @@ dependencies {
     if (theme != null) implementation(theme) // Overrides core launcher icons
     implementation(project(":core"))
     compileOnly(libs.bundles.common)
-    implementation(project(":utils"))
 }
 
 tasks.register("writeManifestFile") {

core/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("com.android.library")
+    kotlin("android")
 }
 
 android {
@@ -9,17 +10,18 @@ android {
         minSdk = AndroidConfig.minSdk
     }
 
-    namespace = "eu.kanade.tachiyomi.extension.core"
+    namespace = "keiyoushi.core"
-
-    sourceSets {
-        named("main") {
-            manifest.srcFile("AndroidManifest.xml")
-            res.setSrcDirs(listOf("res"))
-        }
-    }
 
     buildFeatures {
         resValues = false
         shaders = false
     }
+
+    kotlinOptions {
+        freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
+    }
+}
+
+dependencies {
+    compileOnly(versionCatalogs.named("libs").findBundle("common").get())
 }

settings.gradle.kts

@@ -8,7 +8,6 @@ loadAllIndividualExtensions()
  * ===================================== COMMON CONFIGURATION ======================================
  */
 include(":core")
-include(":utils")
 
 // Load all modules under /lib
 File(rootDir, "lib").eachDir { include("lib:${it.name}") }

utils/build.gradle.kts

@@ -1,33 +0,0 @@
-plugins {
-    id("com.android.library")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-
-    namespace = "keiyoushi.utils"
-
-    sourceSets {
-        named("main") {
-            java.setSrcDirs(listOf("src"))
-        }
-    }
-
-    buildFeatures {
-        resValues = false
-        shaders = false
-    }
-
-    kotlinOptions {
-        freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    }
-}
-
-dependencies {
-    compileOnly(versionCatalogs.named("libs").findBundle("common").get())
-}