Collapse shared modules into data domain and ui-common

app-tv/build.gradle.kts

@@ -51,21 +51,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":core:model"))
+    implementation(project(":data"))
-    implementation(project(":core:image"))
+    implementation(project(":domain"))
-    implementation(project(":core:ui"))
+    implementation(project(":ui-common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:navigation"))
-    implementation(project(":core:download"))
-    implementation(project(":core:player"))
-    implementation(project(":data:jellyfin"))
-    implementation(project(":data:offline"))
-    implementation(project(":data:catalog"))
-    implementation(project(":feature:browse"))
-    implementation(project(":feature:search"))
-    implementation(project(":feature:content"))
-    implementation(project(":feature:downloads"))
-    implementation(project(":feature:login"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)

app/build.gradle.kts

@@ -50,21 +50,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":core:model"))
+    implementation(project(":data"))
-    implementation(project(":core:image"))
+    implementation(project(":domain"))
-    implementation(project(":core:ui"))
+    implementation(project(":ui-common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:navigation"))
-    implementation(project(":core:download"))
-    implementation(project(":core:player"))
-    implementation(project(":data:jellyfin"))
-    implementation(project(":data:offline"))
-    implementation(project(":data:catalog"))
-    implementation(project(":feature:browse"))
-    implementation(project(":feature:search"))
-    implementation(project(":feature:content"))
-    implementation(project(":feature:downloads"))
-    implementation(project(":feature:login"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)

core/data/build.gradle.kts

@@ -1,33 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-}
-
-android {
-    namespace = "hu.bbara.purefin.core.data"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(libs.media3.common)
-    implementation(libs.kotlinx.coroutines.core)
-    testImplementation(libs.junit)
-}

core/download/build.gradle.kts

@@ -1,40 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.core.download"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    implementation(libs.medi3.exoplayer)
-    implementation(libs.media3.datasource.okhttp)
-    implementation(libs.okhttp)
-    testImplementation(libs.junit)
-}

core/image/build.gradle.kts

@@ -1,12 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.kotlin.jvm)
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-    jvmToolchain(11)
-}

core/model/build.gradle.kts

@@ -1,16 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.kotlin.jvm)
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-    jvmToolchain(11)
-}
-
-dependencies {
-    implementation(project(":core:image"))
-}

core/navigation/build.gradle.kts

@@ -1,38 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.core.navigation"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(libs.androidx.navigation3.runtime)
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    testImplementation(libs.junit)
-}

data/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    namespace = "hu.bbara.purefin.data.jellyfin"
+    namespace = "hu.bbara.purefin.data"
     compileSdk = 36
 
     defaultConfig {
@@ -29,12 +29,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(project(":core:image"))
-    implementation(project(":core:navigation"))
-    implementation(libs.jellyfin.core)
     implementation(libs.media3.common)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.jellyfin.core)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.slf4j.api)
     implementation(libs.hilt)
@@ -42,5 +39,7 @@ dependencies {
     implementation(libs.datastore)
     implementation(libs.okhttp)
     implementation(libs.logging.interceptor)
+    implementation(libs.androidx.room.ktx)
+    ksp(libs.androidx.room.compiler)
     testImplementation(libs.junit)
 }

data/catalog/build.gradle.kts

@@ -1,41 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.data.catalog"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(project(":core:image"))
-    implementation(project(":data:jellyfin"))
-    implementation(project(":data:offline"))
-    implementation(libs.jellyfin.core)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    implementation(libs.datastore)
-    testImplementation(libs.junit)
-}

data/offline/build.gradle.kts

@@ -1,41 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.data.offline"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    implementation(libs.datastore)
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
-    testImplementation(libs.junit)
-}