Finish v0.18.0

Author: theshadowco

.github/workflows/gradle.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '21']
+        java_version: ['21', '25']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v6
@@ -21,7 +21,7 @@ jobs:
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test

.github/workflows/night_build.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: Build with Gradle
         run: ./gradlew build

.github/workflows/pluginTest.yml

@@ -8,11 +8,11 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: '17'
-          distribution: 'adopt'
+          java-version: '21'
+          distribution: 'temurin'
           cache: 'gradle'
 
       - name: Build Plugin
@@ -36,21 +36,23 @@ jobs:
           curl -u admin:Sonar_Password_1 -s -X POST "http://localhost:9000/api/projects/create?name=Test&project=test-project"
 
       - name: Checkout SSL 3.1
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: '1c-syntax/ssl_3_1'
           path: 'target-project'
 
-      - name: Run Sonar Scanner
+      - name: Install Sonar scanner
+        run: npm install -g sonar-scanner
+
+      - name: SonarQube Scan
         run: |
-          docker run --rm --network="host" -v "$(pwd)/target-project:/usr/src" \
-            sonarsource/sonar-scanner-cli \
-            -Dsonar.projectKey=test-project \
-            -Dsonar.sources=. \
-            -Dsonar.host.url=http://localhost:9000 \
-            -Dsonar.token=${{ env.SONAR_TOKEN }} \
-            -Dsonar.lang.patterns.bsl=**/*.bsl,**/*.os \
-            -Dsonar.scm.disabled=true
+          sonar-scanner \
+              -Dsonar.projectKey=test-project \
+              -Dsonar.sources=target-project \
+              -Dsonar.host.url=http://localhost:9000 \
+              -Dsonar.token=${{ env.SONAR_TOKEN }} \
+              -Dsonar.lang.patterns.bsl=**/*.bsl,**/*.os \
+              -Dsonar.scm.disabled=true
 
       - name: Server Logs on Failure
         if: failure()

.github/workflows/qa.yml

@@ -16,10 +16,10 @@ jobs:
         fetch-depth: ''
     - run: |
         git fetch --prune --unshallow
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v5
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
     - name: SonarCloud Scan
       run: ./gradlew check sonar

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
     - name: Build with Gradle
       run: ./gradlew build

.github/workflows/update-gradle.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
 

.gitignore

@@ -24,3 +24,4 @@
 .idea/modules
 .idea/compiler.xml
 build/
+/.scannerwork/.sonar_lock

README.md

@@ -20,8 +20,9 @@ English version -> https://1c-syntax.github.io/sonar-bsl-plugin-community/en/
 
 | Версия SonarQube | Версия плагина  | Версия JAVA |
 |------------------|-----------------|-------------|
-| 25.1+            | 1.15.2+         | 17          |
-| 9.9+             | 1.13.0+         | 17          |
+| 25.4+            | 1.18.0+         | 21          |
+| 25.1+            | 1.15.2...1.17.2 | 17          |
+| 9.9+             | 1.13.0...1.17.2 | 17          |
 | 8.9+             | 1.11.0...1.12.0 | 11          |
 | 7.9+             | 0.7.0....1.10.0 | 11          |
 | 7.4 - 7.8        | 0.1.0....0.6.0  | 8           |

build.gradle.kts

