From a16318624b99252df0ae6befef5b1b0296169a08 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 12 Oct 2018 13:20:47 +0300 Subject: [PATCH] MPP wizards: remove unused module parameter from createProjectSkeleton --- .../gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt | 2 +- .../KotlinGradleAbstractMultiplatformModuleBuilder.kt | 4 ++-- .../KotlinGradleMobileMultiplatformModuleBuilder.kt | 3 +-- .../KotlinGradleMobileSharedMultiplatformModuleBuilder.kt | 3 +-- .../KotlinGradleSharedMultiplatformModuleBuilder.kt | 3 +-- .../KotlinGradleWebMultiplatformModuleBuilder.kt | 3 +-- 6 files changed, 7 insertions(+), 11 deletions(-) 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 8b66beaf7b7..04722c011a3 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 @@ -26,7 +26,7 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl override val notImportedCommonSourceSets = true - override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { + override fun createProjectSkeleton(rootDir: VirtualFile) { val src = rootDir.createChildDirectory(this, "src") // Main module: 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 f350a71e8bf..2b4db66bfb0 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 @@ -86,7 +86,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( it.addIncludedModules(listOf(":app")) } } - createProjectSkeleton(module, rootDir) + createProjectSkeleton(rootDir) if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { setGradleWrapperToUseVersion(rootDir, "4.7") } @@ -132,7 +132,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( .createChildData(this, fileName) .bufferedWriter() - protected open fun createProjectSkeleton(module: Module, rootDir: VirtualFile) {} + protected open fun createProjectSkeleton(rootDir: VirtualFile) {} protected open val notImportedCommonSourceSets = false 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 70c595c6152..d9219026610 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 @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.configuration -import com.intellij.openapi.module.Module import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.configuration.xcode.XcodeProjectConfigurator import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder @@ -48,7 +47,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder : addRepositoriesDefinition("jcenter()") } - override fun createProjectSkeleton(module: Module, rootDir: VirtualFile) { + override fun createProjectSkeleton(rootDir: VirtualFile) { val appDir = rootDir.findChild(androidAppName)!! val src = appDir.createChildDirectory(this, "src") 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 09ff5a7a95f..95ff31e2ef0 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 @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.configuration -import com.intellij.openapi.module.Module import com.intellij.openapi.vfs.VirtualFile import java.io.BufferedWriter @@ -31,7 +30,7 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM override fun getDescription() = "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 commonMain = src.createKotlinSampleFileWriter(commonSourceName) 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 3a004d833ed..446cc99c745 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 @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.configuration -import com.intellij.openapi.module.Module import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.konan.target.presetName import java.io.BufferedWriter @@ -35,7 +34,7 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl override fun getDescription() = "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 commonMain = src.createKotlinSampleFileWriter(commonSourceName) 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 47b9d451ae1..fde92a9974d 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 @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.configuration -import com.intellij.openapi.module.Module import com.intellij.openapi.vfs.VirtualFile import java.io.BufferedWriter @@ -29,7 +28,7 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf override fun getDescription() = "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 commonMain = src.createKotlinSampleFileWriter(commonSourceName)