Merge branch 'release/v0.23.0'

.github/workflows/check.yml

@@ -8,20 +8,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '17']
+        java_version: ['17', '20']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java_version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Build with Gradle
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test

.github/workflows/gh-pages.yml

@@ -17,10 +17,10 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'adopt'
@@ -29,7 +29,7 @@ jobs:
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.6'
         architecture: 'x64'

.github/workflows/javadoc.yml

@@ -6,11 +6,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'adopt'
     - name: Check javadoc build
       run: ./gradlew javadoc --stacktrace

.github/workflows/qa.yml

@@ -12,18 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: ''
       - run: |
           git fetch --prune --unshallow
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         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 }}

.github/workflows/release.yml

@@ -12,16 +12,16 @@ jobs:
         matrix:
           os: [ ubuntu-latest, windows-latest, macOS-latest ]
       steps:
-        - uses: actions/checkout@v3
-        - uses: actions/setup-java@v3
+        - uses: actions/checkout@v4
+        - uses: actions/setup-java@v4
           with:
-            java-version: 11
+            java-version: 17
             distribution: 'adopt'
         - run: ./gradlew check --stacktrace
         - if: matrix.os == 'ubuntu-latest'
           run: ./gradlew build
         - if: matrix.os == 'ubuntu-latest'
-          uses: AButler/upload-release-assets@v2.0
+          uses: AButler/upload-release-assets@v3.0
           with:
             files: './build/libs/*.jar'
             repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -6,12 +6,12 @@ plugins {
     jacoco
     `java-library`
     antlr
-    id("org.sonarqube") version "4.3.0.3225"
+    id("org.sonarqube") version "4.4.1.3373"
     id("org.cadixdev.licenser") version "0.6.1"
     id("com.github.gradle-git-version-calculator") version "1.1.0"
-    id("io.freefair.javadoc-links") version "6.5.1"
-    id("io.freefair.javadoc-utf-8") version "6.6.1"
-    id("com.github.ben-manes.versions") version "0.47.0"
+    id("io.freefair.javadoc-links") version "8.4"
+    id("io.freefair.javadoc-utf-8") version "8.4"
+    id("com.github.ben-manes.versions") version "0.50.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
 }
 
@@ -32,7 +32,7 @@ dependencies {
     implementation(antlrGroupId, antlrArtifactId, antlrVersion)
     antlr(antlrGroupId, antlrArtifactId, antlrVersion)
 
-    implementation("com.github.1c-syntax", "utils", "0.3.4")
+    implementation("com.github.1c-syntax", "utils", "0.5.1")
 
     testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.1")
     testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.6.1")
@@ -46,8 +46,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withSourcesJar()
     withJavadocJar()
 }
@@ -106,10 +106,12 @@ tasks.generateGrammarSource {
     outputDirectory = file("src/main/gen/com/github/_1c_syntax/bsl/parser")
 }
 
-tasks.generateGrammarSource {
-    doLast {
-        tasks.updateLicenseMain.get().actions[0].execute(tasks.updateLicenseMain.get())
-    }
+tasks.updateLicenseMain {
+    mustRunAfter(tasks.generateGrammarSource)
+}
+
+tasks.checkLicenseMain {
+    dependsOn(tasks.updateLicenseMain)
 }
 
 tasks.test {
@@ -163,7 +165,7 @@ tasks.clean {
     }
 }
 
-sonarqube {
+sonar {
     properties {
         property("sonar.sourceEncoding", "UTF-8")
         property("sonar.host.url", "https://sonarcloud.io")

gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx1024m -XX:MaxMetaspaceSize=512m

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.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists