MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

KTIJ-19787 Remove Multiplatform Mobile Application template from Kotlin NPW

Browse Source 
^KTIJ-19787 fixed

GitOrigin-RevId: 6cf38ace23532a85758c0683e24aacb9c7f06034
This commit is contained in:
Andrei Klunnyi
2021-09-29 15:03:33 +02:00
committed by intellij-monorepo-bot
parent 7355d30a91
commit 439b08ac59
13 changed files with 0 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/kotlin/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java
View File

@@ -53,11 +53,6 @@ public class ProjectTemplateBuildFileGenerationTestGenerated extends AbstractPro
runTest("testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/");
}
@TestMetadata("multiplatformMobileApplication")
public void testMultiplatformMobileApplication() throws Exception {
runTest("testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/");
}
@TestMetadata("nativeApplication")
public void testNativeApplication() throws Exception {
runTest("testData/projectTemplatesBuildFileGeneration/nativeApplication/");

35
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle
View File

@@ -1,35 +0,0 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'kotlin-android-extensions'
}
group = 'me.user'
version = '1.0-SNAPSHOT'
dependencies {
implementation project(':shared')
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
}
android {
compileSdkVersion 29
defaultConfig {
applicationId 'me.user.androidApp'
minSdkVersion 24
targetSdkVersion 29
versionCode 1
versionName '1.0'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
'release' {
minifyEnabled false
}
}
}

35
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts
View File

@@ -1,35 +0,0 @@
plugins {
id("com.android.application")
kotlin("android")
id("kotlin-android-extensions")
}
group = "me.user"
version = "1.0-SNAPSHOT"
dependencies {
implementation(project(":shared"))
implementation("com.google.android.material:material:1.2.1")
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.2")
}
android {
compileSdkVersion(29)
defaultConfig {
applicationId = "me.user.androidApp"
minSdkVersion(24)
targetSdkVersion(29)
versionCode = 1
versionName = "1.0"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
}
}
}

23
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle
View File

@@ -1,23 +0,0 @@
buildscript {
repositories {
gradlePluginPortal()
jcenter()
google()
mavenCentral()
}
dependencies {
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION')
classpath('com.android.tools.build:gradle:4.0.2')
}
}
group = 'me.user'
version = '1.0-SNAPSHOT'
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

23
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts
View File

@@ -1,23 +0,0 @@
buildscript {
repositories {
gradlePluginPortal()
jcenter()
google()
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION")
classpath("com.android.tools.build:gradle:4.0.2")
}
}
group = "me.user"
version = "1.0-SNAPSHOT"
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

14
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle
View File

@@ -1,14 +0,0 @@
pluginManagement {
repositories {
google()
jcenter()
gradlePluginPortal()
mavenCentral()
}
}
rootProject.name = 'multiplatformMobileApplication'
include(':androidApp')
include(':shared')

14
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts
View File

@@ -1,14 +0,0 @@
pluginManagement {
repositories {
google()
jcenter()
gradlePluginPortal()
mavenCentral()
}
}
rootProject.name = "multiplatformMobileApplication"
include(":androidApp")
include(":shared")

75
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle
View File

@@ -1,75 +0,0 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
id 'org.jetbrains.kotlin.multiplatform'
id 'com.android.library'
id 'kotlin-android-extensions'
}
group = 'me.user'
version = '1.0-SNAPSHOT'
kotlin {
android()
ios {
binaries {
framework {
baseName = 'shared'
}
}
}
sourceSets {
commonMain {
}
commonTest {
dependencies {
implementation kotlin('test')
}
}
androidMain {
dependencies {
implementation 'com.google.android.material:material:1.2.1'
}
}
androidTest {
dependencies {
implementation 'junit:junit:4.13'
}
}
iosMain {
}
iosTest {
}
}
}
android {
compileSdkVersion 29
sourceSets.main.manifest.srcFile('src/androidMain/AndroidManifest.xml')
defaultConfig {
minSdkVersion 24
targetSdkVersion 29
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
task(packForXcode, type: Sync) {
group = 'build'
def mode = System.getenv('CONFIGURATION') ?: 'DEBUG'
def sdkName = System.getenv('SDK_NAME') ?: 'iphonesimulator'
def targetName = 'ios' + (sdkName.startsWith('iphoneos') ? 'Arm64' : 'X64')
def framework = kotlin.targets[targetName].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)

69
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts
View File

@@ -1,69 +0,0 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform")
id("com.android.library")
id("kotlin-android-extensions")
}
group = "me.user"
version = "1.0-SNAPSHOT"
kotlin {
android()
ios {
binaries {
framework {
baseName = "shared"
}
}
}
sourceSets {
val commonMain by getting
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
}
}
val androidMain by getting {
dependencies {
implementation("com.google.android.material:material:1.2.1")
}
}
val androidTest by getting {
dependencies {
implementation("junit:junit:4.13")
}
}
val iosMain by getting
val iosTest by getting
}
}
android {
compileSdkVersion(29)
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdkVersion(24)
targetSdkVersion(29)
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}
val packForXcode by tasks.creating(Sync::class) {
group = "build"
val mode = System.getenv("CONFIGURATION") ?: "DEBUG"
val sdkName = System.getenv("SDK_NAME") ?: "iphonesimulator"
val targetName = "ios" + if (sdkName.startsWith("iphoneos")) "Arm64" else "X64"
val framework = kotlin.targets.getByName<KotlinNativeTarget>(targetName).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)

