[ISSUE-17] - Move android specific code to the AndroidMain source set

.gitignore

@@ -13,4 +13,5 @@
 /captures
 .externalNativeBuild
 .cxx
+.kotlin
 local.properties

build-logic/build.gradle.kts

@@ -6,13 +6,17 @@ plugins {
 }
 
 repositories {
-    mavenCentral()
     google()
+    mavenCentral()
+    gradlePluginPortal()
+    maven(url = "https://plugins.gradle.org/m2/")
 }
 
 dependencies {
     implementation(libs.android.gradle.plugin)
     implementation(libs.kotlin.gradle.plugin)
     implementation(libs.kover.gradle.plugin)
     implementation(libs.detekt.gradle.plugin)
+    implementation(libs.serialization)
+    implementation(libs.com.google.devtools.ksp.gradle.plugin)
 }

build-logic/src/main/java/Config.kt

@@ -1,5 +1,6 @@
 object Config {
-    const val applicationId = "com.codandotv.streamplayerapp"
+    const val appName = "streamplayerapp"
+    const val applicationId = "com.codandotv.$appName"
     const val compileSdkVersion = 34
     const val minSdkVersion = 24
     const val targetSdkVersion = 34
@@ -8,17 +9,13 @@ object Config {
     const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
     object BuildField {
-        const val host_debug = "\"https://api.themoviedb.org/3/\""
-        const val host_release = "\"https://api.themoviedb.org/3/\""
-        const val api_profile_debug = "\"https://demo3364084.mockable.io/\""
-        const val api_profile_release = "\"https://demo3364084.mockable.io/\""
+        const val host = "https://api.themoviedb.org/3/"
+        const val api_profile = "https://demo3364084.mockable.io/"
 
         private const val tmdb_token_name_debug = "TMDB_BEARER_TOKEN_DEBUG"
-        private const val tmdb_token_name_release = "TMDB_BEARER_TOKEN_RELEASE"
 
         private const val bearear_without_environment = "eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJiNDg2NWM4YTAzNzhmM2I4NjI0OWU1ZjNiYWFiMjU2NyIsInN1YiI6IjY0Mjk4YTg5YTNlNGJhMWM0NDgzM2U4OCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.9cIxv29vkaZ2yW88DIFRUFK_nXbK2b6KS8t96kA8WAE"
 
-        val api_bearer_debug = "\"Bearer ${System.getenv(tmdb_token_name_debug) ?: bearear_without_environment}\""
-        val api_bearer_release = "\"Bearer ${System.getenv(tmdb_token_name_release) ?: bearear_without_environment}\""
+        val api_bearer = System.getenv(tmdb_token_name_debug) ?: bearear_without_environment
     }
 }

build-logic/src/main/java/com.streamplayer.application.gradle.kts

@@ -2,16 +2,18 @@
 
 import extensions.dokkaPlugin
 import extensions.getLibrary
+import extensions.iosTarget
 import extensions.setupAndroidDefaultConfig
 import extensions.setupCompileOptions
-import extensions.setupCompose
 import extensions.setupPackingOptions
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
+    id("org.jetbrains.kotlin.multiplatform")
     id("kotlin-kapt")
     id("kotlin-parcelize")
     id("com.streamplayer.dokka")
@@ -20,14 +22,23 @@ plugins {
 }
 val catalog: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+
+    iosTarget()
+}
 
 android {
     namespace = Config.applicationId
 
     setupCompileOptions()
     setupPackingOptions()
     setupAndroidDefaultConfig()
-    setupCompose(catalog)
 
     defaultConfig {
         applicationId = Config.applicationId

build-logic/src/main/java/com.streamplayer.android-library.gradle.kts → build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts

@@ -2,23 +2,38 @@
 
 import extensions.dokkaPlugin
 import extensions.getLibrary
+import extensions.iosTarget
 import extensions.setupAndroidDefaultConfig
 import extensions.setupCompileOptions
 import extensions.setupNameSpace
 import extensions.setupPackingOptions
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
+val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 plugins {
+    id("org.jetbrains.kotlin.multiplatform")
     id("com.android.library")
-    id("kotlin-android")
+    id("org.jetbrains.kotlin.plugin.serialization")
     id("kotlin-kapt")
     id("kotlin-parcelize")
     id("com.streamplayer.dokka")
     id("org.jetbrains.kotlinx.kover")
     id("com.streamplayer.detekt")
 }
 
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+
+    iosTarget()
+}
+
 android {
     setupNameSpace(project)
 
@@ -44,4 +59,4 @@ android {
 
 dependencies {
     dokkaPlugin(libs.getLibrary("dokka"))
-}
+}

build-logic/src/main/java/extensions/CommonExtensions.kt

@@ -7,8 +7,8 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalog
-import org.gradle.api.plugins.ExtensionAware
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
 
 internal fun CommonExtension<*, *, *, *, *>.setupPackingOptions() {
     packaging {
@@ -41,33 +41,8 @@ internal fun CommonExtension<*, *, *, *, *>.setupCompileOptions() {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-}
-
-fun CommonExtension<*, *, *, *, *>.setupCompose(catalog: VersionCatalog) {
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "${catalog.getVersion("compose")}"
-    }
-
-    packaging {
-        resources {
-            excludes.apply {
-                add("META-INF/AL2.0")
-                add("META-INF/LGPL2.1")
-            }
-        }
-    }
 }
 
-
 internal fun CommonExtension<*, *, *, *, *>.setupNameSpace(project: Project) {
     val moduleName = project.displayName
         .removePrefix("project ")
@@ -76,8 +51,12 @@ internal fun CommonExtension<*, *, *, *, *>.setupNameSpace(project: Project) {
         .replace("-", ".")
 
     namespace = "${Config.applicationId}$moduleName"
-}
 
-private fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
-    (this as ExtensionAware).extensions.configure("kotlinOptions", block)
+    println(">>>> $namespace")
 }
+
+internal val Project.libs: VersionCatalog
+    get() {
+        return project.extensions.getByType<VersionCatalogsExtension>()
+            .named("libs")
+    }

build-logic/src/main/java/extensions/KotlinMultiPlatformExt.kt

@@ -0,0 +1,17 @@
+package extensions
+
+import Config
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+fun KotlinMultiplatformExtension.iosTarget() {
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = Config.appName
+            isStatic = true
+        }
+    }
+}

build-logic/src/main/java/extensions/VersionCatalog.kt

@@ -6,3 +6,11 @@ internal fun VersionCatalog.getLibrary(library: String) = findLibrary(library).g
 internal fun VersionCatalog.getVersion(library: String) = findVersion(library).get()
 internal fun VersionCatalog.getBundle(bundle: String) = findBundle(bundle).get()
 
+internal fun VersionCatalog.koinCoreDependency() = findLibrary("koin_core").get()
+
+internal fun VersionCatalog.koinAnnotationsDependency() = findLibrary("koin_annotations").get()
+
+internal fun VersionCatalog.koinComposeDependency() = findLibrary("koin_compose").get()
+
+internal fun VersionCatalog.koinCompiler() = findLibrary("koin_ksp_compiler").get()
+

build.gradle.kts

@@ -5,9 +5,14 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.serialization) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.jetbrains.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.kover) apply false
+    alias(libs.plugins.buildkonfig.plugin) apply false
 }
 
 tasks.register("clean", Delete::class) {