[Gradle] Remove workarounds for KT-57483 from tests

^KT-57483
^KT-58316 Verification Pending

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 {

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()
 

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
             )
         }