Skip to content

Commit 35a8e22

Browse files
committed
Finish v1.17.1
2 parents 9a995ba + c565077 commit 35a8e22

40 files changed

+86
-85
lines changed

build.gradle.kts

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import java.net.URI
21
import java.util.*
32

43
plugins {
54
jacoco
65
java
76
`maven-publish`
8-
id("org.sonarqube") version "7.2.1.6560"
9-
id("org.cadixdev.licenser") version "0.6.1"
10-
id("com.github.johnrengelman.shadow") version ("7.0.0")
7+
id("org.sonarqube") version "7.2.2.6593"
8+
id("cloud.rio.license") version "0.18.0"
9+
id("com.gradleup.shadow") version "9.3.1"
1110
id("com.github.ben-manes.versions") version "0.53.0"
1211
id("com.github.gradle-git-version-calculator") version "1.1.0"
13-
id("io.freefair.lombok") version "9.1.0"
12+
id("io.freefair.lombok") version "9.2.0"
1413
}
1514

1615
group = "io.github.1c-syntax"
@@ -19,22 +18,20 @@ version = gitVersionCalculator.calculateVersion("v")
1918
repositories {
2019
mavenLocal()
2120
mavenCentral()
22-
maven {
23-
url = URI("https://s01.oss.sonatype.org/content/repositories/snapshots")
24-
}
21+
maven("https://central.sonatype.com/repository/maven-snapshots")
2522
}
2623

2724
val sonarQubeVersion = "9.9.0.65466"
2825

2926
dependencies {
30-
implementation("org.sonarsource.api.plugin", "sonar-plugin-api", "9.14.0.375")
27+
compileOnly("org.sonarsource.api.plugin", "sonar-plugin-api", "9.14.0.375")
3128

32-
implementation("io.github.1c-syntax", "bsl-language-server", "0.25.0") {
29+
implementation("io.github.1c-syntax", "bsl-language-server", "0.28.4") {
3330
exclude("com.contrastsecurity", "java-sarif")
3431
exclude("io.sentry", "sentry-logback")
35-
exclude("org.springframework.boot", "spring-boot-starter-websocket")
32+
exclude("info.picocli", "picocli-spring-boot-starter")
33+
exclude("me.tongfei", "progressbar")
3634
}
37-
3835
implementation("org.sonarsource.analyzer-commons", "sonar-analyzer-commons", "2.5.0.1358")
3936

4037
// MD to HTML converter of BSL LS rule descriptions
@@ -51,6 +48,7 @@ dependencies {
5148
testImplementation("org.reflections", "reflections", "0.10.2")
5249

5350
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
51+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4")
5452
}
5553

5654
java {
@@ -87,14 +85,14 @@ tasks.jacocoTestReport {
8785
}
8886

8987
license {
90-
header(rootProject.file("license/HEADER.txt"))
91-
newLine(false)
88+
header = rootProject.file("license/HEADER.txt")
89+
skipExistingHeaders = false
90+
strictCheck = true
91+
mapping("java", "SLASHSTAR_STYLE")
9292
ext["year"] = Calendar.getInstance().get(Calendar.YEAR)
9393
ext["name"] = "Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>"
9494
ext["project"] = "SonarQube 1C (BSL) Community Plugin"
95-
exclude("**/*.properties")
96-
exclude("**/*.bsl")
97-
exclude("**/*.json")
95+
include("**/*.java")
9896
}
9997

10098
sonarqube {
@@ -105,8 +103,10 @@ sonarqube {
105103
property("sonar.projectKey", "1c-syntax_sonar-bsl-plugin-community")
106104
property("sonar.projectName", "SonarQube 1C (BSL) Community Plugin")
107105
property("sonar.exclusions", "**/gen/**/*.*")
108-
property("sonar.coverage.jacoco.xmlReportPaths",
109-
"${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
106+
property(
107+
"sonar.coverage.jacoco.xmlReportPaths",
108+
"${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml"
109+
)
110110
}
111111
}
112112

@@ -138,6 +138,7 @@ tasks.jar {
138138
}
139139

140140
tasks.shadowJar {
141+
mergeServiceFiles() // Критично для плагинов Sonar
141142
configurations = listOf(project.configurations["runtimeClasspath"])
142143
archiveClassifier.set("")
143144
}

gradle/wrapper/gradle-wrapper.jar

2.35 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

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

gradlew.bat

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

src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of SonarQube 1C (BSL) Community Plugin.
33
*
4-
* Copyright (c) 2018-2025
4+
* Copyright (c) 2018-2026
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of SonarQube 1C (BSL) Community Plugin.
33
*
4-
* Copyright (c) 2018-2025
4+
* Copyright (c) 2018-2026
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later
@@ -33,8 +33,6 @@
3333
import com.github._1c_syntax.bsl.sonar.language.BSLLanguage;
3434
import com.github._1c_syntax.bsl.sonar.language.BSLLanguageServerRuleDefinition;
3535
import com.github._1c_syntax.utils.Absolute;
36-
import me.tongfei.progressbar.ProgressBarBuilder;
37-
import me.tongfei.progressbar.ProgressBarStyle;
3836
import org.antlr.v4.runtime.Token;
3937
import org.apache.commons.lang3.StringUtils;
4038
import org.eclipse.lsp4j.Diagnostic;
@@ -160,19 +158,20 @@ public void execute(SensorContext context) {
160158
bslServerContext.setConfigurationRoot(configurationRoot);
161159
bslServerContext.populateContext();
162160

163-
try (var pb = new ProgressBarBuilder()
164-
.setTaskName("")
165-
.setInitialMax(inputFilesList.size())
166-
.setStyle(ProgressBarStyle.ASCII)
167-
.build()) {
168-
inputFilesList.parallelStream().forEach((InputFile inputFile) -> {
169-
var uri = inputFile.uri();
170-
LOGGER.debug(uri.toString());
171-
pb.step();
172-
173-
processFile(inputFile, bslServerContext);
174-
});
175-
}
161+
int total = inputFilesList.size();
162+
final int[] count = {0};
163+
164+
inputFilesList.parallelStream().forEach((InputFile inputFile) -> {
165+
var uri = inputFile.uri();
166+
LOGGER.debug(uri.toString());
167+
processFile(inputFile, bslServerContext);
168+
count[0]++;
169+
if (count[0] % 100 == 0) {
170+
LOGGER.info("Processing files: {}/{}", count[0], total);
171+
}
172+
});
173+
174+
LOGGER.info("Processing files: {}/{}", count[0], total);
176175

177176
bslServerContext.clear();
178177
});

src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of SonarQube 1C (BSL) Community Plugin.
33
*
4-
* Copyright (c) 2018-2025
4+
* Copyright (c) 2018-2026
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/sonar/BSLPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of SonarQube 1C (BSL) Community Plugin.
33
*
4-
* Copyright (c) 2018-2025
4+
* Copyright (c) 2018-2026
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of SonarQube 1C (BSL) Community Plugin.
33
*
4-
* Copyright (c) 2018-2025
4+
* Copyright (c) 2018-2026
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

0 commit comments

Comments
 (0)