MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Wizard: fix compose project after updating compose version

Browse Source 
GitOrigin-RevId: 61d0443a3d6d22c8917ecbaa99124d18215e314f
This commit is contained in:
Ilya Kirillov
2021-07-13 18:58:48 +00:00
committed by intellij-monorepo-bot
parent a87a178a1f
commit a9a539ce2d
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
+2 -1
View File
@@ -30,6 +30,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "composeDesktopApplication"
packageVersion = "1.0.0"
}
}
}
}
plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
+1
View File
@@ -33,6 +33,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "jvm"
packageVersion = "1.0.0"
}
}
}
plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/composeAndroid/MainActivity.kt.vm
+1 -1
View File
@@ -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?) {
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeAndroidTemplate.kt
+11 -4
View File
@@ -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<BuildSystemIR>): List<BuildSystemIR> = 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,
)
}
}
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt
+1
View File
@@ -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")
}
}
}