Skip to content

Commit 677b64c

Browse files
committed
Release v1.15.2
Add support sq 25.1
2 parents 5f50a77 + 6f3aa92 commit 677b64c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+186
-249
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
java_version: ['17', '19']
11+
java_version: ['17', '21']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Set up JDK ${{ matrix.java_version }}
16-
uses: actions/setup-java@v4.2.1
16+
uses: actions/setup-java@v4.6.0
1717
with:
1818
java-version: ${{ matrix.java_version }}
1919
distribution: 'adopt'

.github/workflows/night_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
ref: nigth_build
1919
- name: Set up JDK
20-
uses: actions/setup-java@v4.2.1
20+
uses: actions/setup-java@v4.6.0
2121
with:
2222
java-version: 17
2323
distribution: 'adopt'
@@ -28,7 +28,7 @@ jobs:
2828
- name: Save current date
2929
run: echo "PLUGIN_CURRENT_DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
3030
- name: Deploy build
31-
uses: WebFreak001/deploy-nightly@v3.1.0
31+
uses: WebFreak001/deploy-nightly@v3.2.0
3232
with:
3333
upload_url: https://uploads.github.com/repos/1c-syntax/sonar-bsl-plugin-community/releases/51033599/assets{?name,label} # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
3434
release_id: 51033599 # same as above (id can just be taken out the upload_url, it's used to find old releases)

.github/workflows/qa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- run: |
1818
git fetch --prune --unshallow
1919
- name: Set up JDK 17
20-
uses: actions/setup-java@v4.2.1
20+
uses: actions/setup-java@v4.6.0
2121
with:
2222
java-version: 17
2323
distribution: 'adopt'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout source
1515
uses: actions/checkout@v4
1616
- name: Set up JDK
17-
uses: actions/setup-java@v4.2.1
17+
uses: actions/setup-java@v4.6.0
1818
with:
1919
java-version: 17
2020
distribution: 'adopt'

.gitignore

Lines changed: 10 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,22 @@
55
.idea/**/workspace.xml
66
.idea/**/tasks.xml
77
.idea/**/usage.statistics.xml
8-
.idea/**/dictionaries
9-
.idea/**/shelf
10-
11-
# Generated files
12-
.idea/**/contentModel.xml
13-
14-
# Sensitive or high-churn files
15-
.idea/**/dataSources/
16-
.idea/**/dataSources.ids
17-
.idea/**/dataSources.local.xml
18-
.idea/**/sqlDataSources.xml
19-
.idea/**/dynamic.xml
20-
.idea/**/uiDesigner.xml
21-
.idea/**/dbnavigator.xml
8+
.idea/inspectionProfiles/Project_Default.xml
9+
.idea/material_theme_project_new.xml
10+
.idea/jarRepositories.xml
11+
.idea/misc.xml
12+
.idea/vcs.xml
13+
.idea/sonarlint/
14+
.idea/sonarlint*.xml
2215

