From 3b33d3e58d3c9415d2714c7f09274645611f8a83 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 7 Dec 2018 13:18:56 +0300 Subject: [PATCH] MPP wizard: drop some target names to use defaults instead --- .../KotlinGradleMobileSharedMultiplatformModuleBuilder.kt | 2 +- .../KotlinGradleSharedMultiplatformModuleBuilder.kt | 4 ++-- .../KotlinGradleWebMultiplatformModuleBuilder.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt index 6e92e175c36..448466b352a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt @@ -145,7 +145,7 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM apply plugin: 'maven-publish' kotlin { - jvm("$jvmTargetName") + jvm() // This is for iPhone emulator // Switch here to iosArm64 (or iosArm32) to build library for iPhone device iosX64("$nativeTargetName") { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt index c60a66877b1..6ecc26ae7c6 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt @@ -181,8 +181,8 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl apply plugin: 'maven-publish' kotlin { - jvm("$jvmTargetName") - js("$jsTargetName") + jvm() + js() // For ARM, should be changed to iosArm32 or iosArm64 // For Linux, should be changed to e.g. linuxX64 // For MacOS, should be changed to e.g. macosX64 diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt index c803ac509d3..ba950da17b7 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt @@ -236,8 +236,8 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf def logback_version = '1.2.3' kotlin { - jvm("$jvmTargetName") - js("$jsTargetName") { + jvm() + js() { compilations.all { kotlinOptions { languageVersion = "1.3"