Migrating android source to platform specific

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

core/common/build.gradle.kts

@@ -1,34 +1,46 @@
+@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 {
+            api(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.immutable)
+        }
+
+        androidMain.dependencies {
+            implementation(libs.androidx.core.ktx)
+            api(libs.kotlinx.coroutines.android)
+        }
+    }
 }
 
 android {
     namespace = "dev.androidbroadcast.news.common"
-    compileSdk = 34
+    compileSdk = libs.versions.androidSdk.min.get().toInt()
 
     defaultConfig {
-        minSdk = 24
+        compileSdk = libs.versions.androidSdk.compile.get().toInt()
     }
 
     compileOptions {
         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)
 }

core/common/src/main/kotlin/dev/androidbroadcast/common/Logger.kt → core/common/src/androidMain/kotlin/dev/androidbroadcast/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(

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
+    )
+}

core/data/build.gradle.kts

@@ -1,39 +1,49 @@
+@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)
+            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 {
     namespace = "dev.androidbroadcast.news.data"
-    compileSdk = 34
+    compileSdk = libs.versions.androidSdk.min.get().toInt()
 
     defaultConfig {
-        minSdk = 24
+        compileSdk = libs.versions.androidSdk.compile.get().toInt()
     }
 
     compileOptions {
         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)
 }

core/data/src/main/kotlin/dev/androidbroadcast/news/data/model/Article.kt → core/data/src/androidMain/kotlin/dev/androidbroadcast/news/data/model/Article.kt

@@ -21,7 +21,3 @@ public data class Article(
     }
 }
 
-public data class Source(
-    val id: String,
-    val name: String
-)

core/data/src/commonMain/kotlin/dev/androidbroadcast/news/data/model/Source.kt

@@ -0,0 +1,6 @@
+package dev.androidbroadcast.news.data.model
+
+public data class Source(
+    val id: String,
+    val name: String
+)

core/database/build.gradle.kts

@@ -1,16 +1,39 @@
+@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
+    compileSdk = libs.versions.androidSdk.min.get().toInt()
 
     defaultConfig {
-        minSdk = 24
+        compileSdk = libs.versions.androidSdk.compile.get().toInt()
     }
 
     buildTypes {
@@ -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)
 }

core/opennews-api/build.gradle.kts

@@ -1,21 +1,44 @@
 plugins {
-    alias(libs.plugins.jetbrainsKotlinJvm)
     alias(libs.plugins.kotlinSerialization)
-    alias(libs.plugins.kapt)
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidLibrary)
+    // KAPT не поддерживает KMP
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+kotlin {
+    androidTarget()
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.serialization.json)
+        }
+
+        androidMain.dependencies {
+            implementation(libs.retrofit)
+            implementation(libs.androidx.annotation)
+            implementation(libs.retrofit.converter.kotlinx.serialization)
+            implementation(libs.retrofit.adapters.result)
+            api(libs.okhttp)
+        }
+    }
 }
 
-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)
+android {
+    namespace = "dev.androidbroadcast.news.database"
+    compileSdk = libs.versions.androidSdk.min.get().toInt()
+
+    defaultConfig {
+        compileSdk = libs.versions.androidSdk.compile.get().toInt()
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }

core/uikit/build.gradle.kts

@@ -1,35 +1,53 @@
+@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 {
     namespace = "dev.androidbroadcast.news.uikit"
-    compileSdk = 34
+    compileSdk = libs.versions.androidSdk.min.get().toInt()
 
     defaultConfig {
-        minSdk = 24
+        compileSdk = libs.versions.androidSdk.compile.get().toInt()
     }
 
     compileOptions {
         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)
 }