Skip to content

Remove support for k/native macosX64 and iosX64 targets across the project #5515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eymar merged 1 commit into from
Jan 16, 2026
Merged

Remove support for k/native macosX64 and iosX64 targets across the project #5515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private class TargetType(
private val TargetType.gradlePropertyName get() = "org.jetbrains.compose.experimental.$id.enabled"

private val EXPERIMENTAL_TARGETS: Set<TargetType> = setOf(
TargetType("macos", identifiers = listOf("macosX64", "macosArm64")),
TargetType("macos", identifiers = listOf("macosArm64")),
)

private sealed interface CheckResult {
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private fun NativeBinary.getFinalResourcesDir(): Provider<Directory> {
}

private fun KotlinNativeTarget.isIosSimulatorTarget(): Boolean =
konanTarget === KonanTarget.IOS_X64 || konanTarget === KonanTarget.IOS_SIMULATOR_ARM64
konanTarget === KonanTarget.IOS_SIMULATOR_ARM64

private fun KotlinNativeTarget.isIosDeviceTarget(): Boolean =
konanTarget === KonanTarget.IOS_ARM64
Expand All @@ -160,7 +160,7 @@ private fun KotlinNativeTarget.isIosTarget(): Boolean =
isIosSimulatorTarget() || isIosDeviceTarget()

private fun KotlinNativeTarget.isMacTarget(): Boolean =
konanTarget === KonanTarget.MACOS_X64 || konanTarget === KonanTarget.MACOS_ARM64
konanTarget === KonanTarget.MACOS_ARM64

private fun KotlinNativeTarget.isIosOrMacTarget(): Boolean =
isIosTarget() || isMacTarget()
2 changes: 0 additions & 2 deletions gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResourcesTasks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ private fun getRequestedKonanTargetsByXcode(platform: String, archs: List<String
targets.addAll(archs.map { arch ->
when (arch) {
"arm64", "arm64e" -> KonanTarget.IOS_SIMULATOR_ARM64
"x86_64" -> KonanTarget.IOS_X64
else -> error("Unknown iOS simulator arch: '$arch'")
}
})
Expand All @@ -122,7 +121,6 @@ private fun getRequestedKonanTargetsByXcode(platform: String, archs: List<String
targets.addAll(archs.map { arch ->
when (arch) {
"arm64" -> KonanTarget.MACOS_ARM64
"x86_64" -> KonanTarget.MACOS_X64
else -> error("Unknown macOS arch: '$arch'")
}
})
Expand Down
91 changes: 23 additions & 68 deletions ...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion gradle-plugins/compose/src/test/test-projects/application/nonJvm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ kotlin {
compileSdk = 35
minSdk = 23
}
iosX64()
iosArm64()
iosSimulatorArm64()
}
1 change: 0 additions & 1 deletion ...test/test-projects/application/resources/resources/macos-x64/target-specific-resource.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion gradle-plugins/compose/src/test/test-projects/misc/appleResources/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ kotlin {
}
}

iosX64()
iosArm64()
iosSimulatorArm64()

Expand Down
1 change: 0 additions & 1 deletion gradle-plugins/compose/src/test/test-projects/misc/compatibilityLibCheck/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ kotlin {
js { browser() }
wasmJs { browser() }

iosX64()
iosArm64()
iosSimulatorArm64()

Expand Down
2 changes: 0 additions & 2 deletions ...compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ kotlin {

js { browser() }
wasmJs { browser() }

iosX64()
iosArm64()
iosSimulatorArm64()

Expand Down
2 changes: 0 additions & 2 deletions ...ins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ kotlin {
androidResources.enable = true
}
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
macosX64()
macosArm64()
js { browser() }
wasmJs { browser() }
Expand Down
2 changes: 0 additions & 2 deletions ...lugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ kotlin {
androidResources.enable = true
}
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
macosX64()
macosArm64()
js { browser() }
wasmJs { browser() }
Expand Down
2 changes: 0 additions & 2 deletions ...compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ kotlin {
androidResources.enable = true
}
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
macosX64()
macosArm64()
js { browser() }
wasmJs { browser() }
Expand Down
1 change: 0 additions & 1 deletion gradle-plugins/compose/src/test/test-projects/misc/macosNativeResources/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ plugins {
kotlin {

listOf(
macosX64(),
macosArm64(),
).forEach {
it.binaries {
Expand Down
2 changes: 0 additions & 2 deletions gradle-plugins/compose/src/test/test-projects/misc/testResources/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ group = "app.group"
kotlin {
jvm("desktop")

iosX64()
iosArm64()
iosSimulatorArm64()

macosX64()
macosArm64()

sourceSets {
Expand Down