2316
# Gradle
17+
.gradle/
2418
.idea/**/gradle.xml
2519
.idea/**/libraries
26-
20+
2721
# Gradle and Maven with auto-import
28-
# When using Gradle or Maven with auto-import, you should exclude module files,
29-
# since they will be recreated, and may cause churn. Uncomment if using
30-
# auto-import.
3122
.idea/modules.xml
3223
.idea/*.iml
3324
.idea/modules
34-
35-
# IntelliJ
36-
out/
37-
38-
# Crashlytics plugin (for Android Studio and IntelliJ)
39-
com_crashlytics_export_strings.xml
40-
crashlytics.properties
41-
crashlytics-build.properties
42-
fabric.properties
43-
44-
# Editor-based Rest Client
45-
.idea/httpRequests
46-
47-
.gradle/
48-
*.zip
49-
*.ps1
50-
target/
25+
.idea/compiler.xml
5126
build/
52-
53-
# Scala compiler user settings
54-
.idea/hydra.xml
55-
56-
.idea/sonarlint/
57-
58-
intellij-bsl/src/test/resources/parser/.idea/
59-
60-
gen/
61-
62-
# Crashlytics plugin (for Android Studio and IntelliJ)
63-
64-
\.idea/sonarlint-state\.xml
65-
66-
\.idea/sonarlint\.xml
67-
/.idea/jarRepositories.xml
68-
/.idea/vcs.xml
69-
/.idea/compiler.xml
70-
/.idea/inspectionProfiles/Project_Default.xml
71-
/.idea/misc.xml
72-
/.idea/material_theme_project_new.xml

.idea/encodings.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ English version -> https://1c-syntax.github.io/sonar-bsl-plugin-community/en/
1818

1919
## Матрица соответствия версий
2020

21-
Версия SonarQube | Версия плагина | Версия JAVA
22-
-----------------|----------------|------------------
23-
9.9+ | 1.13.0+ | 17
24-
8.9+ | 1.11.0...1.12.0| 11
25-
7.9+ | 0.7.0....1.10.0| 11
26-
7.4 - 7.8 | 0.1.0....0.6.0 | 8
21+
| Версия SonarQube | Версия плагина | Версия JAVA |
22+
|------------------|-----------------|-------------|
23+
| 25.1+ | 1.15.2+ | 17 |
24+
| 9.9+ | 1.13.0+ | 17 |
25+
| 8.9+ | 1.11.0...1.12.0 | 11 |
26+
| 7.9+ | 0.7.0....1.10.0 | 11 |
27+
| 7.4 - 7.8 | 0.1.0....0.6.0 | 8 |

build.gradle.kts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
jacoco
66
java
77
`maven-publish`
8-
id("org.sonarqube") version "5.1.0.4882"
8+
id("org.sonarqube") version "6.0.1.5171"
99
id("org.cadixdev.licenser") version "0.6.1"
1010
id("com.github.johnrengelman.shadow") version ("7.0.0")
11-
id("com.github.ben-manes.versions") version "0.51.0"
11+
id("com.github.ben-manes.versions") version "0.52.0"
1212
id("com.github.gradle-git-version-calculator") version "1.1.0"
13-
id("io.freefair.lombok") version "8.6"
13+
id("io.freefair.lombok") version "8.12"
1414
}
1515

1616
group = "io.github.1c-syntax"
@@ -41,19 +41,19 @@ dependencies {
4141
implementation("org.sonarsource.analyzer-commons", "sonar-analyzer-commons", "2.5.0.1358")
4242

4343
// MD to HTML converter of BSL LS rule descriptions
44-
implementation("org.commonmark", "commonmark", "0.21.0")
45-
implementation("org.commonmark", "commonmark-ext-gfm-tables", "0.21.0")
46-
implementation("org.commonmark", "commonmark-ext-autolink", "0.21.0")
47-
implementation("org.commonmark", "commonmark-ext-heading-anchor", "0.21.0")
48-
49-
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0")
50-
testImplementation("org.assertj", "assertj-core", "3.25.1")
51-
testImplementation("org.mockito", "mockito-core", "5.8.0")
44+
implementation("org.commonmark", "commonmark", "0.24.0")
45+
implementation("org.commonmark", "commonmark-ext-gfm-tables", "0.24.0")
46+
implementation("org.commonmark", "commonmark-ext-autolink", "0.24.0")
47+
implementation("org.commonmark", "commonmark-ext-heading-anchor", "0.24.0")
48+
49+
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
50+
testImplementation("org.assertj", "assertj-core", "3.27.0")
51+
testImplementation("org.mockito", "mockito-core", "5.14.2")
5252
testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion)
5353
testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion)
54-
testImplementation("org.reflections", "reflections", "0.9.12")
54+
testImplementation("org.reflections", "reflections", "0.10.2")
5555

56-
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0")
56+
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
5757
}
5858

5959
java {
@@ -108,7 +108,8 @@ sonarqube {
108108
property("sonar.projectKey", "1c-syntax_sonar-bsl-plugin-community")
109109
property("sonar.projectName", "SonarQube 1C (BSL) Community Plugin")
110110
property("sonar.exclusions", "**/gen/**/*.*")
111-
property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacoco.xml")
111+
property("sonar.coverage.jacoco.xmlReportPaths",
112+
"$buildDir/reports/jacoco/test/jacoco.xml")
112113
}
113114
}
114115

docs/en/index.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828

2929
## Version matrix
3030

31-
SonarQube Version | Plugin Version | JAVA version
32-
------------------|----------------|------------------
33-
9.9+ | 1.13.0+ | 17
34-
8.9+ | 1.11.0...1.12.0| 11
35-
7.9+ | 0.7.0...1.10.0 | 11
36-
7.4 - 7.8 | 0.1.0...0.6.0 | 8
31+
| SonarQube Version | Plugin Version | JAVA version |
32+
|-------------------|-----------------|--------------|
33+
| 25.1+ | 1.15.2+ | 17 |
34+
| 9.9+ | 1.13.0+ | 17 |
35+
| 8.9+ | 1.11.0...1.12.0 | 11 |
36+
| 7.9+ | 0.7.0...1.10.0 | 11 |
37+
| 7.4 - 7.8 | 0.1.0...0.6.0 | 8 |
3738

3839
## Run analysis
3940

@@ -74,7 +75,7 @@ If the SonarQube server has enabled the requirement of forced authorization and/
7475
### For example
7576

7677
```sh
77-
sonar-scanner -Dsonar.host.url=http://sonar.company.com -Dsonar.login=SONAR_AUTH_TOKEN
78+
sonar-scanner -Dsonar.host.url=https://sonar.company.com -Dsonar.login=SONAR_AUTH_TOKEN
7879
```
7980

8081
## Plugin settings

0 commit comments

Comments
 (0)