обновление копирайта и зависимостей (#62)

theshadowco · web-flow · commit 266974292f4f · 2026-02-12T20:57:09.000+03:00
* обновление копирайта и зависимостей

* fixes

* sq fixes
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,17 +6,16 @@ plugins {
     `maven-publish`
     jacoco
     idea
-    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.lombok") version "9.1.0"
-    id("io.freefair.javadoc-links") version "9.1.0"
-    id("io.freefair.javadoc-utf-8") version "9.1.0"
-    id("io.freefair.maven-central.validate-poms") version "9.1.0"
+    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("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.jmh") version "0.7.3"
 }
 
 repositories {
@@ -49,13 +48,15 @@ gitVersioning.apply {
 }
 
 dependencies {
-    implementation("io.github.1c-syntax", "antlr4", "0.2.0")
+    implementation("io.github.1c-syntax", "antlr4", "0.3.0-rc.2")
     implementation("commons-io", "commons-io", "2.15.1")
     implementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
     implementation("org.assertj", "assertj-core", "3.27.0")
 
     testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
-    testImplementation("org.mockito", "mockito-core", "5.8.0")
+    testImplementation("org.mockito", "mockito-core", "5.21.0")
+
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4")
 }
 
 tasks.withType<JavaCompile> {
@@ -70,10 +71,6 @@ java {
     withJavadocJar()
 }
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
 tasks.test {
     useJUnitPlatform()
 
@@ -98,11 +95,14 @@ tasks.jacocoTestReport {
 }
 
 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"] = "2023-" + Calendar.getInstance().get(Calendar.YEAR)
     ext["name"] = "Valery Maximov <maximovvalery@gmail.com>"
     ext["project"] = "BSL Parser Testing"
+    include("**/*.java")
 }
 
 sonar {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/testing/LexerAsserts.java b/src/main/java/com/github/_1c_syntax/bsl/parser/testing/LexerAsserts.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/testing/ParserAsserts.java b/src/main/java/com/github/_1c_syntax/bsl/parser/testing/ParserAsserts.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -79,7 +79,7 @@ public ParserAsserts matches(ParseTree tree) throws RecognitionException {
       }
 
       if (ctx.parent == null) {
-        boolean parseSuccess = testParser.getLexerClazz().cast(parser.getInputStream().getTokenSource())._hitEOF;
+        boolean parseSuccess = testParser.getLexerClazz().cast(parser.getInputStream().getTokenSource()).isHitEOF();
         if (!parseSuccess) {
           throw new RecognitionException(
             "Parse error EOF don't hit\n" + parser.getInputStream().getText(),
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/testing/ResourceUtils.java b/src/main/java/com/github/_1c_syntax/bsl/parser/testing/ResourceUtils.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/testing/TestLexer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/testing/TestLexer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/testing/TestParser.java b/src/main/java/com/github/_1c_syntax/bsl/parser/testing/TestParser.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/ResourceUtilsTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/ResourceUtilsTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/TestLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/TestLexerTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/TestParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/TestParserTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoEmptyLexer.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoEmptyLexer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -23,9 +23,26 @@
 
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public class DemoEmptyLexer extends Lexer {
 
+  public static final String[] ruleNames = new String[0];
+  public static final Vocabulary VOCABULARY = new VocabularyImpl(ruleNames, new String[0]);
+
+  @Override
+  public String[] getChannelNames() {
+    return new String[0];
+  }
+
+  @Override
+  public String[] getModeNames() {
+    return new String[0];
+  }
+
   public DemoEmptyLexer(CharStream input) {
     super(input);
   }
@@ -35,8 +52,13 @@ public String[] getRuleNames() {
     return new String[0];
   }
 
+  @Override
+  public Vocabulary getVocabulary() {
+    return VOCABULARY;
+  }
+
   @Override
   public String getGrammarFileName() {
-    return null;
+    return "empty";
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoEmptyParser.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoEmptyParser.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -23,26 +23,32 @@
 
 import org.antlr.v4.runtime.Parser;
 import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.jspecify.annotations.NullMarked;
 
-
+@NullMarked
 public class DemoEmptyParser extends Parser {
 
+  public static final String[] ruleNames = new String[0];
+  public static final Vocabulary VOCABULARY = new VocabularyImpl(ruleNames, new String[0]);
+
   public DemoEmptyParser(TokenStream input) {
     super(input);
   }
 
   @Override
-  public String[] getTokenNames() {
+  public String[] getRuleNames() {
     return new String[0];
   }
 
   @Override
-  public String[] getRuleNames() {
-    return new String[0];
+  public Vocabulary getVocabulary() {
+    return VOCABULARY;
   }
 
   @Override
   public String getGrammarFileName() {
-    return null;
+    return "empty";
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoLexer.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoLexer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser Testing.
  *
- * Copyright (c) 2023-2025
+ * Copyright (c) 2023-2026
  * 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -23,9 +23,31 @@
 
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public class DemoLexer extends Lexer {
 
+  public static final String[] tokenNames = new String[]{"token1", "token2"};
+  ;
+  public static final Vocabulary VOCABULARY = new VocabularyImpl(new String[0], tokenNames);
+
+  @Override
+  public String[] getChannelNames() {
+    return new String[0];
+  }
+
+  @Override
+  public String[] getModeNames() {
+    return new String[0];
+  }
+
+  public String[] getTokenNames() {
+    return tokenNames;
+  }
+
   public DemoLexer(CharStream input) {
     super(input);
   }
@@ -36,12 +58,12 @@ public String[] getRuleNames() {
   }
 
   @Override
-  public String[] getTokenNames() {
-    return new String[]{"token1", "token2"};
+  public Vocabulary getVocabulary() {
+    return VOCABULARY;
   }
 
   @Override
   public String getGrammarFileName() {
-    return null;
+    return "fake";
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoParser.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoParser.java
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoToken.java b/src/test/java/com/github/_1c_syntax/bsl/parser/testing/demo/DemoToken.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* This file is a part of BSL Parser Testing.`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2023-2025`
	`4`	`+ * Copyright (c) 2023-2026`
`5`	`5`	`* 1c-syntax team and Valery Maximov <maximovvalery@gmail.com>`
`6`	`6`	`*`
`7`	`7`	`* SPDX-License-Identifier: LGPL-3.0-or-later`