2
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/settings.yaml
View File

@@ -1,2 +0,0 @@
android:
androidSdkPath: android.sdk

23
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplates.kt
View File

@@ -71,7 +71,6 @@ abstract class ProjectTemplate : DisplayableSettingItem {
companion object {
val ALL = listOf(
ConsoleApplicationProjectTemplate,
MultiplatformMobileApplicationProjectTemplate,
MultiplatformLibraryProjectTemplate,
NativeApplicationProjectTemplate,
FrontendApplicationProjectTemplate,
@@ -273,28 +272,6 @@ object ReactApplicationProjectTemplate : ProjectTemplate() {
)
}
object MultiplatformMobileApplicationProjectTemplate : MultiplatformMobileApplicationProjectTemplateBase() {
override val id = "multiplatformMobileApplication"
override fun androidAppModule(shared: Module) = Module(
"androidApp",
AndroidSinglePlatformModuleConfigurator,
template = null,
sourceSets = createDefaultSourceSets(),
subModules = emptyList(),
dependencies = mutableListOf(ModuleReference.ByModule(shared))
)
override fun iosAppModule(shared: Module) = Module(
"iosApp",
IOSSinglePlatformModuleConfigurator,
template = null,
sourceSets = createDefaultSourceSets(),
subModules = emptyList(),
dependencies = mutableListOf(ModuleReference.ByModule(shared))
)
}
abstract class MultiplatformMobileApplicationProjectTemplateBase : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.description")

1
plugins/kotlin/project-wizard/idea/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt
View File

@@ -101,7 +101,6 @@ private val ProjectTemplate.icon: Icon?
NativeApplicationProjectTemplate -> KotlinIcons.Wizard.NATIVE
FrontendApplicationProjectTemplate -> KotlinIcons.Wizard.JS
ReactApplicationProjectTemplate -> KotlinIcons.Wizard.REACT_JS
MultiplatformMobileApplicationProjectTemplate -> KotlinIcons.Wizard.MULTIPLATFORM_MOBILE
NodeJsApplicationProjectTemplate -> KotlinIcons.Wizard.NODE_JS
ComposeDesktopApplicationProjectTemplate -> KotlinIcons.Wizard.COMPOSE
ComposeMultiplatformApplicationProjectTemplate -> KotlinIcons.Wizard.COMPOSE

15
plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java
View File

@@ -55,11 +55,6 @@ public abstract class ProjectTemplateNewWizardProjectImportTestGenerated extends
runTest("../cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/");
}
@TestMetadata("multiplatformMobileApplication")
public void testMultiplatformMobileApplication() throws Exception {
runTest("../cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/");
}
@TestMetadata("nativeApplication")
public void testNativeApplication() throws Exception {
runTest("../cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/");
@@ -103,11 +98,6 @@ public abstract class ProjectTemplateNewWizardProjectImportTestGenerated extends
runTest("../cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/");
}
@TestMetadata("multiplatformMobileApplication")
public void testMultiplatformMobileApplication() throws Exception {
runTest("../cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/");
}
@TestMetadata("nativeApplication")
public void testNativeApplication() throws Exception {
runTest("../cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/");
@@ -151,11 +141,6 @@ public abstract class ProjectTemplateNewWizardProjectImportTestGenerated extends
runTest("../cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/");
}
@TestMetadata("multiplatformMobileApplication")
public void testMultiplatformMobileApplication() throws Exception {
runTest("../cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/");
}
@TestMetadata("nativeApplication")
public void testNativeApplication() throws Exception {
runTest("../cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/");