Merge pull request #3436 from 1c-syntax/develop

0.24.0

Author: nixel2007

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# happy new year 2025
+e84a3f81035a6e76c042b406d5ad6e986a91d8e1
+# happy new year 2024
+654c64ee05d943de550defda931b10ad6067171d
+

.github/workflows/check-package.yml

@@ -36,7 +36,7 @@ jobs:
             - name: Set up JDK
               uses: actions/setup-java@v4
               with:
-                java-version: 21
+                java-version: 23
                 distribution: 'temurin'
                 cache: gradle
 

.github/workflows/gh-pages.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.7.15'
+        python-version: '3.12'
         architecture: 'x64'
 
     - name: Install dependencies

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '21']
+        java_version: ['17', '21', '23']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v4

.github/workflows/qa.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
     - name: Download PR number artifact
       if: github.event.workflow_run.event == 'pull_request'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v8
       with:
         workflow: ${{ github.event.workflow_run.name }}
         run_id: ${{ github.event.workflow_run.id }}

.github/workflows/qodana.yml

@@ -33,7 +33,7 @@ jobs:
             - name: Set up JDK
               uses: actions/setup-java@v4
               with:
-                java-version: 21
+                java-version: 23
                 distribution: 'temurin'
                 cache: gradle
 
@@ -57,7 +57,7 @@ jobs:
 
             - name: Build with Gradle
               if: matrix.prefix == 'nix'
-              run: ./gradlew build
+              run: ./gradlew build -x test
 
             - name: Upload jar to release
               if: matrix.prefix == 'nix'

.github/workflows/release.yml

@@ -1,21 +1,36 @@
-name: Sentry
-on:
-  push:
-    branches-ignore:
-      - "translations_**"
-      - "dependabot/**"
-jobs:
-
-  sentry:
-    name: Sentry
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Create Sentry release
-        uses: getsentry/action-release@v1
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-        with:
-          environment: production
+name: Sentry
+on:
+  push:
+    branches-ignore:
+      - "translations_**"
+      - "dependabot/**"
+    tags:
+      - 'v*'
+jobs:
+
+  sentry:
+    name: Sentry
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+          cache: gradle
+      - name: Get version from Gradle
+        id: get_version
+        run: echo "RELEASE_VERSION=$(./gradlew version -q)" >> $GITHUB_ENV
+      - name: Create Sentry release
+        uses: getsentry/action-release@v1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+        with:
+          environment: production
+          version: ${{ env.RELEASE_VERSION }}

.github/workflows/sentry.yml

@@ -20,7 +20,7 @@ jobs:
           cache: gradle
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v1
+        uses: gradle-update/update-gradle-wrapper-action@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           set-distribution-checksum: false

.github/workflows/update-gradle.yml

