diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt index d02d83f6211..5fb171f7fdf 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt @@ -7,14 +7,14 @@ package org.jetbrains.kotlin.tools.projectWizard import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version +@Suppress("ClassName", "SpellCheckingInspection") object Versions { - val KOTLIN = version("1.4-M1") //used in tests and as fallback version - + val KOTLIN = version("1.4-M1") // used as fallback version val GRADLE = version("6.3") val KTOR = version("1.2.6") object ANDROID { - val ANDROIDX_CORE_CTX = version("1.1.0") + val ANDROIDX_CORE_KTX = version("1.1.0") val ANDROIDX_APPCOMPAT = version("1.1.0") val ANDROIDX_CONSTRAINTLAYOUT = version("1.1.3") } @@ -23,8 +23,22 @@ object Versions { val KOTLINX_HTML = version("0.6.12") } + object JS_WRAPPERS { + val KOTLIN_REACT = version("16.9.0-pre.89-kotlin-1.3.60") + val KOTLIN_REACT_DOM = KOTLIN_REACT + val KOTLIN_STYLED = KOTLIN_REACT + } - object GradlePlugins { + object NPM { + val REACT = version("16.12.0") + val REACT_DOM = REACT + val REACT_IS = REACT + + val STYLED_COMPONENTS = version("5.0.0") + val INLINE_STYLE_PREFIXER = version("5.1.0") + } + + object GRADLE_PLUGINS { val ANDROID = version("3.5.2") } } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt index cc00a36c897..487dac1c9a5 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt @@ -68,7 +68,7 @@ interface AndroidModuleConfigurator : ModuleConfigurator, override fun Reader.createSettingsGradleIRs(module: Module) = buildList { +createRepositories(KotlinPlugin::version.propertyValue).map { PluginManagementRepositoryIR(RepositoryIR(it)) } - +AndroidResolutionStrategyIR(Versions.GradlePlugins.ANDROID) + +AndroidResolutionStrategyIR(Versions.GRADLE_PLUGINS.ANDROID) } override fun createModuleIRs( @@ -79,7 +79,7 @@ interface AndroidModuleConfigurator : ModuleConfigurator, buildList { +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.GOOGLE, "androidx.core", "core-ktx"), - version = Versions.ANDROID.ANDROIDX_CORE_CTX, + version = Versions.ANDROID.ANDROIDX_CORE_KTX, dependencyType = DependencyType.MAIN ) } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt index f03dcb18812..d9153ff4a67 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.TemplateInterceptor import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.interceptTemplate import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle +import org.jetbrains.kotlin.tools.projectWizard.Versions class SimpleJsClientTemplate : Template() { override val title: String = KotlinNewProjectWizardBundle.message("module.template.js.simple.title") @@ -246,43 +247,43 @@ class SimpleJsClientTemplate : Template() { private object Dependencies { val KOTLIN_REACT = ArtifactBasedLibraryDependencyIR( MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-react"), - Version.fromString("16.9.0-pre.89-kotlin-1.3.60"), + Versions.JS_WRAPPERS.KOTLIN_REACT, DependencyType.MAIN ) val KOTLIN_REACT_DOM = ArtifactBasedLibraryDependencyIR( MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-react-dom"), - Version.fromString("16.9.0-pre.89-kotlin-1.3.60"), + Versions.JS_WRAPPERS.KOTLIN_REACT_DOM, DependencyType.MAIN ) val KOTLIN_STYLED = ArtifactBasedLibraryDependencyIR( MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-styled"), - Version.fromString("1.0.0-pre.89-kotlin-1.3.60"), + Versions.JS_WRAPPERS.KOTLIN_STYLED, DependencyType.MAIN ) val NPM_REACT = ArtifactBasedLibraryDependencyIR( NpmArtifact("react"), - Version.fromString("16.12.0"), + Versions.NPM.REACT, DependencyType.MAIN ) val NPM_REACT_DOM = ArtifactBasedLibraryDependencyIR( NpmArtifact("react-dom"), - Version.fromString("16.12.0"), + Versions.NPM.REACT_DOM, DependencyType.MAIN ) val NPM_REACT_IS = ArtifactBasedLibraryDependencyIR( NpmArtifact("react-is"), - Version.fromString("16.12.0"), + Versions.NPM.REACT_IS, DependencyType.MAIN ) val NPM_STYLED_COMPONENTS = ArtifactBasedLibraryDependencyIR( NpmArtifact("styled-components"), - Version.fromString("5.0.0"), + Versions.NPM.STYLED_COMPONENTS, DependencyType.MAIN ) val NPM_INLINE_STYLE_PREFIXER = ArtifactBasedLibraryDependencyIR( NpmArtifact("inline-style-prefixer"), - Version.fromString("5.1.0"), + Versions.NPM.INLINE_STYLE_PREFIXER, DependencyType.MAIN ) }