diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt index baba598fcee..892f75c397d 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt @@ -30,7 +30,7 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl val src = rootDir.createChildDirectory(this, "src") // Main module: - src.createKotlinSampleFileWriter(nativeSourceName).use { + src.createKotlinSampleFileWriter(nativeSourceName, nativeTargetName).use { it.write( """ package sample diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt index 337e3421721..f350a71e8bf 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt @@ -123,8 +123,9 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( protected fun VirtualFile.createKotlinSampleFileWriter( sourceRootName: String, + platformName: String = "", languageName: String = "kotlin", - fileName: String = "Sample.kt" + fileName: String = "Sample${platformName.capitalize()}.kt" ) = createChildDirectory(this, sourceRootName) .createChildDirectory(this, languageName) .createChildDirectory(this, "sample") diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt index 3c8eaa37afd..fe967c96a61 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt @@ -54,7 +54,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder : val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") - val androidMain = src.createKotlinSampleFileWriter(mainSourceName, languageName = "java") + val androidMain = src.createKotlinSampleFileWriter(mainSourceName, jvmTargetName, languageName = "java") val androidTest = src.createKotlinSampleFileWriter(mainTestName, languageName = "java", fileName = "SampleTestsAndroid.kt") val androidLocalProperties = rootDir.createChildData(this, "local.properties").bufferedWriter() @@ -67,7 +67,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder : val androidStyles = androidValues.createChildData(this, "styles.xml").bufferedWriter() val androidActivityMain = androidLayout.createChildData(this, "activity_main.xml").bufferedWriter() - val nativeMain = src.createKotlinSampleFileWriter(nativeSourceName) + val nativeMain = src.createKotlinSampleFileWriter(nativeSourceName, nativeTargetName) val nativeTest = src.createKotlinSampleFileWriter(nativeTestName, fileName = "SampleTestsIOS.kt") try { 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 8f70d23362f..f255fa95493 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 @@ -36,9 +36,9 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") - val jvmMain = src.createKotlinSampleFileWriter(jvmSourceName) + val jvmMain = src.createKotlinSampleFileWriter(jvmSourceName, jvmTargetName) val jvmTest = src.createKotlinSampleFileWriter(jvmTestName, fileName = "SampleTestsJVM.kt") - val nativeMain = src.createKotlinSampleFileWriter(nativeSourceName) + val nativeMain = src.createKotlinSampleFileWriter(nativeSourceName, nativeTargetName) val nativeTest = src.createKotlinSampleFileWriter(nativeTestName, fileName = "SampleTestsNative.kt") try { 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 2ee5be4b7a3..3a004d833ed 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 @@ -40,11 +40,11 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") - val jvmMain = src.createKotlinSampleFileWriter(jvmSourceName) + val jvmMain = src.createKotlinSampleFileWriter(jvmSourceName, jvmTargetName) val jvmTest = src.createKotlinSampleFileWriter(jvmTestName, fileName = "SampleTestsJVM.kt") - val jsMain = src.createKotlinSampleFileWriter(jsSourceName) + val jsMain = src.createKotlinSampleFileWriter(jsSourceName, jsTargetName) val jsTest = src.createKotlinSampleFileWriter(jsTestName, fileName = "SampleTestsJS.kt") - val nativeMain = src.createKotlinSampleFileWriter(nativeSourceName) + val nativeMain = src.createKotlinSampleFileWriter(nativeSourceName, nativeTargetName) val nativeTest = src.createKotlinSampleFileWriter(nativeTestName, fileName = "SampleTestsNative.kt") try { 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 a529496c7e5..47b9d451ae1 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 @@ -34,9 +34,9 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") - val jvmMain = src.createKotlinSampleFileWriter(jvmSourceName) + val jvmMain = src.createKotlinSampleFileWriter(jvmSourceName, jvmTargetName) val jvmTest = src.createKotlinSampleFileWriter(jvmTestName, fileName = "SampleTestsJVM.kt") - val jsMain = src.createKotlinSampleFileWriter(jsSourceName) + val jsMain = src.createKotlinSampleFileWriter(jsSourceName, jsTargetName) val jsTest = src.createKotlinSampleFileWriter(jsTestName, fileName = "SampleTestsJS.kt") try {