Wizard: remove unused android service
This commit is contained in:
-12
@@ -1,12 +0,0 @@
|
|||||||
package org.jetbrains.kotlin.tools.projectWizard.core.service
|
|
||||||
|
|
||||||
import java.nio.file.Path
|
|
||||||
|
|
||||||
interface AndroidWizardService : WizardService {
|
|
||||||
fun isValidAndroidSdk(path: Path): Boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
class AndroidWizardServiceImpl : AndroidWizardService, IdeaIndependentWizardService {
|
|
||||||
//TODO use some heuristics
|
|
||||||
override fun isValidAndroidSdk(path: Path): Boolean = true
|
|
||||||
}
|
|
||||||
-1
@@ -8,7 +8,6 @@ object Services {
|
|||||||
val IDEA_INDEPENDENT_SERVICES: List<IdeaIndependentWizardService> = listOf(
|
val IDEA_INDEPENDENT_SERVICES: List<IdeaIndependentWizardService> = listOf(
|
||||||
ProjectImportingWizardServiceImpl(),
|
ProjectImportingWizardServiceImpl(),
|
||||||
OsFileSystemWizardService(),
|
OsFileSystemWizardService(),
|
||||||
AndroidWizardServiceImpl(),
|
|
||||||
BuildSystemAvailabilityWizardServiceImpl(),
|
BuildSystemAvailabilityWizardServiceImpl(),
|
||||||
DummyFileFormattingService()
|
DummyFileFormattingService()
|
||||||
)
|
)
|
||||||
|
|||||||
-11
@@ -2,8 +2,6 @@ package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.*
|
import org.jetbrains.kotlin.tools.projectWizard.core.*
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.ModuleConfiguratorSetting
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.ModuleConfiguratorSetting
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.ValidationResult
|
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.service.AndroidWizardService
|
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
|
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.AndroidConfigIR
|
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.AndroidConfigIR
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.BuildScriptDependencyIR
|
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.BuildScriptDependencyIR
|
||||||
@@ -34,15 +32,6 @@ object AndroidSinglePlatformModuleConfigurator : ModuleConfiguratorWithSettings(
|
|||||||
|
|
||||||
val androidSdkPath by pathSetting("Android SDK Path", neededAtPhase = GenerationPhase.PROJECT_GENERATION) {
|
val androidSdkPath by pathSetting("Android SDK Path", neededAtPhase = GenerationPhase.PROJECT_GENERATION) {
|
||||||
shouldExists()
|
shouldExists()
|
||||||
|
|
||||||
validate { path ->
|
|
||||||
ValidationResult.create(
|
|
||||||
service<AndroidWizardService>()!!.isValidAndroidSdk(
|
|
||||||
path
|
|
||||||
),
|
|
||||||
"Path should point to valid Android SDK location"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun createBuildFileIRs(configurationData: ModuleConfigurationData, module: Module) =
|
override fun createBuildFileIRs(configurationData: ModuleConfigurationData, module: Module) =
|
||||||
|
|||||||
Reference in New Issue
Block a user