Removed iosx64 target

Reedyuk · Reedyuk · commit 469dc8ac585e · 2025-08-04T09:10:19.000+01:00
diff --git a/convention-plugin-test-option/src/main/kotlin/EmulatorJobsMatrix.kt b/convention-plugin-test-option/src/main/kotlin/EmulatorJobsMatrix.kt
@@ -36,11 +36,7 @@ class EmulatorJobsMatrix {
                     (rootProject.property("${subProject.name}.skipIosTests") == "true").not()
         }.map { subProject ->
             when (val osArch = System.getProperty("os.arch")) {
-                "x86", "i386", "ia-32", "i686" -> "${subProject.path}:iosX86Test"
-                "x86_64", "amd64", "x64", "x86-64" -> "${subProject.path}:iosX64Test"
-                "arm", "arm-v7", "armv7", "arm32",
                 "arm64", "arm-v8", "aarch64" -> "${subProject.path}:iosSimulatorArm64Test"
-
                 else -> throw Error("Unexpected System.getProperty(\"os.arch\") = $osArch")
             }
         }.map { listOf("cleanTest", it) }
diff --git a/firebase-analytics/build.gradle.kts b/firebase-analytics/build.gradle.kts
@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
 
         cocoapods {
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64().enableKeychainForTests()
         iosSimulatorArm64().enableKeychainForTests()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-common-internal/build.gradle.kts b/firebase-common-internal/build.gradle.kts
@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
     }
 
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
     }
 
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts
@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -79,7 +79,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -81,7 +81,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-installations/build.gradle.kts b/firebase-installations/build.gradle.kts
@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-messaging/build.gradle.kts b/firebase-messaging/build.gradle.kts
@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-perf/build.gradle.kts b/firebase-perf/build.gradle.kts
@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/firebase-storage/build.gradle.kts b/firebase-storage/build.gradle.kts
@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -75,7 +75,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ kotlin {`
`78`	`78`
`79`	`79`	`if (supportIosTarget) {`
`80`	`80`	`iosArm64()`
`81`		`- iosX64()`
`82`	`81`	`iosSimulatorArm64()`
`83`	`82`	`}`
`84`	`83`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ kotlin {`
`77`	`77`
`78`	`78`	`if (supportIosTarget) {`
`79`	`79`	`iosArm64()`
`80`		`- iosX64()`
`81`	`80`	`iosSimulatorArm64()`
`82`	`81`	`}`
`83`	`82`