Finish 0.31.0

Author: theshadowco

.github/workflows/check.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '21']
+        java_version: ['21', '25']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v6

.github/workflows/gh-pages.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Setup JDK
       uses: actions/setup-java@v5
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
 
     - name: Build javadoc

.github/workflows/javadoc.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
     - name: Check javadoc build
       run: ./gradlew javadoc --stacktrace

.github/workflows/publish-to-maven-central.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Deploy to Central Portal

.github/workflows/qa.yml

@@ -18,10 +18,10 @@ jobs:
           persist-credentials: false
       - run: |
           git fetch --prune --unshallow
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: SonarCloud Scan
         run: ./gradlew check sonar

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
             persist-credentials: false
         - uses: actions/setup-java@v5
           with:
-            java-version: 17
+            java-version: 21
             distribution: 'adopt'
         - run: ./gradlew check --stacktrace
         - if: matrix.os == 'ubuntu-latest'

.github/workflows/update-gradle.yaml

@@ -16,10 +16,10 @@ jobs:
           fetch-tags: true
           persist-credentials: false
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
 

.gitignore

@@ -71,3 +71,4 @@ gen/
 *.tokens
 /.idea/inspectionProfiles/Project_Default.xml
 /.idea/material_theme_project_new.xml
+/.idea/compiler.xml

.idea/compiler.xml

@@ -1,23 +1,23 @@
-import java.util.Calendar
 import org.jreleaser.model.Active.*
+import java.util.*
 
 plugins {
     `java-library`
     `maven-publish`
     jacoco
     idea
     antlr
-    id("org.cadixdev.licenser") version "0.6.1"
+    id("cloud.rio.license") version "0.18.0"
     id("me.qoomon.git-versioning") version "6.4.4"
     id("io.freefair.javadoc-links") version "9.2.0"
     id("io.freefair.javadoc-utf-8") version "9.2.0"
     id("io.freefair.lombok") version "9.2.0"
-    id("io.freefair.maven-central.validate-poms") version "9.2.0"
+//    id("io.freefair.maven-central.validate-poms") version "9.2.0"
     id("com.github.ben-manes.versions") version "0.53.0"
     id("ru.vyarus.pom") version "3.0.0"
     id("org.jreleaser") version "1.21.0"
     id("org.sonarqube") version "7.2.2.6593"
-    id("me.champeau.gradle.jmh") version "0.5.3"
+    id("me.champeau.jmh") version "0.7.3"
 }
 
 repositories {
@@ -50,23 +50,26 @@ gitVersioning.apply {
 }
 
 dependencies {
-    antlr("io.github.1c-syntax", "antlr4", "0.2.0")
-
-    // stat analysis
-    compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6")
+    antlr("io.github.1c-syntax:antlr4:0.3.0")
 
     // testing
-    testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.4.0")
+    testImplementation("io.github.1c-syntax:bsl-parser-testing:0.5.0") {
+        exclude("org.antlr:antlr-runtime")
+        exclude("org.antlr:ST4")
+    }
+
+    testImplementation(platform("org.junit:junit-bom:6.0.3"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.assertj:assertj-core:3.27.7")
 
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
-    testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
-    testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.11.4")
-    testImplementation("org.assertj", "assertj-core", "3.27.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     withSourcesJar()
     withJavadocJar()
 }
@@ -118,7 +121,7 @@ idea {
 
 jmh {
     jvmArgsAppend = listOf("-XX:+UseParallelGC")
-    isIncludeTests = true
+    includeTests.set(true)
     duplicateClassesStrategy = DuplicatesStrategy.WARN
     timeUnit = "s"
 }
@@ -134,12 +137,12 @@ tasks.generateGrammarSource {
     outputDirectory = file("src/main/gen/com/github/_1c_syntax/bsl/parser")
 }
 
-tasks.updateLicenseMain {
+tasks.licenseFormatMain {
     mustRunAfter(tasks.generateGrammarSource)
 }
 
-tasks.checkLicenseMain {
-    dependsOn(tasks.updateLicenseMain)
+tasks.licenseMain {
+    dependsOn(tasks.licenseFormatMain)
 }
 
 tasks.test {
@@ -173,18 +176,16 @@ tasks.javadoc {
 }
 
 license {
-    header(rootProject.file("license/HEADER.txt"))
-    newLine(false)
+    header = rootProject.file("license/HEADER.txt")
+    skipExistingHeaders = false
+    strictCheck = true
+    mapping("java", "SLASHSTAR_STYLE")
     ext["year"] = "2018-" + Calendar.getInstance().get(Calendar.YEAR)
     ext["name"] =
-        "Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, Sergey Batanov <sergey.batanov@dmpas.ru>"
+        "Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, " +
+                "Sergey Batanov <sergey.batanov@dmpas.ru>"
     ext["project"] = "BSL Parser"
-    exclude("**/*.tokens")
-    exclude("**/*.interp")
-    exclude("**/*.g4")
-    exclude("**/*.bsl")
-    exclude("**/*.orig")
-    exclude("**/*.gitkeep")
+    include("**/*.java")
 }
 
 tasks.clean {
@@ -201,7 +202,10 @@ sonar {
         property("sonar.projectKey", "1c-syntax_bsl-parser")
         property("sonar.projectName", "BSL Parser")
         property("sonar.scm.exclusions.disabled", "true")
-        property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
+        property(
+            "sonar.coverage.jacoco.xmlReportPaths",
+            "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml"
+        )
     }
 }