From a9a539ce2d2cb7e2deb941dacb53f29f78774346 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 13 Jul 2021 18:58:48 +0000 Subject: [PATCH] Wizard: fix compose project after updating compose version GitOrigin-RevId: 61d0443a3d6d22c8917ecbaa99124d18215e314f --- .../composeDesktopApplication/build.gradle.kts | 3 ++- .../expected/desktop/build.gradle.kts | 1 + .../templates/composeAndroid/MainActivity.kt.vm | 2 +- .../templates/compose/ComposeAndroidTemplate.kt | 15 +++++++++++---- .../compose/ComposeJvmDesktopTemplate.kt | 1 + 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts index c1c2ef868a31..372c621e9341 100644 --- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts +++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts @@ -30,6 +30,7 @@ compose.desktop { nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "composeDesktopApplication" + packageVersion = "1.0.0" } } -} \ No newline at end of file +} diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts index cdee5feac63b..cbedee6822c7 100644 --- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts +++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts @@ -33,6 +33,7 @@ compose.desktop { nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "jvm" + packageVersion = "1.0.0" } } } diff --git a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/composeAndroid/MainActivity.kt.vm b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/composeAndroid/MainActivity.kt.vm index 8531f2f352d8..2c8641c435b1 100644 --- a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/composeAndroid/MainActivity.kt.vm +++ b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/composeAndroid/MainActivity.kt.vm @@ -6,7 +6,7 @@ import ${sharedPackage}.App #end import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import androidx.compose.ui.platform.setContent +import androidx.activity.compose.setContent class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeAndroidTemplate.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeAndroidTemplate.kt index 69d1ee159421..02130b5fc391 100644 --- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeAndroidTemplate.kt +++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeAndroidTemplate.kt @@ -7,11 +7,9 @@ import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.* -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.BuildSystemIR -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.GradleOnlyPluginByNameIR -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR -import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.RepositoryIR +import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.* import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.irsList +import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidModuleConfigurator import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidSinglePlatformModuleConfigurator import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.moduleType @@ -50,6 +48,7 @@ class ComposeAndroidTemplate : Template() { +RepositoryIR(Repositories.JETBRAINS_COMPOSE_DEV) +RepositoryIR(DefaultRepository.JCENTER) +RepositoryIR(DefaultRepository.GOOGLE) + +Dependencies.ACTIVITY_COMPOSE } override fun Reader.updateBuildFileIRs(irs: List): List = irs.filterNot { @@ -100,4 +99,12 @@ class ComposeAndroidTemplate : Template() { relativePath = "src" / "main" / "AndroidManifest.xml", ) } + + object Dependencies { + val ACTIVITY_COMPOSE = ArtifactBasedLibraryDependencyIR( + MavenArtifact(Repositories.JETBRAINS_COMPOSE_DEV, "androidx.activity", "activity-compose"), + version = Versions.COMPOSE.ANDROID_ACTIVITY_COMPOSE, + dependencyType = DependencyType.MAIN, + ) + } } diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt index dd890ace6441..d0c55378b93a 100644 --- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt +++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt @@ -47,6 +47,7 @@ class ComposeJvmDesktopTemplate : Template() { "nativeDistributions" { "targetFormats"(raw("TargetFormat.Dmg"), raw("TargetFormat.Msi"), raw("TargetFormat.Deb")) "packageName" assign const(module.name) + "packageVersion" assign const("1.0.0") } } }