diff --git a/build.gradle.kts b/build.gradle.kts index f3fa852d..d84c607d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,10 @@ val javaVersion = property("javaVersion").toString().toInt() val lsp4ijVersion: String by project val runIdeTarget: String by project val lsp4ijNightly = property("lsp4ijNightly").toString().toBoolean() +val useInstaller = property("useInstaller").toString().toBoolean() val lsp4ijPluginString = "com.redhat.devtools.lsp4ij:$lsp4ijVersion${if (lsp4ijNightly) "@nightly" else ""}" +val ideaCommunityVersion: String by project +val clionVersion: String by project group = "com.falsepattern" version = pluginVersionFull @@ -101,8 +104,8 @@ allprojects { dependencies { intellijPlatform { when(runIdeTarget) { - "ideaCommunity" -> create(IntelliJPlatformType.IntellijIdeaCommunity, providers.gradleProperty("ideaCommunityVersion"), useInstaller = false) - "clion" -> create(IntelliJPlatformType.CLion, providers.gradleProperty("clionVersion"), useInstaller = false) + "ideaCommunity" -> create(IntelliJPlatformType.IntellijIdeaCommunity, ideaCommunityVersion, useInstaller = useInstaller) + "clion" -> create(IntelliJPlatformType.CLion, clionVersion, useInstaller = useInstaller) } pluginVerifier() @@ -110,8 +113,8 @@ dependencies { plugin(lsp4ijPluginString) } - implementation(project(":core")) - implementation(project(":cidr")) + runtimeOnly(project(":core")) + runtimeOnly(project(":cidr")) } intellijPlatform { @@ -132,7 +135,7 @@ intellijPlatform { val changelog = project.changelog - changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion -> + changeNotes = provider { pluginVersion }.map { pluginVersion -> with(changelog) { renderItem( (getOrNull(pluginVersion) ?: getUnreleased()) diff --git a/cidr/build.gradle.kts b/cidr/build.gradle.kts index ff4dfc87..ebeabea3 100644 --- a/cidr/build.gradle.kts +++ b/cidr/build.gradle.kts @@ -7,6 +7,7 @@ plugins { } val lsp4jVersion: String by project val clionVersion: String by project +val useInstaller = property("useInstaller").toString().toBoolean() val genOutputDir = layout.buildDirectory.dir("generated-resources") sourceSets["main"].resources.srcDir(genOutputDir) @@ -23,7 +24,7 @@ tasks { dependencies { intellijPlatform { - create(IntelliJPlatformType.CLion, providers.gradleProperty("clionVersion"), useInstaller = false) + create(IntelliJPlatformType.CLion, clionVersion, useInstaller = useInstaller) bundledPlugins("com.intellij.clion", "com.intellij.cidr.base", "com.intellij.nativeDebug") } implementation(project(":core")) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 5d700cba..bcdb0b64 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -9,10 +9,12 @@ plugins { val lsp4ijVersion: String by project val lsp4jVersion: String by project +val ideaCommunityVersion: String by project +val useInstaller = property("useInstaller").toString().toBoolean() dependencies { intellijPlatform { - create(IntelliJPlatformType.IntellijIdeaCommunity, providers.gradleProperty("ideaCommunityVersion"), useInstaller = false) + create(IntelliJPlatformType.IntellijIdeaCommunity, ideaCommunityVersion, useInstaller = useInstaller) } compileOnly("com.redhat.devtools.intellij:lsp4ij:$lsp4ijVersion") compileOnly("org.eclipse.lsp4j:org.eclipse.lsp4j:$lsp4jVersion") diff --git a/gradle.properties b/gradle.properties index ace0b058..b3e8ee5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,9 @@ pluginVersion=20.0.2 pluginSinceBuild=243 pluginUntilBuild= -ideaCommunityVersion=243.21565.23-EAP-SNAPSHOT -clionVersion=243.21565.87-EAP-SNAPSHOT +ideaCommunityVersion=2024.3 +clionVersion=2024.3 +useInstaller=true javaVersion=21 # ideaCommunity / clion runIdeTarget=clion