Migrating android source to platform specific

androidbroadcast · Jun 15, 2024 · 431abfa · 431abfa
1 parent 8c4109e
commit 431abfa
Show file tree

Hide file tree

Showing 37 changed files with 225 additions and 132 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,6 +15,8 @@ plugins {
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.baselineprofile) apply false
     alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
 }
 
 // TODO Replace Detekt Gradle with terminal launch

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -1,12 +1,33 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.kotlinMultiplatform)
 }
 
 kotlin {
     explicitApi = ExplicitApiMode.Strict
+
+    androidTarget {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
+
+    sourceSets  {
+        commonMain.dependencies {
+            implementation(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.immutable)
+        }
+
+        androidMain.dependencies {
+            implementation(libs.androidx.core.ktx)
+        }
+    }
 }
 
 android {
@@ -21,14 +42,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-dependencies {
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.kotlinx.coroutines.core)
-    api(libs.kotlinx.immutable)
 }
diff --git a/...lin/dev/androidbroadcast/common/Logger.kt → ...idbroadcast/common/AndroidLogcatLogger.kt b/...lin/dev/androidbroadcast/common/Logger.kt → ...idbroadcast/common/AndroidLogcatLogger.kt
@@ -2,18 +2,6 @@ package dev.androidbroadcast.common
 
 import android.util.Log
 
-public interface Logger {
-    public fun d(
-        tag: String,
-        message: String
-    )
-
-    public fun e(
-        tag: String,
-        message: String
-    )
-}
-
 public fun AndroidLogcatLogger(): Logger =
     object : Logger {
         override fun d(

diff --git a/...androidbroadcast/common/AppDispatchers.kt → ...androidbroadcast/common/AppDispatchers.kt b/...androidbroadcast/common/AppDispatchers.kt → ...androidbroadcast/common/AppDispatchers.kt
diff --git a/core/common/src/commonMain/kotlin/dev/androidbroadcast/common/Logger.kt b/core/common/src/commonMain/kotlin/dev/androidbroadcast/common/Logger.kt
@@ -0,0 +1,13 @@
+package dev.androidbroadcast.common
+
+public interface Logger {
+    public fun d(
+        tag: String,
+        message: String
+    )
+
+    public fun e(
+        tag: String,
+        message: String
+    )
+}
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -1,12 +1,34 @@
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.kotlinMultiplatform)
 }
 
 kotlin {
     explicitApi = ExplicitApiMode.Strict
+
+    androidTarget {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
+
+    sourceSets  {
+        commonMain.dependencies {
+            implementation(libs.kotlinx.coroutines.core)
+            implementation(projects.core.common)
+            implementation(projects.core.database)
+            implementation(projects.core.opennewsApi)
+        }
+
+        androidMain.dependencies {
+            implementation(libs.kotlinx.coroutines.android)
+            implementation(libs.androidx.core.ktx)
+            implementation(libs.javax.inject)
+        }
+    }
 }
 
 android {
@@ -21,19 +43,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-dependencies {
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.kotlinx.coroutines.android)
-
-    implementation(projects.core.database)
-    implementation(projects.core.opennewsApi)
-    implementation(projects.core.common)
-
-    implementation(libs.javax.inject)
 }
diff --git a/...broadcast/news/data/ArticlesRepository.kt → ...broadcast/news/data/ArticlesRepository.kt b/...broadcast/news/data/ArticlesRepository.kt → ...broadcast/news/data/ArticlesRepository.kt
diff --git a/...dev/androidbroadcast/news/data/Mappers.kt → ...dev/androidbroadcast/news/data/Mappers.kt b/...dev/androidbroadcast/news/data/Mappers.kt → ...dev/androidbroadcast/news/data/Mappers.kt
diff --git a/...droidbroadcast/news/data/MergeStrategy.kt → ...droidbroadcast/news/data/MergeStrategy.kt b/...droidbroadcast/news/data/MergeStrategy.kt → ...droidbroadcast/news/data/MergeStrategy.kt
diff --git a/...droidbroadcast/news/data/RequestResult.kt → ...droidbroadcast/news/data/RequestResult.kt b/...droidbroadcast/news/data/RequestResult.kt → ...droidbroadcast/news/data/RequestResult.kt
diff --git a/...droidbroadcast/news/data/model/Article.kt → ...droidbroadcast/news/data/model/Article.kt b/...droidbroadcast/news/data/model/Article.kt → ...droidbroadcast/news/data/model/Article.kt
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -1,10 +1,33 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.ksp)
     alias(libs.plugins.androidx.room)
 }
 
