azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix some macOS Gradle IT

Browse Source
This commit is contained in:
Artem Daugel-Dauge
2023-10-09 20:35:29 +02:00
committed by Space Team
parent f71a731b6b
commit c19fc3ced3
4 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt
+4 -4
View File
@@ -354,7 +354,7 @@ class AppleFrameworkIT : KGPBaseTest() {
.appendText("this can't be compiled") .appendText("this can't be compiled")
buildAndFail(":shared:embedAndSignAppleFrameworkForXcode", environmentVariables = environmentVariables) { 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") assertOutputContains("error: Compilation finished with errors")
} }
} }
@@ -418,7 +418,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"-Pkotlin.native.useXcodeMessageStyle=true", "-Pkotlin.native.useXcodeMessageStyle=true",
environmentVariables = environmentVariables 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") assertOutputContains("error: Compilation finished with errors")
} }
} }
@@ -452,7 +452,7 @@ class AppleFrameworkIT : KGPBaseTest() {
"-Pkotlin.native.disableCompilerDaemon=true", "-Pkotlin.native.disableCompilerDaemon=true",
environmentVariables = environmentVariables 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") { 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
+3 -3
View File
@@ -205,9 +205,9 @@ class CocoaPodsGitIT : KGPBaseTest() {
buildGradleKts.addPod(defaultPodName, produceGitBlock()) buildGradleKts.addPod(defaultPodName, produceGitBlock())
testImport() testImport()
val anotherPodName = "Alamofire" val anotherPodName = "Base64"
val anotherPodRepo = "https://github.com/Alamofire/Alamofire" val anotherPodRepo = "https://github.com/ekscrypto/Base64"
buildGradleKts.addPod(anotherPodName, produceGitBlock(anotherPodRepo)) buildGradleKts.addPod(anotherPodName, produceGitBlock(anotherPodRepo, tagName = "1.2.2"))
testImport(repos = listOf(defaultPodRepo, anotherPodRepo)) { testImport(repos = listOf(defaultPodRepo, anotherPodRepo)) {
assertTasksExecuted( assertTasksExecuted(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
+3 -3
View File
@@ -484,7 +484,7 @@ class CocoaPodsIT : KGPBaseTest() {
) )
) )
buildAndFail("syncFramework", buildOptions = buildOptions) { 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") assertOutputContains("error: Compilation finished with errors")
} }
} }
@@ -504,7 +504,7 @@ class CocoaPodsIT : KGPBaseTest() {
) )
buildAndFail("linkPodDebugFrameworkIOS", buildOptions = buildOptions) { buildAndFail("linkPodDebugFrameworkIOS", buildOptions = buildOptions) {
assertOutputContains("e: file:///") 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") assertOutputDoesNotContain("error: Compilation finished with errors")
} }
} }
@@ -524,7 +524,7 @@ class CocoaPodsIT : KGPBaseTest() {
) )
) )
buildAndFail("linkPodDebugFrameworkIOS", buildOptions = buildOptions) { 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") assertOutputContains("error: Compilation finished with errors")
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleSilicon/build.gradle.kts
+18 -22
View File
@@ -9,43 +9,39 @@ repositories {
kotlin { kotlin {
jvm() jvm()
ios() iosArm64()
watchos() iosX64()
tvos()
iosSimulatorArm64() iosSimulatorArm64()
tvosSimulatorArm64() watchosArm32()
watchosArm64()
watchosX64()
watchosSimulatorArm64() watchosSimulatorArm64()
tvosArm64()
tvosX64()
tvosSimulatorArm64()
macosX64 { macosX64 {
binaries.executable { binaries.executable {
entryPoint = "main" entryPoint = "main"
} }
} }
macosArm64 { macosArm64 {
binaries.executable { binaries.executable {
entryPoint = "main" entryPoint = "main"
} }
} }
val commonTest by sourceSets.getting sourceSets {
val jvmTest by sourceSets.getting commonTest.dependencies {
val macosMain by sourceSets.creating implementation(kotlin("test-common"))
val iosMain by sourceSets.getting implementation(kotlin("test-annotations-common"))
val tvosMain by sourceSets.getting }
val watchosMain by sourceSets.getting
val macosX64Main by sourceSets.getting { dependsOn(macosMain) } jvmTest.dependencies {
val macosArm64Main by sourceSets.getting { dependsOn(macosMain) } implementation(kotlin("test-junit"))
val iosSimulatorArm64Main by sourceSets.getting { dependsOn(iosMain) } }
val tvosSimulatorArm64Main by sourceSets.getting { dependsOn(tvosMain) }
val watchosSimulatorArm64Main by sourceSets.getting { dependsOn(watchosMain) }
commonTest.dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
jvmTest.dependencies {
implementation(kotlin("test-junit"))
} }
tasks.withType<AbstractTestTask>().configureEach { tasks.withType<AbstractTestTask>().configureEach {