Обновление зависимостей и JDK21 (#359)

theshadowco · web-flow · commit 820295126a97 · 2026-02-23T09:37:18.000+03:00
* обновление зависимостей

* jdk 21
minor fixes

* deps

* GA
diff --git a/.github/workflows/check.yml b/.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
diff --git a/.github/workflows/gh-pages.yml b/.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
diff --git a/.github/workflows/javadoc.yml b/.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
diff --git a/.github/workflows/publish-to-maven-central.yml b/.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
diff --git a/.github/workflows/qa.yml b/.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
diff --git a/.github/workflows/release.yml b/.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'
diff --git a/.github/workflows/update-gradle.yaml b/.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
 
diff --git a/.gitignore b/.gitignore
@@ -71,3 +71,4 @@ gen/
 *.tokens
 /.idea/inspectionProfiles/Project_Default.xml
 /.idea/material_theme_project_new.xml
+/.idea/compiler.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
-import java.util.Calendar
 import org.jreleaser.model.Active.*
+import java.util.*
 
 plugins {
     `java-library`
@@ -50,25 +50,26 @@ gitVersioning.apply {
 }
 
 dependencies {
-    antlr("io.github.1c-syntax", "antlr4", "0.3.0-rc.2") {
+    antlr("io.github.1c-syntax:antlr4:0.3.0")
+
+    // testing
+    testImplementation("io.github.1c-syntax:bsl-parser-testing:0.5.0") {
         exclude("org.antlr:antlr-runtime")
         exclude("org.antlr:ST4")
     }
 
-    // testing
-    testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.5.0-rc.1")
-
-    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")
+    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")
 
+    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()
 }
@@ -201,8 +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"
+        )
     }
 }
 
diff --git a/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLLexerTest.java b/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLLexerTest.java
@@ -25,8 +25,8 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.UnicodeCharStream;
-import org.apache.commons.io.IOUtils;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Tokenizer;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Measurement;
@@ -40,7 +40,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.StandardCharsets;
 
 @BenchmarkMode(Mode.SampleTime)
 @Warmup(iterations = 2) // число итераций для прогрева нашей функции
