Merge branch 'release/v1.12.0'

1c-syntax · Jun 23, 2023 · 9618d4a · 9618d4a
2 parents 5c6d2b2 + 4c3565e
commit 9618d4a
Show file tree

Hide file tree

Showing 46 changed files with 1,612 additions and 379 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK ${{ matrix.java_version }}
-      uses: actions/setup-java@v3.3.0
+      uses: actions/setup-java@v3.11.0
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'

diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml
@@ -17,9 +17,9 @@ jobs:
         with:
           ref: nigth_build
       - name: Set up JDK
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.11.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Build with Gradle
         run: ./gradlew build
@@ -28,7 +28,7 @@ jobs:
       - name: Save current date
         run: echo "PLUGIN_CURRENT_DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
       - name: Deploy build
-        uses: WebFreak001/deploy-nightly@v1.1.0
+        uses: WebFreak001/deploy-nightly@v2.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -16,13 +16,13 @@ jobs:
         fetch-depth: ''
     - run: |
         git fetch --prune --unshallow
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3.3.0
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3.11.0
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'adopt'
     - name: SonarCloud Scan
-      run: ./gradlew check sonarqube
+      run: ./gradlew check sonar
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,9 +14,9 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Set up JDK
-      uses: actions/setup-java@v3.3.0
+      uses: actions/setup-java@v3.11.0
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'adopt'
     - name: Build with Gradle
       run: ./gradlew build

diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,5 @@ gen/
 /.idea/jarRepositories.xml
 /.idea/vcs.xml
 /.idea/compiler.xml
+/.idea/inspectionProfiles/Project_Default.xml
+/.idea/misc.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_sonar-bsl-plugin-community&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_sonar-bsl-plugin-community)
 
 [![Download](https://img.shields.io/github/release/1c-syntax/sonar-bsl-plugin-community.svg?label=download&style=flat)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/latest)
-[![Download night build](https://img.shields.io/github/workflow/status/1c-syntax/sonar-bsl-plugin-community/Night%20build/nigth_build?label=night%20build)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/v999.99.99)
+[![Download night build](https://img.shields.io/github/downloads/1c-syntax/sonar-bsl-plugin-community/v999.99.99/total?label=night%20build)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/v999.99.99)
 
 [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server)
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
     jacoco
     java
     `maven-publish`
-    id("org.sonarqube") version "3.3"
+    id("org.sonarqube") version "4.2.1.3168"
     id("org.cadixdev.licenser") version "0.6.1"
     id("com.github.johnrengelman.shadow") version("7.0.0")
-    id("com.github.ben-manes.versions") version "0.42.0"
+    id("com.github.ben-manes.versions") version "0.47.0"
     id("com.github.gradle-git-version-calculator") version "1.1.0"
-    id("io.freefair.lombok") version "6.4.3"
+    id("io.freefair.lombok") version "8.0.1"
 }
 
 group = "io.github.1c-syntax"
@@ -27,39 +27,55 @@ repositories {
     }
 }
 
-val commonmarkVersion = "0.17.0"
 val sonarQubeVersion = "8.9.0.43852"
 
 dependencies {
     implementation("org.sonarsource.sonarqube", "sonar-plugin-api", sonarQubeVersion)
 
-    implementation("io.github.1c-syntax", "bsl-language-server", "0.20.0")
+    // в jitpack лежат в группе com.github.1c-syntax, в централе - io.github.1c-syntax
+    implementation("io.github.1c-syntax", "bsl-language-server", "0.21.0") {
+        exclude("com.github.1c-syntax", "utils")
+    }
+    implementation("com.github.1c-syntax", "utils", "0.5.1")
 
     implementation("org.apache.commons:commons-lang3:3.12.0")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
 
     // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons
-    implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.25.0.1003")
+    implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.5.0.1358")
 
     // MD to HTML converter of BSL LS rule descriptions
-    implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion)
-    implementation("com.atlassian.commonmark", "commonmark-ext-gfm-tables", commonmarkVersion)
-    implementation("com.atlassian.commonmark", "commonmark-ext-autolink", commonmarkVersion)
-    implementation("com.atlassian.commonmark", "commonmark-ext-heading-anchor", commonmarkVersion)
+    implementation("org.commonmark", "commonmark", "0.21.0")
+    implementation("org.commonmark", "commonmark-ext-gfm-tables", "0.21.0")
+    implementation("org.commonmark", "commonmark-ext-autolink", "0.21.0")
+    implementation("org.commonmark", "commonmark-ext-heading-anchor", "0.21.0")
 
-    implementation("me.tongfei:progressbar:0.9.3")
+    implementation("me.tongfei:progressbar:0.9.5")
 
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
 
     testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0")
     testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0")
 
-    testImplementation("org.assertj:assertj-core:3.22.0")
-    testImplementation("org.mockito:mockito-core:4.5.1")
+    testImplementation("org.assertj:assertj-core:3.24.2")
+    testImplementation("org.mockito:mockito-core:5.4.0")
 
     testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion)
     testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion)
     testImplementation("org.reflections", "reflections", "0.9.12")
+
+    // CONSTRAINTS
+
+    implementation("org.slf4j:slf4j-api") {
+        version {
+            strictly("1.7.30")
+        }
+    }
+    implementation("com.google.guava:guava") {
+        version {
+            strictly("30.1-jre")
+        }
+    }
 }
 
 java {

diff --git a/docs/index.md b/docs/index.md
@@ -171,3 +171,7 @@ Cвойство `sonar.bsl.acc.accRulesPaths`. Правила из постав
 Cвойство `sonar.bsl.acc.createExternalIssues`. Определяет как поступить с ошибками, которые были в файле, но для них
 не было найдено активного правила. Для фильтрации ошибок поступающих от АПК на строне sonarqube потребуется отключить
 свойство.
+
+## Интеграция с 1C:EDT
+
+Стоит воспользоваться утилитой конвертации отчета EDT в формат понятный плагину [edt-ripper](https://github.com/bia-technologies/edt_ripper)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of SonarQube 1C (BSL) Community Plugin.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later