@@ -8,7 +8,6 @@
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=alert_status)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
-[![Crowdin](https://badges.crowdin.net/bsl-language-server/localized.svg)](https://crowdin.com/project/bsl-language-server)
 [![Benchmark](https://1c-syntax.github.io/bsl-language-server/dev/bench/benchmark.svg)](https://1c-syntax.github.io/bsl-language-server/dev/bench/index.html)
 [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server)
 

README.md

@@ -1,4 +1,3 @@
-import gradlegitproperties.org.ajoberstar.grgit.Grgit
 import me.qoomon.gitversioning.commons.GitRefType
 import org.apache.tools.ant.filters.EscapeUnicode
 import java.util.*
@@ -10,27 +9,27 @@ plugins {
     jacoco
     signing
     id("org.cadixdev.licenser") version "0.6.1"
-    id("org.sonarqube") version "5.1.0.4882"
-    id("io.freefair.lombok") version "8.6"
-    id("io.freefair.javadoc-links") version "8.6"
-    id("io.freefair.javadoc-utf-8") version "8.6"
-    id("io.freefair.aspectj.post-compile-weaving") version "8.6"
-    id("io.freefair.maven-central.validate-poms") version "8.6"
-    id("me.qoomon.git-versioning") version "6.4.3"
-    id("com.github.ben-manes.versions") version "0.51.0"
-    id("org.springframework.boot") version "3.2.5"
-    id("io.spring.dependency-management") version "1.1.6"
+    id("org.sonarqube") version "6.0.1.5171"
+    id("io.freefair.lombok") version "8.12.1"
+    id("io.freefair.javadoc-links") version "8.12.1"
+    id("io.freefair.javadoc-utf-8") version "8.12.1"
+    id("io.freefair.aspectj.post-compile-weaving") version "8.12.1"
+    id("io.freefair.maven-central.validate-poms") version "8.12.1"
+    id("me.qoomon.git-versioning") version "6.4.4"
+    id("com.github.ben-manes.versions") version "0.52.0"
+    id("org.springframework.boot") version "3.4.3"
+    id("io.spring.dependency-management") version "1.1.7"
+    id("io.sentry.jvm.gradle") version "5.2.0"
     id("io.github.1c-syntax.bslls-dev-tools") version "0.8.1"
     id("ru.vyarus.pom") version "3.0.0"
     id("com.gorylenko.gradle-git-properties") version "2.4.2"
     id("io.codearte.nexus-staging") version "0.30.0"
-    id("me.champeau.jmh") version "0.7.2"
+    id("me.champeau.jmh") version "0.7.3"
 }
 
 repositories {
     mavenLocal()
     mavenCentral()
-    maven(url = "https://jitpack.io")
     maven(url = "https://projectlombok.org/edge-releases")
     maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
 }
@@ -59,13 +58,7 @@ gitProperties {
 
 val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
 
-val languageToolVersion = "6.4"
-
-dependencyManagement {
-    imports {
-        mavenBom("io.sentry:sentry-bom:7.11.0")
-    }
-}
+val languageToolVersion = "6.5"
 
 dependencies {
 
@@ -74,27 +67,25 @@ dependencies {
     // spring
     api("org.springframework.boot:spring-boot-starter")
     api("org.springframework.boot:spring-boot-starter-websocket")
+    api("org.springframework.boot:spring-boot-starter-cache")
     api("info.picocli:picocli-spring-boot-starter:4.7.6")
 
     // lsp4j core
-    api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.23.1")
-    api("org.eclipse.lsp4j", "org.eclipse.lsp4j.websocket.jakarta", "0.23.1")
+    api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.24.0")
+    api("org.eclipse.lsp4j", "org.eclipse.lsp4j.websocket.jakarta", "0.24.0")
 
     // 1c-syntax
-    api("io.github.1c-syntax", "bsl-parser", "0.24.0") {
-        exclude("com.tunnelvisionlabs", "antlr4-annotations")
+    api("io.github.1c-syntax", "bsl-parser", "0.26.0") {
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")
         exclude("org.abego.treelayout", "org.abego.treelayout.core")
         exclude("org.antlr", "antlr-runtime")
     }
-    api("io.github.1c-syntax", "utils", "0.6.1")
-    api("io.github.1c-syntax", "mdclasses", "0.14.0")
-    api("io.github.1c-syntax", "bsl-common-library", "0.7.0")
-    api("io.github.1c-syntax", "supportconf", "0.14.0") {
-        exclude("io.github.1c-syntax", "bsl-common-library")
-    }
-    api("io.github.1c-syntax", "bsl-parser-core", "0.1.0")
+    api("io.github.1c-syntax", "utils", "0.6.2")
+    api("io.github.1c-syntax", "mdclasses", "0.15.0")
+    api("io.github.1c-syntax", "bsl-common-library", "0.8.0")
+    api("io.github.1c-syntax", "supportconf", "0.14.2")
+    api("io.github.1c-syntax", "bsl-parser-core", "0.3.0")
 
     // JLanguageTool
     implementation("org.languagetool", "languagetool-core", languageToolVersion){
@@ -107,11 +98,12 @@ dependencies {
     implementation("org.aspectj", "aspectjrt", "1.9.22.1")
 
     // commons utils
-    implementation("commons-io", "commons-io", "2.16.1")
-    implementation("org.apache.commons", "commons-lang3", "3.14.0")
-    implementation("commons-beanutils", "commons-beanutils", "1.9.4"){
+    implementation("commons-io", "commons-io", "2.18.0")
+    implementation("commons-beanutils", "commons-beanutils", "1.10.1"){
         exclude("commons-logging", "commons-logging")
     }
+    implementation("commons-codec", "commons-codec", "1.16.0")
+    implementation("org.apache.commons", "commons-lang3", "3.17.0")
     implementation("org.apache.commons", "commons-collections4", "4.4")
     implementation("org.apache.commons", "commons-exec", "1.4.0")
 
@@ -128,19 +120,15 @@ dependencies {
     // SARIF serialization
     implementation("com.contrastsecurity", "java-sarif", "2.0")
 
-    // Sentry
-    implementation("io.sentry:sentry-spring-boot-starter-jakarta")
-    implementation("io.sentry:sentry-logback")
-
     // CONSTRAINTS
     implementation("com.google.guava:guava") {
         version {
-            strictly("33.2.1-jre")
+            strictly("33.4.0-jre")
        }
     }
 
     // COMPILE
-    compileOnly("com.github.spotbugs:spotbugs-annotations:4.8.6")
+    compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.1")
 
     // TEST
 
@@ -151,15 +139,7 @@ dependencies {
 
     // test utils
     testImplementation("org.jmockit", "jmockit", "1.49")
-    testImplementation("org.awaitility", "awaitility", "4.2.1")
-}
-
-lombok {
-    version.set("1.18.32")
-}
-
-jacoco {
-    toolVersion = "0.8.10"
+    testImplementation("org.awaitility", "awaitility", "4.3.0")
 }
 
 java {
@@ -191,6 +171,11 @@ tasks.bootJar {
     archiveClassifier.set("exec")
 }
 
+tasks.named("sourcesJar") {
+    dependsOn(tasks.generateSentryDebugMetaPropertiesjava)
+    dependsOn(tasks.collectExternalDependenciesForSentry)
+}
+
 tasks.build {
     dependsOn(tasks.bootJar)
 }
@@ -215,13 +200,27 @@ tasks.check {
     mustRunAfter(tasks.generateDiagnosticDocs)
 }
 
+tasks.checkLicenseMain {
+    dependsOn(tasks.generateSentryDebugMetaPropertiesjava)
+    dependsOn(tasks.collectExternalDependenciesForSentry)
+}
+
+tasks.updateLicenseMain {
+    dependsOn(tasks.generateSentryDebugMetaPropertiesjava)
+    dependsOn(tasks.collectExternalDependenciesForSentry)
+}
+
 tasks.jacocoTestReport {
     reports {
         xml.required.set(true)
-        xml.outputLocation.set(File("$buildDir/reports/jacoco/test/jacoco.xml"))
+        xml.outputLocation.set(File("${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml"))
     }
 }
 
+jmh {
+    jmhVersion = "1.37"
+}
+
 tasks.processResources {
     filteringCharset = "UTF-8"
     // native2ascii gradle replacement
@@ -238,12 +237,12 @@ tasks.generateDiagnosticDocs {
     doLast {
         val resourcePath = tasks["processResources"].outputs.files.singleFile
         copy {
-            from("$buildDir/docs/diagnostics")
+            from("${layout.buildDirectory.get()}/docs/diagnostics")
             into("$resourcePath/com/github/_1c_syntax/bsl/languageserver/diagnostics/ru")
         }
 
         copy {
-            from("$buildDir/docs/en/diagnostics")
+            from("${layout.buildDirectory.get()}/docs/en/diagnostics")
             into("$resourcePath/com/github/_1c_syntax/bsl/languageserver/diagnostics/en")
         }
     }
@@ -285,7 +284,7 @@ sonarqube {
         property("sonar.projectKey", "1c-syntax_bsl-language-server")
         property("sonar.projectName", "BSL Language Server")
         property("sonar.exclusions", "**/gen/**/*.*")
-        property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacoco.xml")
+        property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
     }
 }