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

MPP wizards: remove unused module parameter from createProjectSkeleton

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-10-12 13:20:47 +03:00
parent a88bfb726d
commit a16318624b
6 changed files with 7 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
@@ -26,7 +26,7 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
override val notImportedCommonSourceSets = true override val notImportedCommonSourceSets = true
override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { override fun createProjectSkeleton(rootDir: VirtualFile) {
val src = rootDir.createChildDirectory(this, "src") val src = rootDir.createChildDirectory(this, "src")
// Main module: // Main module:
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -86,7 +86,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
it.addIncludedModules(listOf(":app")) it.addIncludedModules(listOf(":app"))
} }
} }
createProjectSkeleton(module, rootDir) createProjectSkeleton(rootDir)
if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) {
setGradleWrapperToUseVersion(rootDir, "4.7") setGradleWrapperToUseVersion(rootDir, "4.7")
} }
@@ -132,7 +132,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
.createChildData(this, fileName) .createChildData(this, fileName)
.bufferedWriter() .bufferedWriter()
protected open fun createProjectSkeleton(module: Module, rootDir: VirtualFile) {} protected open fun createProjectSkeleton(rootDir: VirtualFile) {}
protected open val notImportedCommonSourceSets = false protected open val notImportedCommonSourceSets = false
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.idea.configuration package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.module.Module
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.configuration.xcode.XcodeProjectConfigurator import org.jetbrains.kotlin.idea.configuration.xcode.XcodeProjectConfigurator
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
@@ -48,7 +47,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
addRepositoriesDefinition("jcenter()") addRepositoriesDefinition("jcenter()")
} }
override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { override fun createProjectSkeleton(rootDir: VirtualFile) {
val appDir = rootDir.findChild(androidAppName)!! val appDir = rootDir.findChild(androidAppName)!!
val src = appDir.createChildDirectory(this, "src") val src = appDir.createChildDirectory(this, "src")
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.idea.configuration package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.module.Module
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import java.io.BufferedWriter import java.io.BufferedWriter
@@ -31,7 +30,7 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM
override fun getDescription() = override fun getDescription() =
"Multiplatform Gradle projects allow sharing the same Kotlin code between two mobile platforms (JVM/Android, Native)." "Multiplatform Gradle projects allow sharing the same Kotlin code between two mobile platforms (JVM/Android, Native)."
override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { override fun createProjectSkeleton(rootDir: VirtualFile) {
val src = rootDir.createChildDirectory(this, "src") val src = rootDir.createChildDirectory(this, "src")
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.idea.configuration package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.module.Module
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.konan.target.presetName import org.jetbrains.kotlin.konan.target.presetName
import java.io.BufferedWriter import java.io.BufferedWriter
@@ -35,7 +34,7 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
override fun getDescription() = override fun getDescription() =
"Multiplatform Gradle projects allow sharing the same Kotlin code between all three main platforms (JVM, JS, Native)." "Multiplatform Gradle projects allow sharing the same Kotlin code between all three main platforms (JVM, JS, Native)."
override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { override fun createProjectSkeleton(rootDir: VirtualFile) {
val src = rootDir.createChildDirectory(this, "src") val src = rootDir.createChildDirectory(this, "src")
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.idea.configuration package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.module.Module
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import java.io.BufferedWriter import java.io.BufferedWriter
@@ -29,7 +28,7 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
override fun getDescription() = override fun getDescription() =
"Multiplatform Gradle projects allow reusing the same Kotlin code between JS Client and JVM Server." "Multiplatform Gradle projects allow reusing the same Kotlin code between JS Client and JVM Server."
override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { override fun createProjectSkeleton(rootDir: VirtualFile) {
val src = rootDir.createChildDirectory(this, "src") val src = rootDir.createChildDirectory(this, "src")
val commonMain = src.createKotlinSampleFileWriter(commonSourceName) val commonMain = src.createKotlinSampleFileWriter(commonSourceName)