falsepattern/ZigBrains
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

ci: buildscript tidy

Browse source
This commit is contained in:
FalsePattern 2024-11-28 13:17:18 +01:00
parent 6a67748355
commit 93d8deeec8
Signed by: falsepattern
GPG key ID: E930CDEC50C50E23
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build.gradle.kts
View file

@ -23,7 +23,10 @@ val javaVersion = property("javaVersion").toString().toInt()
val lsp4ijVersion: String by project val lsp4ijVersion: String by project
val runIdeTarget: String by project val runIdeTarget: String by project
val lsp4ijNightly = property("lsp4ijNightly").toString().toBoolean() val lsp4ijNightly = property("lsp4ijNightly").toString().toBoolean()
val useInstaller = property("useInstaller").toString().toBoolean()
val lsp4ijPluginString = "com.redhat.devtools.lsp4ij:$lsp4ijVersion${if (lsp4ijNightly) "@nightly" else ""}" val lsp4ijPluginString = "com.redhat.devtools.lsp4ij:$lsp4ijVersion${if (lsp4ijNightly) "@nightly" else ""}"
val ideaCommunityVersion: String by project
val clionVersion: String by project
group = "com.falsepattern" group = "com.falsepattern"
version = pluginVersionFull version = pluginVersionFull
@ -101,8 +104,8 @@ allprojects {
dependencies { dependencies {
intellijPlatform { intellijPlatform {
when(runIdeTarget) { when(runIdeTarget) {
"ideaCommunity" -> create(IntelliJPlatformType.IntellijIdeaCommunity, providers.gradleProperty("ideaCommunityVersion"), useInstaller = false) "ideaCommunity" -> create(IntelliJPlatformType.IntellijIdeaCommunity, ideaCommunityVersion, useInstaller = useInstaller)
"clion" -> create(IntelliJPlatformType.CLion, providers.gradleProperty("clionVersion"), useInstaller = false) "clion" -> create(IntelliJPlatformType.CLion, clionVersion, useInstaller = useInstaller)
} }
pluginVerifier() pluginVerifier()
@ -110,8 +113,8 @@ dependencies {
plugin(lsp4ijPluginString) plugin(lsp4ijPluginString)
} }
implementation(project(":core")) runtimeOnly(project(":core"))
implementation(project(":cidr")) runtimeOnly(project(":cidr"))
} }
intellijPlatform { intellijPlatform {
@ -132,7 +135,7 @@ intellijPlatform {
val changelog = project.changelog val changelog = project.changelog
changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion -> changeNotes = provider { pluginVersion }.map { pluginVersion ->
with(changelog) { with(changelog) {
renderItem( renderItem(
(getOrNull(pluginVersion) ?: getUnreleased()) (getOrNull(pluginVersion) ?: getUnreleased())

3
cidr/build.gradle.kts
View file

@ -7,6 +7,7 @@ plugins {
} }
val lsp4jVersion: String by project val lsp4jVersion: String by project
val clionVersion: String by project val clionVersion: String by project
val useInstaller = property("useInstaller").toString().toBoolean()
val genOutputDir = layout.buildDirectory.dir("generated-resources") val genOutputDir = layout.buildDirectory.dir("generated-resources")
sourceSets["main"].resources.srcDir(genOutputDir) sourceSets["main"].resources.srcDir(genOutputDir)
@ -23,7 +24,7 @@ tasks {
dependencies { dependencies {
intellijPlatform { 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") bundledPlugins("com.intellij.clion", "com.intellij.cidr.base", "com.intellij.nativeDebug")
} }
implementation(project(":core")) implementation(project(":core"))

4
core/build.gradle.kts
View file

@ -9,10 +9,12 @@ plugins {
val lsp4ijVersion: String by project val lsp4ijVersion: String by project
val lsp4jVersion: String by project val lsp4jVersion: String by project
val ideaCommunityVersion: String by project
val useInstaller = property("useInstaller").toString().toBoolean()
dependencies { dependencies {
intellijPlatform { intellijPlatform {
create(IntelliJPlatformType.IntellijIdeaCommunity, providers.gradleProperty("ideaCommunityVersion"), useInstaller = false) create(IntelliJPlatformType.IntellijIdeaCommunity, ideaCommunityVersion, useInstaller = useInstaller)
} }
compileOnly("com.redhat.devtools.intellij:lsp4ij:$lsp4ijVersion") compileOnly("com.redhat.devtools.intellij:lsp4ij:$lsp4ijVersion")
compileOnly("org.eclipse.lsp4j:org.eclipse.lsp4j:$lsp4jVersion") compileOnly("org.eclipse.lsp4j:org.eclipse.lsp4j:$lsp4jVersion")

5
gradle.properties
View file

@ -6,8 +6,9 @@ pluginVersion=20.0.2
pluginSinceBuild=243 pluginSinceBuild=243
pluginUntilBuild= pluginUntilBuild=
ideaCommunityVersion=243.21565.23-EAP-SNAPSHOT ideaCommunityVersion=2024.3
clionVersion=243.21565.87-EAP-SNAPSHOT clionVersion=2024.3
useInstaller=true
javaVersion=21 javaVersion=21
# ideaCommunity / clion # ideaCommunity / clion
runIdeTarget=clion runIdeTarget=clion