@@ -67,7 +66,7 @@ public JMXBSLLexerTest() {
     final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
     try (InputStream inputStream = classLoader.getResourceAsStream("Module.bsl")) {
       assert inputStream != null;
-      content = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+//      content = IOUtils.toString(inputStream.toString(), StandardCharsets.UTF_8);
     } catch (IOException e) {
       e.printStackTrace();
     }
@@ -87,9 +86,9 @@ public void lexerTest()
     var tokenizer = new Tokenizer<>(content, lexer, parserClass) {
 
       @Override
-      protected BSLParserRuleContext rootAST() {
+      protected ParserRuleContext rootAST() {
         try {
-          return (BSLParserRuleContext) parserRootASTMethod.invoke(parser);
+          return (ParserRuleContext) parserRootASTMethod.invoke(parser);
         } catch (IllegalAccessException | InvocationTargetException e) {
           throw new RuntimeException("Error: ", e);
         }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/ParameterDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/ParameterDescription.java
@@ -54,7 +54,7 @@ public ParameterDescription(String name, DescriptionElement element, List<TypeDe
    */
   public boolean isHyperlink() {
     return types.size() == 1
-      && types.get(0).variant() == TypeDescription.Variant.HYPERLINK;
+      && types.getFirst().variant() == TypeDescription.Variant.HYPERLINK;
   }
 
   /**
@@ -63,7 +63,7 @@ public boolean isHyperlink() {
    * @return Содержимое гиперссылки
    */
   public Hyperlink link() {
-    return (isHyperlink()) ? ((HyperlinkTypeDescription) types.get(0)).hyperlink() : Hyperlink.EMPTY;
+    return (isHyperlink()) ? ((HyperlinkTypeDescription) types.getFirst()).hyperlink() : Hyperlink.EMPTY;
   }
 
   /**
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/reader/MethodDescriptionReader.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/reader/MethodDescriptionReader.java
@@ -235,7 +235,7 @@ public ParseTree visitTypeDescription(BSLDescriptionParser.TypeDescriptionContex
     }
 
     if (!ctx.hyperlink().isEmpty()) { // считаем первой ссылкой
-      var link = ctx.hyperlink().get(0);
+      var link = ctx.hyperlink().getFirst();
       lastReadParam = TempParameterData.create(link.link);
       lastReadParam.addType(link, ctx);
       return ctx;
@@ -369,7 +369,7 @@ private static TempParameterData create(BSLDescriptionParser.FieldContext fieldC
 
     private Optional<TempParameterTypeData> lastType() {
       if (!types.isEmpty()) {
-        return Optional.of(types.get(types.size() - 1));
+        return Optional.of(types.getLast());
       }
       return Optional.empty();
     }
@@ -550,7 +550,7 @@ private void addTypeDescription(String textDescription) {
 
     private Optional<TempParameterData> lastField() {
       if (!fields.isEmpty()) {
-        return Optional.of(fields.get(fields.size() - 1));
+        return Optional.of(fields.getLast());
       }
       return Optional.empty();
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/Hyperlink.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/Hyperlink.java
@@ -93,10 +93,10 @@ public static Hyperlink create(@Nullable String link, @Nullable String params, S
   public boolean equals(@Nullable Object other) {
     if (this == other) {
       return true;
-    } else if (!(other instanceof Hyperlink otherLink)) {
+    } else if (!(other instanceof Hyperlink(String linkOther, String paramsOther, SimpleRange rangeOther))) {
       return false;
     } else {
-      return link.equals(otherLink.link) && params.equals(otherLink.params) && range.equals(otherLink.range);
+      return link.equals(linkOther) && params.equals(paramsOther) && range.equals(rangeOther);
     }
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRange.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRange.java
@@ -121,8 +121,8 @@ public static SimpleRange create(List<Token> tokens) {
     if (tokens.isEmpty()) {
       return EMPTY;
     }
-    var firstElement = tokens.get(0);
-    var lastElement = tokens.get(tokens.size() - 1);
+    var firstElement = tokens.getFirst();
+    var lastElement = tokens.getLast();
 
     return create(firstElement, lastElement);
   }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserMatchesTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserMatchesTest.java
@@ -200,36 +200,40 @@ void TestPreprocessor() {
 
   @Test
   void testPreprocInsertBreakCondition() {
-    testParser.assertThat("If true or false\n" +
-      "    #If Server Then\n" +
-      "        Or true\n" +
-      "    #EndIf\n" +
-      "    Then\n" +
-      "EndIf;").matches(testParser.parser().ifBranch());
-
-    testParser.assertThat("while (true \n" +
-      "    #If Server Then\n" +
-      "        Or true\n" +
-      "    #EndIf\n" +
-      "    ) do\n" +
-      "enddo;").matches(testParser.parser().whileStatement());
-
-    testParser.assertThat("a = false \n" +
-      "    #If Server Then\n" +
-      "        Or true\n" +
-      "    #else\n" +
-      "        Or false\n" +
-      "    #EndIf\n" +
-      "    and true;").matches(testParser.parser().statement());
+    testParser.assertThat("""
+      If true or false
+          #If Server Then
+              Or true
+          #EndIf
+          Then
+      EndIf;""").matches(testParser.parser().ifBranch());
+
+    testParser.assertThat("""
+      while (true\s
+          #If Server Then
+              Or true
+          #EndIf
+          ) do
+      enddo;""").matches(testParser.parser().whileStatement());
+
+    testParser.assertThat("""
+      a = false\s
+          #If Server Then
+              Or true
+          #else
+              Or false
+          #EndIf
+          and true;""").matches(testParser.parser().statement());
   }
 
   @Test
   void testPreprocBreakString() {
-    testParser.assertThat("\"выбрать\n" +
-      "#Удаление\n" +
-      "|часть строки\n" +
-      "#КонецУдаления\n" +
-      "|конец строки\"").matches(testParser.parser().multilineString());
+    testParser.assertThat("""
+      "выбрать
+      #Удаление
+      |часть строки
+      #КонецУдаления
+      |конец строки\"""").matches(testParser.parser().multilineString());
   }
 
   @ParameterizedTest
@@ -417,13 +421,15 @@ void testExpression() {
 
   @Test
   void tesForEach() {
-    testParser.assertThat("Для каждого Переменная Из Коллекция Цикл\n" +
-      "\t\n" +
-      "КонецЦикла;").matches(testParser.parser().forEachStatement());
+    testParser.assertThat("""
+      Для каждого Переменная Из Коллекция Цикл
+      \t
+      КонецЦикла;""").matches(testParser.parser().forEachStatement());
 
-    testParser.assertThat("For Each varible In collection Do\n" +
-      "\n" +
-      "EndDo;").matches(testParser.parser().forEachStatement());
+    testParser.assertThat("""
+      For Each varible In collection Do
+      
+      EndDo;""").matches(testParser.parser().forEachStatement());
   }
 
   @Test
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserWithChildrenTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserWithChildrenTest.java
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizerTest.java
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/description/BSLDescriptionReaderTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/description/BSLDescriptionReaderTest.java
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/description/reader/MethodDescriptionReaderHyperlinkTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/description/reader/MethodDescriptionReaderHyperlinkTest.java
