From 72ad581fe42a83cfb77250295ae9a3545ed480a4 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 14 Oct 2020 14:37:01 +0300 Subject: [PATCH] [Gradle, K/N] Change prefix of apple-specific tests to native-* The commit does nothing but renaming of directories --- .../org/jetbrains/kotlin/code/CodeConformanceTest.kt | 4 ++-- .../org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt | 8 ++++---- .../org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt | 8 ++++---- .../common-ios/app/build.gradle.kts | 0 .../common-ios/app/src/iosArm64Main/kotlin/device.kt | 0 .../common-ios/app/src/iosMain/kotlin/main.kt | 0 .../common-ios/app/src/iosTest/kotlin/test.kt | 0 .../common-ios/app/src/iosX64Main/kotlin/simulator.kt | 0 .../common-ios/lib/build.gradle.kts | 0 .../common-ios/lib/src/iosLibArm64Main/kotlin/device.kt | 0 .../common-ios/lib/src/iosLibMain/kotlin/main.kt | 0 .../common-ios/lib/src/iosLibX64Main/kotlin/simulator.kt | 0 .../common-ios/settings.gradle.kts | 0 .../common-tvos/app/build.gradle.kts | 0 .../common-tvos/app/src/tvosArm64Main/kotlin/device.kt | 0 .../common-tvos/app/src/tvosMain/kotlin/main.kt | 0 .../common-tvos/app/src/tvosTest/kotlin/test.kt | 0 .../common-tvos/app/src/tvosX64Main/kotlin/simulator.kt | 0 .../common-tvos/lib/build.gradle.kts | 0 .../common-tvos/lib/src/tvosLibArm64Main/kotlin/device.kt | 0 .../common-tvos/lib/src/tvosLibMain/kotlin/main.kt | 0 .../lib/src/tvosLibX64Main/kotlin/simulator.kt | 0 .../common-tvos/settings.gradle.kts | 0 .../common-watchos/app/build.gradle.kts | 0 .../app/src/watchosArm32Main/kotlin/device32.kt | 0 .../app/src/watchosArm64Main/kotlin/device64.kt | 0 .../app/src/watchosDeviceMain/kotlin/device.kt | 0 .../common-watchos/app/src/watchosMain/kotlin/main.kt | 0 .../common-watchos/app/src/watchosTest/kotlin/test.kt | 0 .../app/src/watchosX86Main/kotlin/simulator.kt | 0 .../common-watchos/lib/build.gradle.kts | 0 .../lib/src/watchosLibDeviceMain/kotlin/device.kt | 0 .../common-watchos/lib/src/watchosLibMain/kotlin/main.kt | 0 .../lib/src/watchosLibX86Main/kotlin/simulator.kt | 0 .../common-watchos/settings.gradle.kts | 0 .../.gitignore | 0 .../build.gradle.kts | 0 .../kotlin-library/build.gradle.kts | 0 .../kotlin-library/gradle.properties | 0 .../kotlin-library/src/iosMain/kotlin/a.kt | 0 .../pod_dependency/pod_dependency.podspec | 0 .../pod_dependency/src/foo.h | 0 .../pod_dependency/src/foo.m | 0 .../second-library/build.gradle.kts | 0 .../second-library/gradle.properties | 0 .../second-library/src/iosMain/kotlin/B.kt | 0 .../settings.gradle | 0 .../subspec_dependency/src/baz.h | 0 .../subspec_dependency/src/baz.m | 0 .../subspec_dependency/subspec_dependency.podspec | 0 .../.gitignore | 0 .../build.gradle.kts | 0 .../ios-app/Podfile | 0 .../ios-app/ios-app.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../ios-app/ios-app/AppDelegate.swift | 0 .../Assets.xcassets/AppIcon.appiconset/Contents.json | 0 .../ios-app/ios-app/Assets.xcassets/Contents.json | 0 .../ios-app/ios-app/Base.lproj/LaunchScreen.storyboard | 0 .../ios-app/ios-app/Base.lproj/Main.storyboard | 0 .../ios-app/ios-app/Info.plist | 0 .../ios-app/ios-app/ViewController.swift | 0 .../kotlin-library/build.gradle.kts | 0 .../kotlin-library/src/iosMain/kotlin/A.kt | 0 .../pod_dependency/pod_dependency.podspec | 0 .../pod_dependency/src/foo.h | 0 .../pod_dependency/src/foo.m | 0 .../settings.gradle | 0 .../subspec_dependency/src/baz.h | 0 .../subspec_dependency/src/baz.m | 0 .../subspec_dependency/subspec_dependency.podspec | 0 .../build.gradle | 0 .../settings.gradle | 0 .../src/iosMain/kotlin/A.kt | 0 .../build.gradle.kts | 0 .../settings.gradle | 0 .../src/iosMain/kotlin/A.kt | 0 .../smoke/build.gradle.kts | 0 .../smoke/settings.gradle | 0 .../smoke/src/commonMain/kotlin/main.kt | 0 .../new-mpp-fat-framework/smoke/gradle.properties | 0 83 files changed, 11 insertions(+), 11 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/app/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/app/src/iosArm64Main/kotlin/device.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/app/src/iosMain/kotlin/main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/app/src/iosTest/kotlin/test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/app/src/iosX64Main/kotlin/simulator.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/lib/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/lib/src/iosLibArm64Main/kotlin/device.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/lib/src/iosLibMain/kotlin/main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/lib/src/iosLibX64Main/kotlin/simulator.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-ios/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/app/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/app/src/tvosArm64Main/kotlin/device.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/app/src/tvosMain/kotlin/main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/app/src/tvosTest/kotlin/test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/app/src/tvosX64Main/kotlin/simulator.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/lib/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/lib/src/tvosLibArm64Main/kotlin/device.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/lib/src/tvosLibMain/kotlin/main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/lib/src/tvosLibX64Main/kotlin/simulator.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-tvos/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/src/watchosArm32Main/kotlin/device32.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/src/watchosArm64Main/kotlin/device64.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/src/watchosDeviceMain/kotlin/device.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/src/watchosMain/kotlin/main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/src/watchosTest/kotlin/test.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/lib/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/lib/src/watchosLibDeviceMain/kotlin/device.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/lib/src/watchosLibMain/kotlin/main.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-common-native => native-apple-devices-common}/common-watchos/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/.gitignore (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/kotlin-library/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/kotlin-library/gradle.properties (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/kotlin-library/src/iosMain/kotlin/a.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/pod_dependency/pod_dependency.podspec (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/pod_dependency/src/foo.h (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/pod_dependency/src/foo.m (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/second-library/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/second-library/gradle.properties (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/second-library/src/iosMain/kotlin/B.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/settings.gradle (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/subspec_dependency/src/baz.h (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/subspec_dependency/src/baz.m (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-multiple => native-cocoapods-multiple}/subspec_dependency/subspec_dependency.podspec (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/.gitignore (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/Podfile (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app.xcodeproj/project.pbxproj (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/AppDelegate.swift (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/Assets.xcassets/Contents.json (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/Base.lproj/Main.storyboard (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/Info.plist (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/ios-app/ios-app/ViewController.swift (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/kotlin-library/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/kotlin-library/src/iosMain/kotlin/A.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/pod_dependency/pod_dependency.podspec (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/pod_dependency/src/foo.h (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/pod_dependency/src/foo.m (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/settings.gradle (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/subspec_dependency/src/baz.h (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/subspec_dependency/src/baz.m (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-single => native-cocoapods-single}/subspec_dependency/subspec_dependency.podspec (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-template-groovy => native-cocoapods-template-groovy}/build.gradle (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-template-groovy => native-cocoapods-template-groovy}/settings.gradle (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-template-groovy => native-cocoapods-template-groovy}/src/iosMain/kotlin/A.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-template => native-cocoapods-template}/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-template => native-cocoapods-template}/settings.gradle (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-cocoapods-template => native-cocoapods-template}/src/iosMain/kotlin/A.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-fat-framework => native-fat-framework}/smoke/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-fat-framework => native-fat-framework}/smoke/settings.gradle (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{new-mpp-fat-framework => native-fat-framework}/smoke/src/commonMain/kotlin/main.kt (100%) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/gradle.properties diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index c5f0cd25d8a..6a51e1418e7 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -313,10 +313,10 @@ class CodeConformanceTest : TestCase() { "gradle/cacheRedirector.gradle.kts", "kotlin-ultimate/prepare/mobile-plugin/build.gradle.kts", "kotlin-ultimate/gradle/cidrPluginTools.gradle.kts", - "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/new-mpp-fat-framework/smoke/build.gradle.kts", + "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/native-fat-framework/smoke/build.gradle.kts", "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle", "libraries/tools/kotlin-gradle-plugin-integration-tests/build/resources/test/testProject/new-mpp-android/build.gradle", - "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/build.gradle.kts", + "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts", "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle", "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/build.gradle", "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt", 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 936edc1cb2e..db356da05ca 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 @@ -38,10 +38,10 @@ class CocoaPodsIT : BaseGradleIT() { val PODFILE_IMPORT_DIRECTIVE_PLACEHOLDER = "" - private val cocoapodsSingleKtPod = "new-mpp-cocoapods-single" - private val cocoapodsMultipleKtPods = "new-mpp-cocoapods-multiple" - private val templateProjectName = "new-mpp-cocoapods-template" - private val groovyTemplateProjectName = "new-mpp-cocoapods-template-groovy" + private val cocoapodsSingleKtPod = "native-cocoapods-single" + private val cocoapodsMultipleKtPods = "native-cocoapods-multiple" + private val templateProjectName = "native-cocoapods-template" + private val groovyTemplateProjectName = "native-cocoapods-template-groovy" private val dummyTaskName = ":$DUMMY_FRAMEWORK_TASK_NAME" private val podspecTaskName = ":$POD_SPEC_TASK_NAME" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt index 2c1bf8993ec..e7c5071ae05 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt @@ -21,7 +21,7 @@ class CommonNativeIT : BaseGradleIT() { projectName: String, libTargets: List, appTargets: List - ) = with(transformProjectWithPluginsDsl(projectName, directoryPrefix = "new-mpp-common-native")) { + ) = with(transformProjectWithPluginsDsl(projectName, directoryPrefix = "native-apple-devices-common")) { configureMemoryInGradleProperties() val libCompileTasks = libTargets.map { ":lib:compileKotlin${it.capitalize()}" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt index 59a53d92686..119d29e84e9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt @@ -26,7 +26,7 @@ class FatFrameworkIT : BaseGradleIT() { Assume.assumeTrue(HostManager.hostIsMac) transformProjectWithPluginsDsl( "smoke", - directoryPrefix = "new-mpp-fat-framework" + directoryPrefix = "native-fat-framework" ).build("fat") { checkSmokeBuild( archs = listOf("x64", "arm64", "arm32"), @@ -47,7 +47,7 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun smokeWatchos() { Assume.assumeTrue(HostManager.hostIsMac) - with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "new-mpp-fat-framework")) { + with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) { gradleBuildScript().modify { it.checkedReplace("iosArm32()", "watchosArm32()") @@ -114,7 +114,7 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun testDuplicatedArchitecture() { Assume.assumeTrue(HostManager.hostIsMac) - with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "new-mpp-fat-framework")) { + with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) { gradleBuildScript().modify { it + """ val anotherDeviceTarget = kotlin.iosArm64("another") { @@ -133,7 +133,7 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun testIncorrectFamily() { Assume.assumeTrue(HostManager.hostIsMac) - with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "new-mpp-fat-framework")) { + with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) { gradleBuildScript().modify { it + """ val macos = kotlin.macosX64 { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosArm64Main/kotlin/device.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosArm64Main/kotlin/device.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosArm64Main/kotlin/device.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosArm64Main/kotlin/device.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosTest/kotlin/test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosTest/kotlin/test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosTest/kotlin/test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosTest/kotlin/test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosX64Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosX64Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/app/src/iosX64Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/src/iosX64Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/src/iosLibArm64Main/kotlin/device.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/src/iosLibArm64Main/kotlin/device.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/src/iosLibArm64Main/kotlin/device.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/src/iosLibArm64Main/kotlin/device.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/src/iosLibMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/src/iosLibMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/src/iosLibMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/src/iosLibMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/src/iosLibX64Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/src/iosLibX64Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/lib/src/iosLibX64Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/src/iosLibX64Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-ios/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosArm64Main/kotlin/device.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosArm64Main/kotlin/device.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosArm64Main/kotlin/device.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosArm64Main/kotlin/device.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosTest/kotlin/test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosTest/kotlin/test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosTest/kotlin/test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosTest/kotlin/test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosX64Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosX64Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/app/src/tvosX64Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/src/tvosX64Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/src/tvosLibArm64Main/kotlin/device.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/src/tvosLibArm64Main/kotlin/device.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/src/tvosLibArm64Main/kotlin/device.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/src/tvosLibArm64Main/kotlin/device.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/src/tvosLibMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/src/tvosLibMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/src/tvosLibMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/src/tvosLibMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/src/tvosLibX64Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/src/tvosLibX64Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/lib/src/tvosLibX64Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/src/tvosLibX64Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-tvos/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosArm32Main/kotlin/device32.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosArm32Main/kotlin/device32.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosArm32Main/kotlin/device32.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosArm32Main/kotlin/device32.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosArm64Main/kotlin/device64.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosArm64Main/kotlin/device64.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosArm64Main/kotlin/device64.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosArm64Main/kotlin/device64.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosDeviceMain/kotlin/device.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosDeviceMain/kotlin/device.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosDeviceMain/kotlin/device.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosDeviceMain/kotlin/device.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosTest/kotlin/test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosTest/kotlin/test.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosTest/kotlin/test.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosTest/kotlin/test.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/src/watchosX86Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/src/watchosLibDeviceMain/kotlin/device.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibDeviceMain/kotlin/device.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/src/watchosLibDeviceMain/kotlin/device.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibDeviceMain/kotlin/device.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/src/watchosLibMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/src/watchosLibMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/src/watchosLibX86Main/kotlin/simulator.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-common-native/common-watchos/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/.gitignore b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/.gitignore similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/.gitignore rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/.gitignore diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/kotlin-library/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/kotlin-library/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/kotlin-library/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/kotlin-library/gradle.properties rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/kotlin-library/src/iosMain/kotlin/a.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/src/iosMain/kotlin/a.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/kotlin-library/src/iosMain/kotlin/a.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/src/iosMain/kotlin/a.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/pod_dependency/pod_dependency.podspec b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/pod_dependency/pod_dependency.podspec similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/pod_dependency/pod_dependency.podspec rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/pod_dependency/pod_dependency.podspec diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/pod_dependency/src/foo.h b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/pod_dependency/src/foo.h similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/pod_dependency/src/foo.h rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/pod_dependency/src/foo.h diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/pod_dependency/src/foo.m b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/pod_dependency/src/foo.m similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/pod_dependency/src/foo.m rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/pod_dependency/src/foo.m diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/second-library/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/second-library/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/second-library/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/second-library/gradle.properties rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/second-library/src/iosMain/kotlin/B.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/src/iosMain/kotlin/B.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/second-library/src/iosMain/kotlin/B.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/src/iosMain/kotlin/B.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/settings.gradle rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/subspec_dependency/src/baz.h b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/subspec_dependency/src/baz.h similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/subspec_dependency/src/baz.h rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/subspec_dependency/src/baz.h diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/subspec_dependency/src/baz.m b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/subspec_dependency/src/baz.m similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/subspec_dependency/src/baz.m rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/subspec_dependency/src/baz.m diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/subspec_dependency/subspec_dependency.podspec b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/subspec_dependency/subspec_dependency.podspec similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-multiple/subspec_dependency/subspec_dependency.podspec rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/subspec_dependency/subspec_dependency.podspec diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/.gitignore b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/.gitignore similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/.gitignore rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/.gitignore diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/Podfile b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/Podfile similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/Podfile rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/Podfile diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app.xcodeproj/project.pbxproj b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app.xcodeproj/project.pbxproj similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app.xcodeproj/project.pbxproj rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app.xcodeproj/project.pbxproj diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/AppDelegate.swift b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/AppDelegate.swift similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/AppDelegate.swift rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/AppDelegate.swift diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Assets.xcassets/Contents.json b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Assets.xcassets/Contents.json similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Assets.xcassets/Contents.json rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Assets.xcassets/Contents.json diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Base.lproj/Main.storyboard b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Base.lproj/Main.storyboard similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Base.lproj/Main.storyboard rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Base.lproj/Main.storyboard diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Info.plist b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Info.plist similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/Info.plist rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/Info.plist diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/ViewController.swift b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/ViewController.swift similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/ios-app/ios-app/ViewController.swift rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/ios-app/ViewController.swift diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/kotlin-library/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/kotlin-library/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/kotlin-library/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/kotlin-library/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/kotlin-library/src/iosMain/kotlin/A.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/kotlin-library/src/iosMain/kotlin/A.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/kotlin-library/src/iosMain/kotlin/A.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/kotlin-library/src/iosMain/kotlin/A.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/pod_dependency/pod_dependency.podspec b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/pod_dependency/pod_dependency.podspec similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/pod_dependency/pod_dependency.podspec rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/pod_dependency/pod_dependency.podspec diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/pod_dependency/src/foo.h b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/pod_dependency/src/foo.h similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/pod_dependency/src/foo.h rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/pod_dependency/src/foo.h diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/pod_dependency/src/foo.m b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/pod_dependency/src/foo.m similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/pod_dependency/src/foo.m rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/pod_dependency/src/foo.m diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/settings.gradle rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/subspec_dependency/src/baz.h b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/subspec_dependency/src/baz.h similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/subspec_dependency/src/baz.h rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/subspec_dependency/src/baz.h diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/subspec_dependency/src/baz.m b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/subspec_dependency/src/baz.m similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/subspec_dependency/src/baz.m rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/subspec_dependency/src/baz.m diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/subspec_dependency/subspec_dependency.podspec b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/subspec_dependency/subspec_dependency.podspec similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-single/subspec_dependency/subspec_dependency.podspec rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/subspec_dependency/subspec_dependency.podspec diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template-groovy/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template-groovy/build.gradle rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template-groovy/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template-groovy/settings.gradle rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template-groovy/src/iosMain/kotlin/A.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/src/iosMain/kotlin/A.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template-groovy/src/iosMain/kotlin/A.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template-groovy/src/iosMain/kotlin/A.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template/settings.gradle rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template/src/iosMain/kotlin/A.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/src/iosMain/kotlin/A.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-cocoapods-template/src/iosMain/kotlin/A.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/src/iosMain/kotlin/A.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/settings.gradle rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/src/commonMain/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/src/commonMain/kotlin/main.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/src/commonMain/kotlin/main.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-fat-framework/smoke/src/commonMain/kotlin/main.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-fat-framework/smoke/gradle.properties deleted file mode 100644 index e69de29bb2d..00000000000