Fix portable Swift runtime linking in UIKit klibs #3274
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jetbrains.androidx.build | ||
|
|
||
| import java.io.File | ||
| import org.gradle.api.Project | ||
| import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension | ||
| import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget | ||
| import org.jetbrains.kotlin.konan.target.KonanTarget | ||
|
|
||
| fun Project.configureSwiftCompatibilityLinking() { | ||
| plugins.withId("org.jetbrains.kotlin.multiplatform") { | ||
| extensions | ||
| .getByType(KotlinMultiplatformExtension::class.java) | ||
| .targets | ||
| .withType(KotlinNativeTarget::class.java) | ||
| .all { target -> target.configureSwiftCompatibilityLinking() } | ||
| } | ||
| } | ||
|
|
||
| private fun KotlinNativeTarget.configureSwiftCompatibilityLinking() { | ||
| if (System.getProperty("os.name") != "Mac OS X") return | ||
|
|
||
| val sdkName = | ||
| when (konanTarget) { | ||
| KonanTarget.IOS_ARM64 -> "iphoneos" | ||
| KonanTarget.IOS_X64, | ||
| KonanTarget.IOS_SIMULATOR_ARM64 -> "iphonesimulator" | ||
| else -> return | ||
| } | ||
| val swiftCompatibilityLibraryDir = | ||
| project.providers | ||
| .exec { spec -> spec.commandLine("xcrun", "--find", "swiftc") } | ||
| .standardOutput | ||
| .asText | ||
| .map { swiftcPath -> | ||
| File(swiftcPath.trim()) | ||
| .parentFile | ||
|
There was a problem hiding this comment. Looks like
and then we can just resolve to |
||
| .parentFile | ||
| .parentFile | ||
| .resolve("usr/lib/swift/$sdkName") | ||
| .absolutePath | ||
| } | ||
|
|
||
| binaries.all { binary -> | ||
| binary.linkTaskProvider.configure { linkTask -> | ||
| linkTask.toolOptions.freeCompilerArgs.addAll( | ||
| swiftCompatibilityLibraryDir.map { libraryDir -> | ||
| listOf("-linker-option", "-L$libraryDir") | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jetbrains.androidx.build | ||
|
|
||
| import java.io.File | ||
| import org.gradle.api.Project | ||
| import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension | ||
| import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget | ||
| import org.jetbrains.kotlin.konan.target.KonanTarget | ||
|
|
||
| fun Project.configureSwiftCompatibilityLinking() { | ||
| plugins.withId("org.jetbrains.kotlin.multiplatform") { | ||
| extensions | ||
| .getByType(KotlinMultiplatformExtension::class.java) | ||
| .targets | ||
| .withType(KotlinNativeTarget::class.java) | ||
| .all { target -> target.configureSwiftCompatibilityLinking() } | ||
| } | ||
| } | ||
|
|
||
| private fun KotlinNativeTarget.configureSwiftCompatibilityLinking() { | ||
| if (System.getProperty("os.name") != "Mac OS X") return | ||
|
|
||
| val sdkName = | ||
| when (konanTarget) { | ||
| KonanTarget.IOS_ARM64 -> "iphoneos" | ||
| KonanTarget.IOS_X64, | ||
| KonanTarget.IOS_SIMULATOR_ARM64 -> "iphonesimulator" | ||
| else -> return | ||
| } | ||
| val swiftCompatibilityLibraryDir = | ||
| project.providers | ||
| .exec { spec -> spec.commandLine("xcrun", "--find", "swiftc") } | ||
| .standardOutput | ||
| .asText | ||
| .map { swiftcPath -> | ||
| File(swiftcPath.trim()) | ||
| .parentFile | ||
| .parentFile | ||
| .parentFile | ||
| .resolve("usr/lib/swift/$sdkName") | ||
| .absolutePath | ||
| } | ||
|
|
||
| binaries.all { binary -> | ||
| binary.linkTaskProvider.configure { linkTask -> | ||
| linkTask.toolOptions.freeCompilerArgs.addAll( | ||
| swiftCompatibilityLibraryDir.map { libraryDir -> | ||
| listOf("-linker-option", "-L$libraryDir") | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,21 @@ | ||
| # | ||
| # Copyright 2026 The Android Open Source Project | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| package = androidx.compose.ui.uikit.utils | ||
| language = Objective-C | ||
| compilerOpts = -D_Float16=short | ||
| headerFilter = CMP* | ||
| linkerOpts = -ObjC -rpath /usr/lib/swift -framework Foundation -lc++ -lswiftCore -lswiftFoundation -lswiftCoreFoundation -lswiftDispatch -lswiftObjectiveC -lswiftXPC -lswift_Builtin_float -lswift_Concurrency -lswiftCompatibility51 -lswiftCompatibility56 -lswiftCompatibilityConcurrency -lswiftCompatibilityPacks |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add a comment that explain the purpose of it?
My understanding so far is that Kotlin/Native doesn't know about this folder when linking. Because of that we are forced to create this logic not only in
cmp-corebut also inside our compose plugin.Ideally, Kotlin/Native could take care of this automatically, since it already resolves the path to the linker from the toolchain.
https://youtrack.jetbrains.com/issue/KT-69793 seems related. Maybe we can ask the Kotlin/Native team to add it?