Skip to content

Commit da619bb

Browse files
committed
Remove support for macosX64 and iosX64 targets across the project
This includes updates to configurations, Gradle files, and test resources to align with the removal of deprecated targets.
1 parent fbb94d9 commit da619bb

File tree

14 files changed

+26
-88
lines changed

14 files changed

+26
-88
lines changed

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private class TargetType(
2626
private val TargetType.gradlePropertyName get() = "org.jetbrains.compose.experimental.$id.enabled"
2727

2828
private val EXPERIMENTAL_TARGETS: Set<TargetType> = setOf(
29-
TargetType("macos", identifiers = listOf("macosX64", "macosArm64")),
29+
TargetType("macos", identifiers = listOf("macosArm64")),
3030
)
3131

3232
private sealed interface CheckResult {

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private fun NativeBinary.getFinalResourcesDir(): Provider<Directory> {
151151
}
152152

153153
private fun KotlinNativeTarget.isIosSimulatorTarget(): Boolean =
154-
konanTarget === KonanTarget.IOS_X64 || konanTarget === KonanTarget.IOS_SIMULATOR_ARM64
154+
konanTarget === KonanTarget.IOS_SIMULATOR_ARM64
155155

156156
private fun KotlinNativeTarget.isIosDeviceTarget(): Boolean =
157157
konanTarget === KonanTarget.IOS_ARM64
@@ -160,7 +160,7 @@ private fun KotlinNativeTarget.isIosTarget(): Boolean =
160160
isIosSimulatorTarget() || isIosDeviceTarget()
161161

162162
private fun KotlinNativeTarget.isMacTarget(): Boolean =
163-
konanTarget === KonanTarget.MACOS_X64 || konanTarget === KonanTarget.MACOS_ARM64
163+
konanTarget === KonanTarget.MACOS_ARM64
164164

165165
private fun KotlinNativeTarget.isIosOrMacTarget(): Boolean =
166166
isIosTarget() || isMacTarget()

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResourcesTasks.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ private fun getRequestedKonanTargetsByXcode(platform: String, archs: List<String
112112
targets.addAll(archs.map { arch ->
113113
when (arch) {
114114
"arm64", "arm64e" -> KonanTarget.IOS_SIMULATOR_ARM64
115-
"x86_64" -> KonanTarget.IOS_X64
116115
else -> error("Unknown iOS simulator arch: '$arch'")
117116
}
118117
})
@@ -122,7 +121,6 @@ private fun getRequestedKonanTargetsByXcode(platform: String, archs: List<String
122121
targets.addAll(archs.map { arch ->
123122
when (arch) {
124123
"arm64" -> KonanTarget.MACOS_ARM64
125-
"x86_64" -> KonanTarget.MACOS_X64
126124
else -> error("Unknown macOS arch: '$arch'")
127125
}
128126
})

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt

Lines changed: 23 additions & 68 deletions
Large diffs are not rendered by default.

gradle-plugins/compose/src/test/test-projects/application/nonJvm/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ kotlin {
1111
compileSdk = 35
1212
minSdk = 23
1313
}
14-
iosX64()
1514
iosArm64()
1615
iosSimulatorArm64()
1716
}

gradle-plugins/compose/src/test/test-projects/application/resources/resources/macos-x64/target-specific-resource.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

gradle-plugins/compose/src/test/test-projects/misc/appleResources/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ kotlin {
1717
}
1818
}
1919

20-
iosX64()
2120
iosArm64()
2221
iosSimulatorArm64()
2322

gradle-plugins/compose/src/test/test-projects/misc/compatibilityLibCheck/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ kotlin {
1818
js { browser() }
1919
wasmJs { browser() }
2020

21-
iosX64()
2221
iosArm64()
2322
iosSimulatorArm64()
2423

gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ kotlin {
2121

2222
js { browser() }
2323
wasmJs { browser() }
24-
25-
iosX64()
2624
iosArm64()
2725
iosSimulatorArm64()
2826

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ kotlin {
1313
androidResources.enable = true
1414
}
1515
jvm()
16-
iosX64()
1716
iosArm64()
1817
iosSimulatorArm64()
19-
macosX64()
2018
macosArm64()
2119
js { browser() }
2220
wasmJs { browser() }

0 commit comments

Comments
 (0)