Skip to content

Commit d4d5551

Browse files
committed
Merge branch 'release/v1.13.0'
2 parents 9618d4a + 037acab commit d4d5551

File tree

8 files changed

+21
-23
lines changed

8 files changed

+21
-23
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: ['11', '17']
11+
java_version: ['17', '19']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
1414
- uses: actions/checkout@v3
1515
- name: Set up JDK ${{ matrix.java_version }}
16-
uses: actions/setup-java@v3.11.0
16+
uses: actions/setup-java@v3.12.0
1717
with:
1818
java-version: ${{ matrix.java_version }}
1919
distribution: 'adopt'

.github/workflows/night_build.yml

Lines changed: 1 addition & 1 deletion
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@v3.11.0
20+
uses: actions/setup-java@v3.12.0
2121
with:
2222
java-version: 17
2323
distribution: 'adopt'

.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@v3.11.0
20+
uses: actions/setup-java@v3.12.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@v3
1616
- name: Set up JDK
17-
uses: actions/setup-java@v3.11.0
17+
uses: actions/setup-java@v3.12.0
1818
with:
1919
java-version: 17
2020
distribution: 'adopt'

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: java
22

33
jdk:
4-
- openjdk11
4+
- openjdk17
55

66
addons:
77
sonarcloud: true

README.md

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

2121
Версия SonarQube | Версия плагина | Версия JAVA
2222
-----------------|----------------|------------------
23-
8.9+ | 1.11.0+ | 11
24-
7.9+ | 0.7.0...1.10.0 | 11
25-
7.4 - 7.8 | 0.1.0...0.6.0 | 8
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

build.gradle.kts

Lines changed: 9 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 "4.2.1.3168"
8+
id("org.sonarqube") version "4.3.0.3225"
99
id("org.cadixdev.licenser") version "0.6.1"
1010
id("com.github.johnrengelman.shadow") version("7.0.0")
1111
id("com.github.ben-manes.versions") version "0.47.0"
1212
id("com.github.gradle-git-version-calculator") version "1.1.0"
13-
id("io.freefair.lombok") version "8.0.1"
13+
id("io.freefair.lombok") version "8.1.0"
1414
}
1515

1616
group = "io.github.1c-syntax"
@@ -27,18 +27,18 @@ repositories {
2727
}
2828
}
2929

30-
val sonarQubeVersion = "8.9.0.43852"
30+
val sonarQubeVersion = "9.9.0.65466"
3131

3232
dependencies {
33-
implementation("org.sonarsource.sonarqube", "sonar-plugin-api", sonarQubeVersion)
33+
implementation("org.sonarsource.api.plugin", "sonar-plugin-api", "9.14.0.375")
3434

3535
// в jitpack лежат в группе com.github.1c-syntax, в централе - io.github.1c-syntax
36-
implementation("io.github.1c-syntax", "bsl-language-server", "0.21.0") {
36+
implementation("io.github.1c-syntax", "bsl-language-server", "0.22.0") {
3737
exclude("com.github.1c-syntax", "utils")
3838
}
3939
implementation("com.github.1c-syntax", "utils", "0.5.1")
4040

41-
implementation("org.apache.commons:commons-lang3:3.12.0")
41+
implementation("org.apache.commons:commons-lang3:3.13.0")
4242
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
4343

4444
// https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons
@@ -66,21 +66,16 @@ dependencies {
6666

6767
// CONSTRAINTS
6868

69-
implementation("org.slf4j:slf4j-api") {
70-
version {
71-
strictly("1.7.30")
72-
}
73-
}
7469
implementation("com.google.guava:guava") {
7570
version {
76-
strictly("30.1-jre")
71+
strictly("32.0.1-jre")
7772
}
7873
}
7974
}
8075

8176
java {
82-
sourceCompatibility = JavaVersion.VERSION_11
83-
targetCompatibility = JavaVersion.VERSION_11
77+
sourceCompatibility = JavaVersion.VERSION_17
78+
targetCompatibility = JavaVersion.VERSION_17
8479
}
8580

8681
tasks.withType<JavaCompile> {

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
org.gradle.parallel=true
2+
org.gradle.jvmargs=-Xmx1024m -XX:MaxMetaspaceSize=512m

0 commit comments

Comments
 (0)