From 49ecfc51b17613921683b5d71a84b56e4dc48a6e Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Sun, 28 Jul 2024 11:38:33 +0700 Subject: [PATCH] refactor: Move source-api to source directory Preparing to split local source to its own module --- app/build.gradle.kts | 2 +- data/build.gradle.kts | 2 +- domain/build.gradle.kts | 2 +- settings.gradle.kts | 2 +- {source-api => source/api}/build.gradle.kts | 0 {source-api => source/api}/consumer-proguard.pro | 0 {source-api => source/api}/src/androidMain/AndroidManifest.xml | 0 .../androidMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt | 0 .../src/commonMain/kotlin/eu/kanade/tachiyomi/source/Source.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/Filter.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt | 0 .../commonMain/kotlin/eu/kanade/tachiyomi/source/model/Page.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/SManga.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt | 0 .../kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt | 0 .../eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt | 0 .../kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt | 0 .../commonMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt | 0 26 files changed, 4 insertions(+), 4 deletions(-) rename {source-api => source/api}/build.gradle.kts (100%) rename {source-api => source/api}/consumer-proguard.pro (100%) rename {source-api => source/api}/src/androidMain/AndroidManifest.xml (100%) rename {source-api => source/api}/src/androidMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/Source.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Page.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt (100%) rename {source-api => source/api}/src/commonMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 648e208373..ebe6bf7f74 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -149,7 +149,7 @@ dependencies { implementation(projects.domain) implementation(projects.i18n) implementation(projects.presentation.core) - implementation(projects.sourceApi) + implementation(projects.source.api) // Compose implementation(platform(compose.bom)) diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 83b4e958b6..e4d4542e3d 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { val androidMain by getting { dependencies { api(libs.bundles.db.android) - implementation(projects.sourceApi) + implementation(projects.source.api) } } } diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index dbbd9702a6..012ff00dd3 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.sourceApi) + implementation(projects.source.api) } } val androidMain by getting { diff --git a/settings.gradle.kts b/settings.gradle.kts index 971b98e859..f5b74d988b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -44,4 +44,4 @@ include(":domain") include(":i18n") include(":presentation:core") include(":presentation:widget") -include(":source-api") +include(":source:api") diff --git a/source-api/build.gradle.kts b/source/api/build.gradle.kts similarity index 100% rename from source-api/build.gradle.kts rename to source/api/build.gradle.kts diff --git a/source-api/consumer-proguard.pro b/source/api/consumer-proguard.pro similarity index 100% rename from source-api/consumer-proguard.pro rename to source/api/consumer-proguard.pro diff --git a/source-api/src/androidMain/AndroidManifest.xml b/source/api/src/androidMain/AndroidManifest.xml similarity index 100% rename from source-api/src/androidMain/AndroidManifest.xml rename to source/api/src/androidMain/AndroidManifest.xml diff --git a/source-api/src/androidMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt b/source/api/src/androidMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt similarity index 100% rename from source-api/src/androidMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt rename to source/api/src/androidMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/Source.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/Source.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/Source.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/Source.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Page.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Page.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Page.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/Page.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt b/source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt similarity index 100% rename from source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt rename to source/api/src/commonMain/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt