[Gradle, K/N] Change prefix of apple-specific tests to native-*

The commit does nothing but renaming of directories
This commit is contained in:
Alexander.Likhachev
2020-10-14 14:37:01 +03:00
parent 3ab99c1f96
commit 72ad581fe4
83 changed files with 11 additions and 11 deletions
@@ -313,10 +313,10 @@ class CodeConformanceTest : TestCase() {
"gradle/cacheRedirector.gradle.kts", "gradle/cacheRedirector.gradle.kts",
"kotlin-ultimate/prepare/mobile-plugin/build.gradle.kts", "kotlin-ultimate/prepare/mobile-plugin/build.gradle.kts",
"kotlin-ultimate/gradle/cidrPluginTools.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/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/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/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/resources/testProject/new-mpp-android/build.gradle",
"libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt", "libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt",
@@ -38,10 +38,10 @@ class CocoaPodsIT : BaseGradleIT() {
val PODFILE_IMPORT_DIRECTIVE_PLACEHOLDER = "<import_mode_directive>" val PODFILE_IMPORT_DIRECTIVE_PLACEHOLDER = "<import_mode_directive>"
private val cocoapodsSingleKtPod = "new-mpp-cocoapods-single" private val cocoapodsSingleKtPod = "native-cocoapods-single"
private val cocoapodsMultipleKtPods = "new-mpp-cocoapods-multiple" private val cocoapodsMultipleKtPods = "native-cocoapods-multiple"
private val templateProjectName = "new-mpp-cocoapods-template" private val templateProjectName = "native-cocoapods-template"
private val groovyTemplateProjectName = "new-mpp-cocoapods-template-groovy" private val groovyTemplateProjectName = "native-cocoapods-template-groovy"
private val dummyTaskName = ":$DUMMY_FRAMEWORK_TASK_NAME" private val dummyTaskName = ":$DUMMY_FRAMEWORK_TASK_NAME"
private val podspecTaskName = ":$POD_SPEC_TASK_NAME" private val podspecTaskName = ":$POD_SPEC_TASK_NAME"
@@ -21,7 +21,7 @@ class CommonNativeIT : BaseGradleIT() {
projectName: String, projectName: String,
libTargets: List<String>, libTargets: List<String>,
appTargets: List<String> appTargets: List<String>
) = with(transformProjectWithPluginsDsl(projectName, directoryPrefix = "new-mpp-common-native")) { ) = with(transformProjectWithPluginsDsl(projectName, directoryPrefix = "native-apple-devices-common")) {
configureMemoryInGradleProperties() configureMemoryInGradleProperties()
val libCompileTasks = libTargets.map { ":lib:compileKotlin${it.capitalize()}" } val libCompileTasks = libTargets.map { ":lib:compileKotlin${it.capitalize()}" }
@@ -26,7 +26,7 @@ class FatFrameworkIT : BaseGradleIT() {
Assume.assumeTrue(HostManager.hostIsMac) Assume.assumeTrue(HostManager.hostIsMac)
transformProjectWithPluginsDsl( transformProjectWithPluginsDsl(
"smoke", "smoke",
directoryPrefix = "new-mpp-fat-framework" directoryPrefix = "native-fat-framework"
).build("fat") { ).build("fat") {
checkSmokeBuild( checkSmokeBuild(
archs = listOf("x64", "arm64", "arm32"), archs = listOf("x64", "arm64", "arm32"),
@@ -47,7 +47,7 @@ class FatFrameworkIT : BaseGradleIT() {
@Test @Test
fun smokeWatchos() { fun smokeWatchos() {
Assume.assumeTrue(HostManager.hostIsMac) Assume.assumeTrue(HostManager.hostIsMac)
with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "new-mpp-fat-framework")) { with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) {
gradleBuildScript().modify { gradleBuildScript().modify {
it.checkedReplace("iosArm32()", "watchosArm32()") it.checkedReplace("iosArm32()", "watchosArm32()")
@@ -114,7 +114,7 @@ class FatFrameworkIT : BaseGradleIT() {
@Test @Test
fun testDuplicatedArchitecture() { fun testDuplicatedArchitecture() {
Assume.assumeTrue(HostManager.hostIsMac) Assume.assumeTrue(HostManager.hostIsMac)
with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "new-mpp-fat-framework")) { with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) {
gradleBuildScript().modify { gradleBuildScript().modify {
it + """ it + """
val anotherDeviceTarget = kotlin.iosArm64("another") { val anotherDeviceTarget = kotlin.iosArm64("another") {
@@ -133,7 +133,7 @@ class FatFrameworkIT : BaseGradleIT() {
@Test @Test
fun testIncorrectFamily() { fun testIncorrectFamily() {
Assume.assumeTrue(HostManager.hostIsMac) Assume.assumeTrue(HostManager.hostIsMac)
with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "new-mpp-fat-framework")) { with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) {
gradleBuildScript().modify { gradleBuildScript().modify {
it + """ it + """
val macos = kotlin.macosX64 { val macos = kotlin.macosX64 {