From 6e6659fc2abe6d293b4a6ddb051a67579073ae4a Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Thu, 4 May 2023 11:11:28 +0200 Subject: [PATCH] [Gradle] Remove workarounds for KT-57483 from tests ^KT-57483 ^KT-58316 Verification Pending --- .../kotlin/gradle/native/AppleFrameworkIT.kt | 20 ------------------- .../kotlin/gradle/native/CocoaPodsIT.kt | 7 ------- .../kotlin/gradle/native/GeneralNativeIT.kt | 7 ------- 3 files changed, 34 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt index 2286e998c43..d816cea400e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt @@ -36,7 +36,6 @@ class AppleFrameworkIT : BaseGradleIT() { @Test fun `assemble AppleFrameworkForXcode tasks for IosArm64`() { with(Project("sharedAppleFramework")) { - val currentGradleVersion = chooseWrapperVersionOrFinishTest() val options: BuildOptions = defaultBuildOptions().copy( customEnvironmentVariables = mapOf( "CONFIGURATION" to "debug", @@ -45,10 +44,6 @@ class AppleFrameworkIT : BaseGradleIT() { "TARGET_BUILD_DIR" to "no use", "FRAMEWORKS_FOLDER_PATH" to "no use" ), - ).suppressDeprecationWarningsSinceGradleVersion( - TestVersions.Gradle.G_7_4, - currentGradleVersion, - "Workaround for KT-57483" ) build("assembleDebugAppleFrameworkForXcodeIosArm64", options = options) { assertSuccessful() @@ -69,7 +64,6 @@ class AppleFrameworkIT : BaseGradleIT() { @Test fun `assemble fat AppleFrameworkForXcode tasks for Arm64 and X64 simulators`() { with(Project("sharedAppleFramework")) { - val currentGradleVersion = chooseWrapperVersionOrFinishTest() val options: BuildOptions = defaultBuildOptions().copy( customEnvironmentVariables = mapOf( "CONFIGURATION" to "Release", @@ -78,10 +72,6 @@ class AppleFrameworkIT : BaseGradleIT() { "TARGET_BUILD_DIR" to "no use", "FRAMEWORKS_FOLDER_PATH" to "no use" ), - ).suppressDeprecationWarningsSinceGradleVersion( - TestVersions.Gradle.G_7_4, - currentGradleVersion, - "Workaround for KT-57483" ) build("assembleReleaseAppleFrameworkForXcode", options = options) { assertSuccessful() @@ -97,7 +87,6 @@ class AppleFrameworkIT : BaseGradleIT() { @Test fun `check that macOS framework has symlinks`() { with(Project("sharedAppleFramework")) { - val currentGradleVersion = chooseWrapperVersionOrFinishTest() val options: BuildOptions = defaultBuildOptions().copy( customEnvironmentVariables = mapOf( "CONFIGURATION" to "debug", @@ -107,10 +96,6 @@ class AppleFrameworkIT : BaseGradleIT() { "TARGET_BUILD_DIR" to workingDir.absolutePath, "FRAMEWORKS_FOLDER_PATH" to "${projectName}/build/xcode-derived" ) - ).suppressDeprecationWarningsSinceGradleVersion( - TestVersions.Gradle.G_7_4, - currentGradleVersion, - "Workaround for KT-57483" ) build(":shared:embedAndSignAppleFrameworkForXcode", options = options) { assertSuccessful() @@ -211,7 +196,6 @@ class AppleFrameworkIT : BaseGradleIT() { @Test fun `check that static framework for Arm64 is built but is not embedded`() { with(Project("sharedAppleFramework")) { - val currentGradleVersion = chooseWrapperVersionOrFinishTest() val options: BuildOptions = defaultBuildOptions().copy( customEnvironmentVariables = mapOf( "CONFIGURATION" to "debug", @@ -220,10 +204,6 @@ class AppleFrameworkIT : BaseGradleIT() { "TARGET_BUILD_DIR" to "no use", "FRAMEWORKS_FOLDER_PATH" to "no use" ), - ).suppressDeprecationWarningsSinceGradleVersion( - TestVersions.Gradle.G_7_4, - currentGradleVersion, - "Workaround for KT-57483" ) setupWorkingDir() projectDir.resolve("shared/build.gradle.kts").modify { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index f9c752cdf7d..576b10aae1d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -1138,16 +1138,9 @@ class CocoaPodsIT : BaseGradleIT() { fun testPodPublishing() { //test that manually created frameworks are not included into cocoapods xcframework project.gradleBuildScript().appendToKotlinBlock("iosX64(\"iOS\") {binaries.framework{}}") - - val currentGradleVersion = project.chooseWrapperVersionOrFinishTest() project.build( ":podPublishXCFramework", "-Pkotlin.native.cocoapods.generate.wrapper=true", - options = defaultBuildOptions().suppressDeprecationWarningsSinceGradleVersion( - TestVersions.Gradle.G_7_4, - currentGradleVersion, - "Workaround for KT-57483", - ).copy(warningMode = WarningMode.Fail) ) { assertSuccessful() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index 7d2e2c24a5d..67149bacb36 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -295,15 +295,8 @@ class GeneralNativeIT : BaseGradleIT() { transformNativeTestProjectWithPluginDsl("frameworks", directoryPrefix = "native-binaries") ) { fun assemble(check: CompiledProject.() -> Unit) { - val currentGradleVersion = chooseWrapperVersionOrFinishTest() build( "assemble", - options = defaultBuildOptions() - .suppressDeprecationWarningsSinceGradleVersion( - TestVersions.Gradle.G_7_4, - currentGradleVersion, - "Workaround for KT-57483" - ).copy(warningMode = WarningMode.Fail), check = check ) }