azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPP wizards: generate different file names to avoid KT-21186

Browse Source 
#KT-27456 Fixed
This commit is contained in:
Mikhail Glukhikh
2018-10-10 17:09:37 +03:00
parent 8852ef9e75
commit 42888572cb
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
val src = rootDir.createChildDirectory(this, "src") val src = rootDir.createChildDirectory(this, "src")
// Main module: // Main module:
src.createKotlinSampleFileWriter(nativeSourceName).use { src.createKotlinSampleFileWriter(nativeSourceName, nativeTargetName).use {
it.write( it.write(
""" """
package sample package sample
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+2 -1
View File
@@ -123,8 +123,9 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
protected fun VirtualFile.createKotlinSampleFileWriter( protected fun VirtualFile.createKotlinSampleFileWriter(
sourceRootName: String, sourceRootName: String,
platformName: String = "",
languageName: String = "kotlin", languageName: String = "kotlin",
fileName: String = "Sample.kt" fileName: String = "Sample${platformName.capitalize()}.kt"
) = createChildDirectory(this, sourceRootName) ) = createChildDirectory(this, sourceRootName)
.createChildDirectory(this, languageName) .createChildDirectory(this, languageName)
.createChildDirectory(this, "sample") .createChildDirectory(this, "sample")
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -54,7 +54,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)
val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") 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 androidTest = src.createKotlinSampleFileWriter(mainTestName, languageName = "java", fileName = "SampleTestsAndroid.kt")
val androidLocalProperties = rootDir.createChildData(this, "local.properties").bufferedWriter() val androidLocalProperties = rootDir.createChildData(this, "local.properties").bufferedWriter()
@@ -67,7 +67,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
val androidStyles = androidValues.createChildData(this, "styles.xml").bufferedWriter() val androidStyles = androidValues.createChildData(this, "styles.xml").bufferedWriter()
val androidActivityMain = androidLayout.createChildData(this, "activity_main.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") val nativeTest = src.createKotlinSampleFileWriter(nativeTestName, fileName = "SampleTestsIOS.kt")
try { try {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -36,9 +36,9 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)
val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") 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 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") val nativeTest = src.createKotlinSampleFileWriter(nativeTestName, fileName = "SampleTestsNative.kt")
try { try {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt
+3 -3
View File
@@ -40,11 +40,11 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)
val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") 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 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 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") val nativeTest = src.createKotlinSampleFileWriter(nativeTestName, fileName = "SampleTestsNative.kt")
try { try {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -34,9 +34,9 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)
val commonTest = src.createKotlinSampleFileWriter(commonTestName, fileName = "SampleTests.kt") 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 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 jsTest = src.createKotlinSampleFileWriter(jsTestName, fileName = "SampleTestsJS.kt")
try { try {