+kotlin {
+    androidTarget {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
+
+    sourceSets  {
+        commonMain.dependencies {
+        }
+
+        androidMain.dependencies {
+            implementation(libs.androidx.core.ktx)
+            implementation(libs.androidx.room.ktx)
+        }
+    }
+}
+
 android {
     namespace = "dev.androidbroadcast.news.database"
     compileSdk = 34
@@ -22,17 +45,12 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 room {
     schemaDirectory("${rootProject.projectDir}/schemas")
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
     ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.room.ktx)
 }
diff --git a/...oadcast/news/database/NewsRoomDatabase.kt → ...oadcast/news/database/NewsRoomDatabase.kt b/...oadcast/news/database/NewsRoomDatabase.kt → ...oadcast/news/database/NewsRoomDatabase.kt
diff --git a/...broadcast/news/database/dao/ArticleDao.kt → ...broadcast/news/database/dao/ArticleDao.kt b/...broadcast/news/database/dao/ArticleDao.kt → ...broadcast/news/database/dao/ArticleDao.kt
diff --git a/...adcast/news/database/models/ArticleDBO.kt → ...adcast/news/database/models/ArticleDBO.kt b/...adcast/news/database/models/ArticleDBO.kt → ...adcast/news/database/models/ArticleDBO.kt
diff --git a/...oadcast/news/database/utils/Converters.kt → ...oadcast/news/database/utils/Converters.kt b/...oadcast/news/database/utils/Converters.kt → ...oadcast/news/database/utils/Converters.kt
diff --git a/core/opennews-api/build.gradle.kts b/core/opennews-api/build.gradle.kts
@@ -1,21 +1,29 @@
 plugins {
-    alias(libs.plugins.jetbrainsKotlinJvm)
     alias(libs.plugins.kotlinSerialization)
-    alias(libs.plugins.kapt)
+    alias(libs.plugins.kotlinMultiplatform)
+    // KAPT не поддерживает KMP
+}
+
+kotlin {
+    jvm()
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.serialization.json)
+        }
+
+        jvmMain.dependencies {
+            implementation(libs.retrofit)
+            implementation(libs.androidx.annotation)
+            implementation(libs.retrofit.converter.kotlinx.serialization)
+            implementation(libs.retrofit.adapters.result)
+            api(libs.okhttp)
+        }
+    }
 }
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
-
-dependencies {
-    implementation(libs.retrofit)
-    implementation(libs.kotlinx.coroutines.core)
-    api(libs.kotlinx.serialization.json)
-    implementation(libs.androidx.annotation)
-    implementation(libs.retrofit.converter.kotlinx.serialization)
-    implementation(libs.retrofit.adapters.result)
-    api(libs.okhttp)
-    kapt(libs.retrofit.responseTypeKeeper)
-}
diff --git a/...a/dev/androidbroadcast/newsapi/NewsApi.kt → ...n/dev/androidbroadcast/newsapi/NewsApi.kt b/...a/dev/androidbroadcast/newsapi/NewsApi.kt → ...n/dev/androidbroadcast/newsapi/NewsApi.kt
diff --git a/...oidbroadcast/newsapi/models/ArticleDTO.kt → ...oidbroadcast/newsapi/models/ArticleDTO.kt b/...oidbroadcast/newsapi/models/ArticleDTO.kt → ...oidbroadcast/newsapi/models/ArticleDTO.kt
diff --git a/...droidbroadcast/newsapi/models/Language.kt → ...droidbroadcast/newsapi/models/Language.kt b/...droidbroadcast/newsapi/models/Language.kt → ...droidbroadcast/newsapi/models/Language.kt
diff --git a/...idbroadcast/newsapi/models/ResponseDTO.kt → ...idbroadcast/newsapi/models/ResponseDTO.kt b/...idbroadcast/newsapi/models/ResponseDTO.kt → ...idbroadcast/newsapi/models/ResponseDTO.kt
diff --git a/...androidbroadcast/newsapi/models/SortBy.kt → ...androidbroadcast/newsapi/models/SortBy.kt b/...androidbroadcast/newsapi/models/SortBy.kt → ...androidbroadcast/newsapi/models/SortBy.kt
diff --git a/...roidbroadcast/newsapi/models/SourceDTO.kt → ...roidbroadcast/newsapi/models/SourceDTO.kt b/...roidbroadcast/newsapi/models/SourceDTO.kt → ...roidbroadcast/newsapi/models/SourceDTO.kt
diff --git a/...st/newsapi/utils/DateTimeUTCSerializer.kt → ...st/newsapi/utils/DateTimeUTCSerializer.kt b/...st/newsapi/utils/DateTimeUTCSerializer.kt → ...st/newsapi/utils/DateTimeUTCSerializer.kt
diff --git a/...st/newsapi/utils/NewsApiKeyInterceptor.kt → ...st/newsapi/utils/NewsApiKeyInterceptor.kt b/...st/newsapi/utils/NewsApiKeyInterceptor.kt → ...st/newsapi/utils/NewsApiKeyInterceptor.kt
diff --git a/core/uikit/build.gradle.kts b/core/uikit/build.gradle.kts
@@ -1,7 +1,41 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.detekt)
+}
+
+kotlin {
+    androidTarget {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
+
+    sourceSets  {
+        commonMain.dependencies {
+            api(compose.ui)
+            api(compose.runtime)
+            api(compose.foundation)
+            api(compose.material3)
+            implementation(compose.components.uiToolingPreview)
+        }
+
+        androidMain.dependencies {
+            implementation(libs.androidx.core.ktx)
+            // Need only for debug
+            implementation(libs.androidx.compose.ui.tooling)
+            // Need only for debug
+            implementation(libs.androidx.compose.ui.test.manifest)
+            implementation(project.dependencies.platform(libs.androidx.compose.bom))
+        }
+    }
 }
 
 android {
@@ -16,20 +50,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-dependencies {
-    implementation(libs.androidx.core.ktx)
-    implementation(platform(libs.androidx.compose.bom))
-    api(libs.androidx.compose.ui)
-    api(libs.androidx.compose.ui.graphics)
-    api(libs.androidx.compose.ui.tooling.preview)
-    api(libs.androidx.compose.runtime)
-    api(libs.androidx.material3)
-    debugApi(libs.androidx.compose.ui.tooling)
-    debugApi(libs.androidx.compose.ui.test.manifest)
 }
diff --git a/...kotlin/dev/androidbroadcast/news/Color.kt → ...kotlin/dev/androidbroadcast/news/Color.kt b/...kotlin/dev/androidbroadcast/news/Color.kt → ...kotlin/dev/androidbroadcast/news/Color.kt
diff --git a/...kotlin/dev/androidbroadcast/news/Theme.kt → ...kotlin/dev/androidbroadcast/news/Theme.kt b/...kotlin/dev/androidbroadcast/news/Theme.kt → ...kotlin/dev/androidbroadcast/news/Theme.kt
diff --git a/.../kotlin/dev/androidbroadcast/news/Type.kt → .../kotlin/dev/androidbroadcast/news/Type.kt b/.../kotlin/dev/androidbroadcast/news/Type.kt → .../kotlin/dev/androidbroadcast/news/Type.kt
diff --git a/core/uikit/src/main/AndroidManifest.xml b/core/uikit/src/main/AndroidManifest.xml
diff --git a/features/news-main/ui-logic/build.gradle.kts b/features/news-main/ui-logic/build.gradle.kts
@@ -1,18 +1,48 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.dagger.hilt.android)
     alias(libs.plugins.kapt)
+    // Dagger Hilt нужно будет менять на мультиплатформенное решение
 }
 
 kotlin {
     explicitApi = ExplicitApiMode.Strict
+
+    androidTarget {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
+
+    sourceSets  {
+        commonMain.dependencies {
+            implementation(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.immutable)
+            api(projects.core.data)
+        }
+
+        androidMain.dependencies {
+            implementation(libs.androidx.core.ktx)
+            implementation(libs.androidx.lifecycle.runtime.ktx)
+            implementation(libs.androidx.lifecycle.viewmodel.ktx)
+
+            implementation(libs.kotlinx.coroutines.android)
+
+            compileOnly(libs.androidx.compose.runtime)
+            implementation(libs.dagger.hilt.android)
+        }
+    }
 }
 
 android {
-    namespace = "dev.androidbroadcast.news.main"
+    namespace = "dev.androidbroadcast.news.main.uilogic"
     compileSdk = libs.versions.androidSdk.compile.get().toInt()
 
     defaultConfig {
@@ -24,24 +54,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-
-    implementation(libs.kotlinx.coroutines.android)
-
-    compileOnly(libs.androidx.compose.runtime)
-    api(libs.kotlinx.immutable)
-
-    api(projects.core.data)
-
-    implementation(libs.dagger.hilt.android)
-    kapt(libs.dagger.hilt.compiler)
+    "kapt"(libs.dagger.hilt.compiler)
 }