feat: improved core binary framework export

programadorthi · Feb 9, 2024 · f2f4b70 · f2f4b70
1 parent 00e8279
commit f2f4b70
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 30 deletions.
diff --git a/buildSrc/src/main/kotlin/NativeUtils.kt b/buildSrc/src/main/kotlin/NativeUtils.kt
@@ -3,6 +3,7 @@
  */
 
 import org.gradle.api.*
+import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 
 fun Project.fastOr(block: () -> List<String>): List<String> {
     return block()
@@ -78,3 +79,31 @@ fun Project.windowsTargets(): List<String> = fastOr {
         ).map { it.name }
     }
 }
+
+fun Project.darwinTargetsFramework(
+    action: Framework.() -> Unit = {}
+) {
+    val projectName = name
+    val specialCharacters = """\W""".toRegex()
+
+    with(kotlin) {
+        listOf(
+            macosX64(),
+            macosArm64(),
+            iosX64(),
+            iosArm64(),
+            iosSimulatorArm64(),
+        ).forEach { iosTarget ->
+            val moduleName = projectName
+                .lowercase()
+                .split(specialCharacters)
+                .joinToString(separator = "") { splitName ->
+                    splitName.replaceFirstChar { it.uppercase() }
+                }
+            iosTarget.binaries.framework {
+                baseName = "${moduleName}Shared"
+                action()
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/TargetsConfig.kt b/buildSrc/src/main/kotlin/TargetsConfig.kt
@@ -24,9 +24,6 @@ val Project.hasJvm: Boolean get() = hasCommon || hasJvmAndNix || files.any { it.
 val Project.hasNative: Boolean get() = hasCommon || hasNix || hasPosix || hasDarwin || hasDesktop || hasWindows
 
 fun Project.configureTargets() {
-    val projectName = name
-    val specialCharacters = """\W""".toRegex()
-
     configureCommon()
     if (hasJvm) configureJvm()
 
@@ -40,26 +37,6 @@ fun Project.configureTargets() {
             configureJs()
         }
 
-        if (hasDarwin) {
-            listOf(
-                macosX64(),
-                macosArm64(),
-                iosX64(),
-                iosArm64(),
-                iosSimulatorArm64(),
-            ).forEach { iosTarget ->
-                val moduleName = projectName
-                    .lowercase()
-                    .split(specialCharacters)
-                    .joinToString(separator = "") { splitName ->
-                        splitName.replaceFirstChar { it.uppercase() }
-                    }
-                iosTarget.binaries.framework {
-                    baseName = "${moduleName}Shared"
-                }
-            }
-        }
-
         if (hasPosix || hasDarwin || hasWindows) extra.set("hasNative", true)
 
         sourceSets {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 
 applyBasicSetup()
 
+darwinTargetsFramework {
+    export(libs.ktor.utils)
+}
+
 kotlin {
     sourceSets {
         commonMain {

diff --git a/core/common/src/dev/programadorthi/routing/core/RoutingBuilder.kt b/core/common/src/dev/programadorthi/routing/core/RoutingBuilder.kt
@@ -2,11 +2,15 @@
 * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
 */
 
+@file:OptIn(ExperimentalObjCRefinement::class)
+
 package dev.programadorthi.routing.core
 
 import dev.programadorthi.routing.core.application.ApplicationCall
 import io.ktor.util.pipeline.PipelineInterceptor
 import io.ktor.utils.io.KtorDsl
+import kotlin.experimental.ExperimentalObjCRefinement
+import kotlin.native.HiddenFromObjC
 
 /**
  * Builds a route to match the specified [path].
@@ -53,13 +57,15 @@ public fun Route.method(
 }
 
 @KtorDsl
+@HiddenFromObjC
 public fun Route.handle(
     path: String,
     name: String? = null,
     body: PipelineInterceptor<Unit, ApplicationCall>,
 ): Route = route(path, name) { handle(body) }
 
 @KtorDsl
+@HiddenFromObjC
 public fun Route.handle(
     path: String,
     method: RouteMethod,

diff --git a/core/darwin/src/dev/programadorthi/routing/core/Attributes.kt b/core/darwin/src/dev/programadorthi/routing/core/Attributes.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -40,6 +40,7 @@ coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ve
 ktor-events = { module = "io.ktor:ktor-events", version.ref = "ktor" }
 ktor-http = { module = "io.ktor:ktor-http", version.ref = "ktor" }
 ktor-resources = { module = "io.ktor:ktor-resources", version.ref = "ktor" }
+ktor-utils = { module = "io.ktor:ktor-utils", version.ref = "ktor" }
 serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
 serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

diff --git a/integration/voyager/common/src/dev/programadorthi/routing/voyager/VoyagerRouting.kt b/integration/voyager/common/src/dev/programadorthi/routing/voyager/VoyagerRouting.kt
@@ -18,10 +18,8 @@ import dev.programadorthi.routing.core.Route
 import dev.programadorthi.routing.core.Routing
 import dev.programadorthi.routing.core.application
 import dev.programadorthi.routing.core.routing
-import io.ktor.util.logging.KtorSimpleLogger
 import io.ktor.util.logging.Logger
 import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 
 public val LocalVoyagerRouting: ProvidableCompositionLocal<Routing> =
     staticCompositionLocalOf {