Skip to content

Commit 3006622

Browse files
authored
Merge pull request #27 from lstreckeisen/CMI-69-FR-4.1-Generate-PlantUML-diagrams
Cmi 69 fr 4.1 generate plant uml diagrams
2 parents 123f366 + 4f70d6a commit 3006622

29 files changed

+76869
-100
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
[*.{kt,kts}]
2-
ij_kotlin_allow_trailing_comma = false
2+
ij_kotlin_allow_trailing_comma = false
3+
ij_kotlin_name_count_to_use_star_import = 50
4+
ij_kotlin_name_count_to_use_star_import_for_members = 50

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
uses: JetBrains/qodana-action@v2024.3
6262
with:
6363
pr-mode: false
64+
args: --baseline,qodana.serif.json,--fail-threshold,2
6465
env:
6566
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1103458822 }}
6667
QODANA_ENDPOINT: 'https://qodana.cloud'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.gradle
2+
.kotlin
23
build/
34
!gradle/wrapper/gradle-wrapper.jar
45
!**/src/main/**/build/

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright 2025 Lukas Streckeisen
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

build.gradle.kts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
import org.apache.commons.lang3.SystemUtils
22
import org.jetbrains.changelog.markdownToHTML
3-
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
43
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
54
import java.nio.file.Files
65

76
plugins {
87
id("java")
9-
id("org.jetbrains.kotlin.jvm") version "1.9.25"
10-
id("org.jetbrains.intellij.platform") version "2.5.0"
8+
id("org.jetbrains.kotlin.jvm") version "2.1.21"
9+
id("org.jetbrains.intellij.platform") version "2.6.0"
1110
id("org.jlleitschuh.gradle.ktlint") version "12.2.0"
1211
id("org.jetbrains.changelog") version "2.2.1"
1312
}
1413

15-
idea {
16-
module {
17-
testResources.from("src/test/testData")
18-
}
19-
}
20-
2114
repositories {
2215
mavenLocal()
2316
mavenCentral()
@@ -28,21 +21,18 @@ repositories {
2821
}
2922

3023
val lsp4ijVersion = property("lsp4ijVersion") as String
31-
val jUnitVersion = property("jUnitVersion") as String
3224
val mockkVersion = property("mockkVersion") as String
3325

3426
dependencies {
3527
intellijPlatform {
3628
intellijIdeaCommunity(property("intelliJVersion") as String)
3729

3830
plugins("com.redhat.devtools.lsp4ij:$lsp4ijVersion")
39-
40-
testFramework(TestFrameworkType.Platform)
4131
}
4232

4333
implementation(files(layout.buildDirectory.dir("lsp")))
4434

45-
testImplementation("junit:junit:$jUnitVersion")
35+
testImplementation(kotlin("test"))
4636
testImplementation("io.mockk:mockk:$mockkVersion")
4737
}
4838

@@ -141,11 +131,11 @@ tasks {
141131
}
142132

143133
test {
144-
useJUnit()
134+
useJUnitPlatform()
145135

146136
reports {
147137
junitXml.required = true
148-
html.required = false
138+
html.required = true
149139
}
150140
}
151141

gradle.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ org.gradle.configuration-cache=true
55
# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
66
org.gradle.caching=true
77

8-
intelliJVersion=2024.1.7
8+
intelliJVersion=2024.2.6
99
ideaSinceBuild=241
1010
ideaUntilBuild=251.*
1111

1212
cmlVersion=6.12.0
13-
lsp4ijVersion=0.12.0
14-
jUnitVersion=4.13.2
13+
lsp4ijVersion=0.13.0
1514
mockkVersion=1.13.17

lsp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "context-mapper-intellij-plugin",
33
"private": true,
44
"dependencies": {
5-
"@lstreckeisen/context-mapper-language-server": "0.3.0"
5+
"@lstreckeisen/context-mapper-language-server": "0.4.0"
66
}
77
}

0 commit comments

Comments
 (0)