From 5f7479edbed2713a145abb56bff34914336fed53 Mon Sep 17 00:00:00 2001 From: Arkadii Ivanov Date: Fri, 28 May 2021 17:49:46 +0100 Subject: [PATCH] Simplify TodoApp example iOS framework export (#706) --- .../buildSrc/buildSrc/src/main/kotlin/Deps.kt | 4 --- examples/todoapp/common/root/build.gradle.kts | 32 +++---------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 73eef8c528..b5a1dc95da 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -41,8 +41,6 @@ object Deps { const val rx = "com.arkivanov.mvikotlin:rx:$VERSION" const val mvikotlin = "com.arkivanov.mvikotlin:mvikotlin:$VERSION" const val mvikotlinMain = "com.arkivanov.mvikotlin:mvikotlin-main:$VERSION" - const val mvikotlinMainIosX64 = "com.arkivanov.mvikotlin:mvikotlin-main-iosx64:$VERSION" - const val mvikotlinMainIosArm64 = "com.arkivanov.mvikotlin:mvikotlin-main-iosarm64:$VERSION" const val mvikotlinLogging = "com.arkivanov.mvikotlin:mvikotlin-logging:$VERSION" const val mvikotlinTimeTravel = "com.arkivanov.mvikotlin:mvikotlin-timetravel:$VERSION" const val mvikotlinExtensionsReaktive = "com.arkivanov.mvikotlin:mvikotlin-extensions-reaktive:$VERSION" @@ -51,8 +49,6 @@ object Deps { object Decompose { private const val VERSION = "0.2.3" const val decompose = "com.arkivanov.decompose:decompose:$VERSION" - const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION" - const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION" const val extensionsCompose = "com.arkivanov.decompose:extensions-compose-jetbrains:$VERSION" } } diff --git a/examples/todoapp/common/root/build.gradle.kts b/examples/todoapp/common/root/build.gradle.kts index b5fcfcf8c3..75e7a9a4a3 100755 --- a/examples/todoapp/common/root/build.gradle.kts +++ b/examples/todoapp/common/root/build.gradle.kts @@ -15,20 +15,8 @@ kotlin { export(project(":common:database")) export(project(":common:main")) export(project(":common:edit")) - - when (val target = this.compilation.target.name) { - "iosX64" -> { - export(Deps.ArkIvanov.Decompose.decomposeIosX64) - export(Deps.ArkIvanov.MVIKotlin.mvikotlinMainIosX64) - } - - "iosArm64" -> { - export(Deps.ArkIvanov.Decompose.decomposeIosArm64) - export(Deps.ArkIvanov.MVIKotlin.mvikotlinMainIosArm64) - } - - else -> error("Unsupported target: $target") - } + export(Deps.ArkIvanov.Decompose.decompose) + export(Deps.ArkIvanov.MVIKotlin.mvikotlinMain) } } } @@ -53,20 +41,8 @@ kotlin { api(project(":common:database")) api(project(":common:main")) api(project(":common:edit")) - } - } - - named("iosX64Main") { - dependencies { - api(Deps.ArkIvanov.Decompose.decomposeIosX64) - api(Deps.ArkIvanov.MVIKotlin.mvikotlinMainIosX64) - } - } - - named("iosArm64Main") { - dependencies { - api(Deps.ArkIvanov.Decompose.decomposeIosArm64) - api(Deps.ArkIvanov.MVIKotlin.mvikotlinMainIosArm64) + api(Deps.ArkIvanov.Decompose.decompose) + api(Deps.ArkIvanov.MVIKotlin.mvikotlinMain) } } }