@@ -4,9 +4,9 @@ plugins {
     jacoco
     java
     `maven-publish`
-    id("org.sonarqube") version "7.2.2.6593"
+    id("org.sonarqube") version "7.2.3.7755"
     id("cloud.rio.license") version "0.18.0"
-    id("com.gradleup.shadow") version "9.3.1"
+    id("com.gradleup.shadow") version "9.4.0"
     id("com.github.ben-manes.versions") version "0.53.0"
     id("com.github.gradle-git-version-calculator") version "1.1.0"
     id("io.freefair.lombok") version "9.2.0"
@@ -21,39 +21,44 @@ repositories {
     maven("https://central.sonatype.com/repository/maven-snapshots")
 }
 
-val sonarQubeVersion = "9.9.0.65466"
+val sonarQubeVersion = "25.4.0.105899"
+val commonmarkVersion = "0.27.1"
 
 dependencies {
-    compileOnly("org.sonarsource.api.plugin", "sonar-plugin-api", "9.14.0.375")
+    compileOnly("org.sonarsource.api.plugin", "sonar-plugin-api", "11.3.0.2824")
 
-    implementation("io.github.1c-syntax", "bsl-language-server", "0.28.5") {
+    implementation("io.github.1c-syntax", "bsl-language-server", "0.29.0") {
         exclude("com.contrastsecurity", "java-sarif")
         exclude("io.sentry", "sentry-logback")
         exclude("info.picocli", "picocli-spring-boot-starter")
         exclude("me.tongfei", "progressbar")
     }
-    implementation("org.sonarsource.analyzer-commons", "sonar-analyzer-commons", "2.5.0.1358")
+    implementation("org.sonarsource.analyzer-commons", "sonar-analyzer-commons", "2.21.0.4626")
 
     // MD to HTML converter of BSL LS rule descriptions
-    implementation("org.commonmark", "commonmark", "0.24.0")
-    implementation("org.commonmark", "commonmark-ext-gfm-tables", "0.24.0")
-    implementation("org.commonmark", "commonmark-ext-autolink", "0.24.0")
-    implementation("org.commonmark", "commonmark-ext-heading-anchor", "0.24.0")
-
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
-    testImplementation("org.assertj", "assertj-core", "3.27.0")
-    testImplementation("org.mockito", "mockito-core", "5.14.2")
-    testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion)
-    testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion)
+    implementation("org.commonmark", "commonmark", commonmarkVersion)
+    implementation("org.commonmark", "commonmark-ext-gfm-tables", commonmarkVersion)
+    implementation("org.commonmark", "commonmark-ext-autolink", commonmarkVersion)
+    implementation("org.commonmark", "commonmark-ext-heading-anchor", commonmarkVersion)
+
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", "6.0.3")
+    testImplementation("org.assertj", "assertj-core", "3.27.7")
+    testImplementation("org.mockito", "mockito-core", "5.21.0")
+    testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) {
+        exclude("org.sonarsource.sonarqube", "sonar-sarif")
+    }
+    testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) {
+        exclude("org.sonarsource.sonarqube", "sonar-sarif")
+    }
     testImplementation("org.reflections", "reflections", "0.10.2")
 
-    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4")
+    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "6.0.3")
+    testRuntimeOnly("org.junit.platform", "junit-platform-launcher", "6.0.3")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.withType<JavaCompile> {
@@ -127,7 +132,6 @@ tasks.jar {
         attributes["Plugin-Developers"] = "Alexey Sosnoviy, Nikita Fedkin"
 
         attributes["SonarLint-Supported"] = false
-        attributes["Sonar-Version"] = sonarQubeVersion
 
         attributes["Plugin-Organization"] = "1c-syntax"
         attributes["Plugin-OrganizationUrl"] = "https://github.com/1c-syntax"
@@ -138,7 +142,17 @@ tasks.jar {
 }
 
 tasks.shadowJar {
-    mergeServiceFiles() // Критично для плагинов Sonar
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    mergeServiceFiles()
+    transform(com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer::class.java) {
+        resource.set("META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports")
+        separator.set("\n")
+    }
+    transform(com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer::class.java) {
+        paths.set(setOf("META-INF/org/languagetool/language-module.properties"))
+        mergeStrategy.set(com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer.MergeStrategy.Append)
+        mergeSeparator.set(",")
+    }
     configurations = listOf(project.configurations["runtimeClasspath"])
     archiveClassifier.set("")
 }

docs/en/index.md

@@ -11,7 +11,7 @@
 
 [Russian version](../index.md)
 
-## Opportunities
+## Features
 
 - Project "Overview" dashboard;
 - Highlighting the source code of 1C: Enterprise;
@@ -28,13 +28,14 @@
 
 ## Version matrix
 
-| SonarQube Version | Plugin Version  | JAVA version |
-|-------------------|-----------------|--------------|
-| 25.1+             | 1.15.2+         | 17           |
-| 9.9+              | 1.13.0+         | 17           |
-| 8.9+              | 1.11.0...1.12.0 | 11           |
-| 7.9+              | 0.7.0...1.10.0  | 11           |
-| 7.4 - 7.8         | 0.1.0...0.6.0   | 8            |
+| SonarQube Version | Plugin Version | JAVA version|
+|-------------------|----------------|-------------|
+| 25.4+            | 1.18.0+         | 21          |
+| 25.1+            | 1.15.2...1.17.2 | 17          |
+| 9.9+             | 1.13.0...1.17.2 | 17          |
+| 8.9+             | 1.11.0...1.12.0 | 11          |
+| 7.9+             | 0.7.0....1.10.0 | 11          |
+| 7.4 - 7.8        | 0.1.0....0.6.0  | 8           |
 
 ## Run analysis