From f23cc1aa0517ea871856e16e8a35540633102548 Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Mon, 16 Nov 2026 13:15:24 +0900 Subject: [PATCH] =?UTF-8?q?build:=20Task=2019=20=EC=99=84=EB=A3=8C=20-=20:?= =?UTF-8?q?core:core-common=20=EB=B0=8F=20:core:core-network=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - core/core-common 모듈 신규 생성 (namespace: bums.lunatic.launcher.core.common): * MlKitTranslationHelper.kt를 :app에서 :core:core-common으로 이동 - core/core-network 모듈 신규 생성 (namespace: bums.lunatic.launcher.core.network): * NetworkClient.kt를 :app에서 :core:core-network로 이동 (OkHttp3 api 의존성 노출) - settings.gradle.kts & app/build.gradle.kts: :core:core-common, :core:core-network 모듈 등록 및 :app 의존성 연결 - TODO.md: 6-1(코어 공통/네트워크 분리) 진행 내역 반영 - 검증: ./gradlew :app:compileDebugKotlin 빌드 성공 확인 (13s, 59 actionable tasks) --- TODO.md | 2 +- app/build.gradle.kts | 2 ++ core/core-common/build.gradle.kts | 29 +++++++++++++++++++ core/core-common/src/main/AndroidManifest.xml | 2 ++ .../launcher/utils/MlKitTranslationHelper.kt | 0 core/core-network/build.gradle.kts | 26 +++++++++++++++++ .../core-network/src/main/AndroidManifest.xml | 2 ++ .../lunatic/launcher/utils/NetworkClient.kt | 0 settings.gradle.kts | 2 ++ 9 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 core/core-common/build.gradle.kts create mode 100644 core/core-common/src/main/AndroidManifest.xml rename {app => core/core-common}/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt (100%) create mode 100644 core/core-network/build.gradle.kts create mode 100644 core/core-network/src/main/AndroidManifest.xml rename {app => core/core-network}/src/main/kotlin/bums/lunatic/launcher/utils/NetworkClient.kt (100%) diff --git a/TODO.md b/TODO.md index e1a636f6..d6d97993 100644 --- a/TODO.md +++ b/TODO.md @@ -182,7 +182,7 @@ lunar_launcher/ ``` #### 단계별 모듈화 실행 순서 -- [ ] **6-1. `:core:common`, `:core:network`, `:core:database` 분리**: `:app` 의존성이 가장 적은 순수 모델(`model/*`), `WorkersDb`, `OkHttpClient`, 유틸부터 하위 모듈로 이동. +- [x] **6-1. `:core:common`, `:core:network`, `:core:database` 분리** (`:core:core-common`, `:core:core-network` 생성 및 `NetworkClient`·`MlKitTranslationHelper` 이동 완료; `:core:database`는 후속 진행) - [ ] **6-2. 독립 기능 우선 분리 (`:feature:torrent`, `:feature:wallpaper`)**: `jlibtorrent` JAR들과 `MyWallpaperService`+`Renderer.cpp`는 타 화면과 결합도가 낮아 가장 먼저 독립 모듈로 분리하기 적합함. - [ ] **6-3. 뷰어/리더 분리 (`:feature:player`, `:feature:reader`)**: `PlayerActivity`/`NativePlayer`(+ `PlayerEngine.cpp`)와 `DocumentViewerActivity`/`ImageViewerActivity`, `TokiFragment`/`WebReaderActivity`를 분리. - [ ] **6-4. 피드/수집기 분리 (`:feature:feeds`)**: `RssHome`, `NeoRssActivity`, `TaskAggregator`, `*Getter`군을 분리하고 `:app`은 런처 홈과 서비스 진입점만 유지. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c2b1a395..ac799549 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -135,6 +135,8 @@ dependencies { "dir" to "libs", "include" to listOf("*.aar", "*.jar"), ))) + implementation(project(":core:core-common")) + implementation(project(":core:core-network")) implementation(project(":gdrive")) implementation("com.google.android.gms:play-services-wearable:19.0.0") val kotlinVersion: String? by extra diff --git a/core/core-common/build.gradle.kts b/core/core-common/build.gradle.kts new file mode 100644 index 00000000..4eeee923 --- /dev/null +++ b/core/core-common/build.gradle.kts @@ -0,0 +1,29 @@ +plugins { + id("com.android.library") + id("kotlin-android") +} + +android { + namespace = "bums.lunatic.launcher.core.common" + compileSdk = 35 + + defaultConfig { + minSdk = 26 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") + implementation("com.google.android.gms:play-services-tasks:18.3.2") + implementation("com.google.mlkit:translate:17.0.3") + implementation("com.google.mlkit:language-id:17.0.5") +} diff --git a/core/core-common/src/main/AndroidManifest.xml b/core/core-common/src/main/AndroidManifest.xml new file mode 100644 index 00000000..8072ee00 --- /dev/null +++ b/core/core-common/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/app/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt b/core/core-common/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt similarity index 100% rename from app/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt rename to core/core-common/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt diff --git a/core/core-network/build.gradle.kts b/core/core-network/build.gradle.kts new file mode 100644 index 00000000..748b699b --- /dev/null +++ b/core/core-network/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("com.android.library") + id("kotlin-android") +} + +android { + namespace = "bums.lunatic.launcher.core.network" + compileSdk = 35 + + defaultConfig { + minSdk = 26 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + api("com.squareup.okhttp3:logging-interceptor:4.11.0") +} diff --git a/core/core-network/src/main/AndroidManifest.xml b/core/core-network/src/main/AndroidManifest.xml new file mode 100644 index 00000000..8072ee00 --- /dev/null +++ b/core/core-network/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/app/src/main/kotlin/bums/lunatic/launcher/utils/NetworkClient.kt b/core/core-network/src/main/kotlin/bums/lunatic/launcher/utils/NetworkClient.kt similarity index 100% rename from app/src/main/kotlin/bums/lunatic/launcher/utils/NetworkClient.kt rename to core/core-network/src/main/kotlin/bums/lunatic/launcher/utils/NetworkClient.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index e308f1d1..09c712f0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,5 +23,7 @@ dependencyResolutionManagement { rootProject.name = "LunarLauncher" include ("app") +include(":core:core-common") +include(":core:core-network") include(":gdrive") include(":lun_launcher")