From 1504e607f9fc0a792f2d8ff47d9480d8834d420d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 24 Mar 2020 23:46:28 +0300 Subject: [PATCH] Wizard: remove unneeded project templates & rearrange others --- ...teNewWizardProjectImportTestGenerated.java | 30 +++---- .../expected/androidApp}/build.gradle | 3 +- .../expected/androidApp}/build.gradle.kts | 3 +- .../expected/build.gradle | 3 +- .../expected/build.gradle.kts | 3 +- .../expected/settings.gradle | 6 +- .../expected/settings.gradle.kts | 6 +- .../expected/shared/build.gradle | 79 +++++++++++++++++++ .../expected/shared/build.gradle.kts | 73 +++++++++++++++++ .../settings.yaml | 0 .../expected/build.gradle | 11 ++- .../expected/build.gradle.kts | 11 ++- ...plateBuildFileGenerationTestGenerated.java | 10 +-- .../projectTemplates/ProjectTemplate.kt | 58 ++------------ 14 files changed, 209 insertions(+), 87 deletions(-) rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication/expected/app => mppMobileApplication/expected/androidApp}/build.gradle (90%) rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication/expected/app => mppMobileApplication/expected/androidApp}/build.gradle.kts (90%) rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication => mppMobileApplication}/expected/build.gradle (96%) rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication => mppMobileApplication}/expected/build.gradle.kts (96%) rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication => mppMobileApplication}/expected/settings.gradle (81%) rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication => mppMobileApplication}/expected/settings.gradle.kts (81%) create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle.kts rename libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/{androidApplication => mppMobileApplication}/settings.yaml (100%) diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java index 7d29653d4c9..fc3153edb60 100644 --- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java +++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java @@ -30,11 +30,6 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("androidApplication") - public void testAndroidApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/"); - } - @TestMetadata("emptyMultiplatform") public void testEmptyMultiplatform() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); @@ -60,6 +55,11 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); } + @TestMetadata("mppMobileApplication") + public void testMppMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + } + @TestMetadata("multiplatformLibrary") public void testMultiplatformLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); @@ -88,11 +88,6 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("androidApplication") - public void testAndroidApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/"); - } - @TestMetadata("emptyMultiplatform") public void testEmptyMultiplatform() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); @@ -118,6 +113,11 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); } + @TestMetadata("mppMobileApplication") + public void testMppMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + } + @TestMetadata("multiplatformLibrary") public void testMultiplatformLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); @@ -146,11 +146,6 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("androidApplication") - public void testAndroidApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/"); - } - @TestMetadata("emptyMultiplatform") public void testEmptyMultiplatform() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); @@ -176,6 +171,11 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); } + @TestMetadata("mppMobileApplication") + public void testMppMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + } + @TestMetadata("multiplatformLibrary") public void testMultiplatformLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle similarity index 90% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle index 10202efd7ef..ee12111f509 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle @@ -13,6 +13,7 @@ repositories { mavenCentral() } dependencies { + implementation project(':shared') implementation 'androidx.core:core-ktx:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' @@ -21,7 +22,7 @@ dependencies { android { compileSdkVersion 29 defaultConfig { - applicationId 'me.user.app' + applicationId 'me.user.androidApp' minSdkVersion 24 targetSdkVersion 29 versionCode 1 diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle.kts similarity index 90% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle.kts index 0bae9be20ff..0b5d7929d6f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/app/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle.kts @@ -13,6 +13,7 @@ repositories { mavenCentral() } dependencies { + implementation(project(":shared")) implementation("androidx.core:core-ktx:1.1.0") implementation("androidx.appcompat:appcompat:1.1.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") @@ -21,7 +22,7 @@ dependencies { android { compileSdkVersion(29) defaultConfig { - applicationId = "me.user.app" + applicationId = "me.user.androidApp" minSdkVersion(24) targetSdkVersion(29) versionCode = 1 diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle similarity index 96% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle index 58dfac75d1c..f8f8ab86d18 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle @@ -1,6 +1,7 @@ + group = 'me.user' version = '1.0-SNAPSHOT' repositories { mavenCentral() -} \ No newline at end of file +} diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle.kts similarity index 96% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle.kts index f4cf4e941e3..19d87fa6ba3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle.kts @@ -1,6 +1,7 @@ + group = "me.user" version = "1.0-SNAPSHOT" repositories { mavenCentral() -} \ No newline at end of file +} diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle similarity index 81% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/settings.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle index e7b65b2556c..514e881c994 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle @@ -12,7 +12,9 @@ pluginManagement { } } } -rootProject.name = 'AndroidApplication' +rootProject.name = 'MPPMobileApplication' -include(':app') \ No newline at end of file +include(':shared') +include(':androidApp') + diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle.kts similarity index 81% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/settings.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle.kts index 6d4ce6b3380..31cf256bad6 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle.kts @@ -12,7 +12,9 @@ pluginManagement { } } } -rootProject.name = "AndroidApplication" +rootProject.name = "MPPMobileApplication" -include(":app") \ No newline at end of file +include(":shared") +include(":androidApp") + diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle new file mode 100644 index 00000000000..eb5bd6179be --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle @@ -0,0 +1,79 @@ +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget + +plugins { + id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' + id 'com.android.library' + id 'kotlin-android-extensions' +} +group = 'me.user' +version = '1.0-SNAPSHOT' + +repositories { + gradlePluginPortal() + google() + jcenter() + mavenCentral() +} +kotlin { + android() + iosX64('ios') { + binaries { + framework { + baseName = 'shared' + } + } + } + sourceSets { + commonMain { + dependencies { + implementation kotlin('stdlib-common') + } + } + commonTest { + dependencies { + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') + } + } + androidMain { + dependencies { + implementation kotlin('stdlib-jdk7') + implementation 'androidx.core:core-ktx:1.1.0' + } + } + androidTest { + + } + iosMain { + + } + iosTest { + + } + } +} +android { + compileSdkVersion 29 + defaultConfig { + minSdkVersion 24 + targetSdkVersion 29 + versionCode 1 + versionName '1.0' + } + buildTypes { + 'release' { + minifyEnabled false + } + } +} +task(packForXcode, type: Sync) { + group = 'build' + def mode = System.getenv('CONFIGURATION') ?: 'DEBUG' + def framework = kotlin.targets.ios.binaries.getFramework(mode) + inputs.property('mode', mode) + dependsOn(framework.linkTask) + def targetDir = new File(buildDir, 'xcode-frameworks') + from({ framework.outputDirectory }) + into(targetDir) +} +tasks.getByName("build").dependsOn(packForXcode) \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle.kts new file mode 100644 index 00000000000..9ad1198c77a --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle.kts @@ -0,0 +1,73 @@ +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget + +plugins { + kotlin("multiplatform") version "1.3.70" + id("com.android.library") + id("kotlin-android-extensions") +} +group = "me.user" +version = "1.0-SNAPSHOT" + +repositories { + gradlePluginPortal() + google() + jcenter() + mavenCentral() +} +kotlin { + android() + iosX64("ios") { + binaries { + framework { + baseName = "shared" + } + } + } + sourceSets { + val commonMain by getting { + dependencies { + implementation(kotlin("stdlib-common")) + } + } + val commonTest by getting { + dependencies { + implementation(kotlin("test-common")) + implementation(kotlin("test-annotations-common")) + } + } + val androidMain by getting { + dependencies { + implementation(kotlin("stdlib-jdk7")) + implementation("androidx.core:core-ktx:1.1.0") + } + } + val androidTest by getting + val iosMain by getting + val iosTest by getting + } +} +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(24) + targetSdkVersion(29) + versionCode = 1 + versionName = "1.0" + } + buildTypes { + getByName("release") { + isMinifyEnabled = false + } + } +} +val packForXcode by tasks.creating(Sync::class) { + group = "build" + val mode = System.getenv("CONFIGURATION") ?: "DEBUG" + val framework = kotlin.targets.getByName("ios").binaries.getFramework(mode) + inputs.property("mode", mode) + dependsOn(framework.linkTask) + val targetDir = File(buildDir, "xcode-frameworks") + from({ framework.outputDirectory }) + into(targetDir) +} +tasks.getByName("build").dependsOn(packForXcode) \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/settings.yaml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/settings.yaml similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/settings.yaml rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/settings.yaml diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index 5739b49a4ef..5c12f06db67 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' - id 'com.android.application' + id 'com.android.library' id 'kotlin-android-extensions' } group = 'me.user' @@ -14,7 +14,13 @@ repositories { } kotlin { android() - iosX64('ios') + iosX64('ios') { + binaries { + framework { + baseName = 'library' + } + } + } sourceSets { commonMain { dependencies { @@ -47,7 +53,6 @@ kotlin { android { compileSdkVersion 29 defaultConfig { - applicationId 'me.user.android' minSdkVersion 24 targetSdkVersion 29 versionCode 1 diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index 638b0a3d8d6..a546b10d6f9 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.3.70" - id("com.android.application") + id("com.android.library") id("kotlin-android-extensions") } group = "me.user" @@ -14,7 +14,13 @@ repositories { } kotlin { android() - iosX64("ios") + iosX64("ios") { + binaries { + framework { + baseName = "library" + } + } + } sourceSets { val commonMain by getting { dependencies { @@ -41,7 +47,6 @@ kotlin { android { compileSdkVersion(29) defaultConfig { - applicationId = "me.user.android" minSdkVersion(24) targetSdkVersion(29) versionCode = 1 diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java index eef608314b8..1633755533b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java @@ -28,11 +28,6 @@ public class ProjectTemplateBuildFileGenerationTestGenerated extends AbstractPro KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("androidApplication") - public void testAndroidApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/androidApplication/"); - } - @TestMetadata("emptyMultiplatform") public void testEmptyMultiplatform() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); @@ -58,6 +53,11 @@ public class ProjectTemplateBuildFileGenerationTestGenerated extends AbstractPro runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); } + @TestMetadata("mppMobileApplication") + public void testMppMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + } + @TestMetadata("multiplatformLibrary") public void testMultiplatformLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt index b57bbfb90cf..5fec049e4e3 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt @@ -64,16 +64,14 @@ sealed class ProjectTemplate : DisplayableSettingItem { companion object { val ALL = listOf( EmptySingleplatformProjectTemplate, - EmptyMultiplatformProjectTemplate, JvmConsoleApplication, - JvmServerJsClient, - MultiplatformLibrary, - AndroidApplication, - IOSApplication, MPPMobileApplication, MultiplatformMobileLibrary, + EmptyMultiplatformProjectTemplate, + MultiplatformLibrary, NativeConsoleApplication, - JsBrowserApplication + JsBrowserApplication, + JvmServerJsClient ) fun byId(id: String): ProjectTemplate? = ALL.firstOrNull { @@ -164,7 +162,7 @@ object EmptyMultiplatformProjectTemplate : ProjectTemplate() { object JvmConsoleApplication : ProjectTemplate() { override val title = "Console Application" - override val description = "Create a console application with Kotlin/JVM. Use it for prototyping or testing purposes" + override val description = "Create a console application with Kotlin/JVM. Use it for prototyping or testing purposes." override val suggestedProjectName = "myConsoleApplication" override val projectKind = ProjectKind.Singleplatform @@ -228,29 +226,6 @@ object JvmServerJsClient : ProjectTemplate() { ) } -object AndroidApplication : ProjectTemplate() { - override val title = "Android Application" - - override val description = "Simple Android application with single activity" - override val suggestedProjectName = "myAndroidApplication" - override val projectKind = ProjectKind.Android - - override val setsPluginSettings: List> - get() = listOf( - KotlinPlugin::modules withValue listOf( - Module( - "app", - AndroidSinglePlatformModuleConfigurator, - template = null, - sourcesets = SourcesetType.ALL.map { type -> - Sourceset(type, dependencies = emptyList()) - }, - subModules = emptyList() - ) - ) - ) -} - object NativeConsoleApplication : ProjectTemplate() { override val title = "Native Application" override val description = @@ -298,29 +273,6 @@ object JsBrowserApplication : ProjectTemplate() { ) } -object IOSApplication : ProjectTemplate() { - override val title = "IOS Application" - - override val description = "Simple IOS application with single screen " - override val suggestedProjectName = "myIOSApplication" - override val projectKind = ProjectKind.Multiplatform - - override val setsPluginSettings: List> - get() = listOf( - KotlinPlugin::modules withValue listOf( - Module( - "iosApp", - IOSSinglePlatformModuleConfigurator, - template = null, - sourcesets = SourcesetType.ALL.map { type -> - Sourceset(type, dependencies = emptyList()) - }, - subModules = emptyList() - ) - ) - ) -} - object MPPMobileApplication : ProjectTemplate() { override val title = "Multiplatform Mobile Application"