[Gradle] Fix some macOS Gradle IT

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt

@@ -354,7 +354,7 @@ class AppleFrameworkIT : KGPBaseTest() {
                 .appendText("this can't be compiled")
 
             buildAndFail(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = environmentVariables) {
-                assertOutputContains("/sharedAppleFramework/shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt:7:2: error: Expecting a top level declaration")
+                assertOutputContains("/sharedAppleFramework/shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt:7:2: error: Syntax error: Expecting a top level declaration")
                 assertOutputContains("error: Compilation finished with errors")
             }
         }
@@ -418,7 +418,7 @@ class AppleFrameworkIT : KGPBaseTest() {
                 "-Pkotlin.native.useXcodeMessageStyle=true",
                 environmentVariables = environmentVariables
             ) {
-                assertOutputContains("/sharedAppleFramework/shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt:7:2: error: Expecting a top level declaration")
+                assertOutputContains("/sharedAppleFramework/shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt:7:2: error: Syntax error: Expecting a top level declaration")
                 assertOutputContains("error: Compilation finished with errors")
             }
         }
@@ -452,7 +452,7 @@ class AppleFrameworkIT : KGPBaseTest() {
                 "-Pkotlin.native.disableCompilerDaemon=true",
                 environmentVariables = environmentVariables
             ) {
-                assertOutputContains("/sharedAppleFramework/shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt:7:2: error: Expecting a top level declaration")
+                assertOutputContains("/sharedAppleFramework/shared/src/commonMain/kotlin/com/github/jetbrains/myapplication/Greeting.kt:7:2: error: Syntax error: Expecting a top level declaration")
             }
         }
     }
@@ -501,7 +501,7 @@ class AppleFrameworkIT : KGPBaseTest() {
             }
 
             build(*dependencyInsight("iosAppIosX64ReleaseImplementation0"), "-PmultipleFrameworks") {
-                assertOutputContainsNativeFrameworkVariant("mainStaticReleaseFrameworkIos", gradleVersion)
+                assertOutputDoesNotContain("mainStaticReleaseFrameworkIos")
             }
         }
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsGitIT.kt

@@ -205,9 +205,9 @@ class CocoaPodsGitIT : KGPBaseTest() {
             buildGradleKts.addPod(defaultPodName, produceGitBlock())
             testImport()
 
-            val anotherPodName = "Alamofire"
-            val anotherPodRepo = "https://github.com/Alamofire/Alamofire"
-            buildGradleKts.addPod(anotherPodName, produceGitBlock(anotherPodRepo))
+            val anotherPodName = "Base64"
+            val anotherPodRepo = "https://github.com/ekscrypto/Base64"
+            buildGradleKts.addPod(anotherPodName, produceGitBlock(anotherPodRepo, tagName = "1.2.2"))
             testImport(repos = listOf(defaultPodRepo, anotherPodRepo)) {
 
                 assertTasksExecuted(

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt

@@ -484,7 +484,7 @@ class CocoaPodsIT : KGPBaseTest() {
                 )
             )
             buildAndFail("syncFramework", buildOptions = buildOptions) {
-                assertOutputContains("/native-cocoapods-template/src/commonMain/kotlin/A.kt:5:2: error: Expecting a top level declaration")
+                assertOutputContains("/native-cocoapods-template/src/commonMain/kotlin/A.kt:5:2: error: Syntax error: Expecting a top level declaration")
                 assertOutputContains("error: Compilation finished with errors")
             }
         }
@@ -504,7 +504,7 @@ class CocoaPodsIT : KGPBaseTest() {
             )
             buildAndFail("linkPodDebugFrameworkIOS", buildOptions = buildOptions) {
                 assertOutputContains("e: file:///")
-                assertOutputContains("/native-cocoapods-template/src/commonMain/kotlin/A.kt:5:2 Expecting a top level declaration")
+                assertOutputContains("/native-cocoapods-template/src/commonMain/kotlin/A.kt:5:2 Syntax error: Expecting a top level declaration")
                 assertOutputDoesNotContain("error: Compilation finished with errors")
             }
         }
@@ -524,7 +524,7 @@ class CocoaPodsIT : KGPBaseTest() {
                 )
             )
             buildAndFail("linkPodDebugFrameworkIOS", buildOptions = buildOptions) {
-                assertOutputContains("/native-cocoapods-template/src/commonMain/kotlin/A.kt:5:2: error: Expecting a top level declaration")
+                assertOutputContains("/native-cocoapods-template/src/commonMain/kotlin/A.kt:5:2: error: Syntax error: Expecting a top level declaration")
                 assertOutputContains("error: Compilation finished with errors")
             }
         }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/build.gradle.kts

@@ -9,43 +9,39 @@ repositories {
 
 kotlin {
     jvm()
-    ios()
-    watchos()
-    tvos()
+    iosArm64()
+    iosX64()
     iosSimulatorArm64()
-    tvosSimulatorArm64()
+    watchosArm32()
+    watchosArm64()
+    watchosX64()
     watchosSimulatorArm64()
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+
     macosX64 {
         binaries.executable {
             entryPoint = "main"
         }
     }
+
     macosArm64 {
         binaries.executable {
             entryPoint = "main"
         }
     }
 
-    val commonTest by sourceSets.getting
-    val jvmTest by sourceSets.getting
-    val macosMain by sourceSets.creating
-    val iosMain by sourceSets.getting
-    val tvosMain by sourceSets.getting
-    val watchosMain by sourceSets.getting
+    sourceSets {
+        commonTest.dependencies {
+            implementation(kotlin("test-common"))
+            implementation(kotlin("test-annotations-common"))
+        }
 
-    val macosX64Main by sourceSets.getting { dependsOn(macosMain) }
-    val macosArm64Main by sourceSets.getting { dependsOn(macosMain) }
-    val iosSimulatorArm64Main by sourceSets.getting { dependsOn(iosMain) }
-    val tvosSimulatorArm64Main by sourceSets.getting { dependsOn(tvosMain) }
-    val watchosSimulatorArm64Main by sourceSets.getting { dependsOn(watchosMain) }
+        jvmTest.dependencies {
+            implementation(kotlin("test-junit"))
+        }
 
-    commonTest.dependencies {
-        implementation(kotlin("test-common"))
-        implementation(kotlin("test-annotations-common"))
-    }
-
-    jvmTest.dependencies {
-        implementation(kotlin("test-junit"))
     }
 
     tasks.withType<AbstractTestTask>().configureEach {