# Релиз 0.20.4

# Прочие изменения + Обновлен Gradle до версии 7.4 + Обновлены зависимости + Изменено имя группы библиотеки на "io.github.1c-syntax"
1c-syntax · Feb 20, 2022 · c514ca3 · c514ca3
2 parents 8473af6 + 9d61f48
commit c514ca3
Show file tree

Hide file tree

Showing 38 changed files with 74 additions and 77 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '16']
+        java_version: ['11', '17']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/[email protected]

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -22,14 +22,14 @@ jobs:
     - name: Setup JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 16
+        java-version: 17
         distribution: 'adopt'
 
     - name: Build javadoc
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       with:
         python-version: '3.6'
         architecture: 'x64'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import java.net.URI
 import java.util.*
 
 plugins {
@@ -7,58 +6,58 @@ plugins {
     jacoco
     `java-library`
     antlr
-    id("com.github.hierynomus.license") version "0.16.1"
     id("org.sonarqube") version "3.3"
+    id("org.cadixdev.licenser") version "0.6.1"
     id("com.github.gradle-git-version-calculator") version "1.1.0"
-    id("com.github.ben-manes.versions") version "0.40.0"
+    id("io.freefair.lombok") version "6.4.1"
+    id("io.freefair.javadoc-links") version "6.4.1"
+    id("io.freefair.javadoc-utf-8") version "6.4.1"
+    id("com.github.ben-manes.versions") version "0.42.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
-    id("io.freefair.javadoc-links") version "6.3.0"
-    id("io.freefair.javadoc-utf-8") version "6.3.0"
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
-    maven { url = URI("https://jitpack.io") }
+    maven(url = "https://jitpack.io")
 }
 
-group = "com.github.1c-syntax"
+group = "io.github.1c-syntax"
 version = gitVersionCalculator.calculateVersion("v")
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
 val antlrVersion = "4.9.0"
 val antlrGroupId = "com.tunnelvisionlabs"
 val antlrArtifactId = "antlr4"
-val junitVersion = "5.6.0-RC1"
 
 dependencies {
     implementation(antlrGroupId, antlrArtifactId, antlrVersion)
     antlr(antlrGroupId, antlrArtifactId, antlrVersion)
 
-    implementation("com.github.1c-syntax", "utils", "0.2.1")
+    implementation("com.github.1c-syntax", "utils", "0.3.4")
 
     // https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils
     implementation("commons-beanutils", "commons-beanutils", "1.9.4")
 
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion)
-    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junitVersion)
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.1")
+    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.6.1")
     testImplementation("org.assertj", "assertj-core", "3.14.0")
 
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation("commons-io", "commons-io", "2.6")
 
     // stat analysis
     compileOnly("com.google.code.findbugs", "jsr305", "3.0.2")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    withSourcesJar()
+    withJavadocJar()
+}
 
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
 }
 
 sourceSets {
@@ -102,30 +101,30 @@ jmh {
 
 tasks.generateGrammarSource {
     arguments = listOf(
-            "-visitor",
-            "-package",
-            "com.github._1c_syntax.bsl.parser",
-            "-encoding",
-            "utf8"
+        "-visitor",
+        "-package",
+        "com.github._1c_syntax.bsl.parser",
+        "-encoding",
+        "utf8"
     )
     outputDirectory = file("src/main/gen/com/github/_1c_syntax/bsl/parser")
 }
 
 tasks.generateGrammarSource {
     doLast {
-        tasks.licenseFormatMain.get().actions[0].execute(tasks.licenseFormatMain.get())
+        tasks.updateLicenseMain.get().actions[0].execute(tasks.updateLicenseMain.get())
     }
 }
 
 tasks.test {
     useJUnitPlatform()
 
     testLogging {
-        events("passed", "skipped", "failed")
+        events("passed", "skipped", "failed", "standard_error")
     }
 
     reports {
-        html.isEnabled = true
+        html.required.set(true)
     }
 }
 
@@ -135,33 +134,31 @@ tasks.check {
 
 tasks.jacocoTestReport {
     reports {
-        xml.isEnabled = true
-        xml.destination = File("$buildDir/reports/jacoco/test/jacoco.xml")
+        xml.required.set(true)
+        xml.outputLocation.set(File("$buildDir/reports/jacoco/test/jacoco.xml"))
     }
 }
 
 tasks.javadoc {
     options {
         this as StandardJavadocDocletOptions
-        links(
-            "https://javadoc.io/doc/org.antlr/antlr4-runtime/latest"
-        )
+        links("https://javadoc.io/doc/org.antlr/antlr4-runtime/latest")
     }
 }
 
 license {
-    header = rootProject.file("license/HEADER.txt")
+    header(rootProject.file("license/HEADER.txt"))
+    newLine(false)
     ext["year"] = "2018-" + Calendar.getInstance().get(Calendar.YEAR)
-    ext["name"] = "Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>"
+    ext["name"] =
+        "Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>"
     ext["project"] = "BSL Parser"
     exclude("**/*.tokens")
     exclude("**/*.interp")
     exclude("**/*.g4")
     exclude("**/*.bsl")
     exclude("**/*.orig")
     exclude("**/*.gitkeep")
-    strictCheck = true
-    mapping("java", "SLASHSTAR_STYLE")
 }
 
 tasks.clean {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/license/HEADER.txt b/license/HEADER.txt
@@ -1,6 +1,6 @@
 This file is a part of ${project}.
 
-Copyright © ${year}
+Copyright (c) ${year}
 ${name}
 
 SPDX-License-Identifier: LGPL-3.0-or-later

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
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLParserTest.java b/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLParserTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionTokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLParserRuleContext.java b/src/main/java/com/github/_1c_syntax/bsl/parser/BSLParserRuleContext.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLTokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/BSLTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/CRAwareLexerATNSimulator.java b/src/main/java/com/github/_1c_syntax/bsl/parser/CRAwareLexerATNSimulator.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/CaseChangingCharStream.java b/src/main/java/com/github/_1c_syntax/bsl/parser/CaseChangingCharStream.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/Tokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/Tokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/UnicodeBOMInputStream.java b/src/main/java/com/github/_1c_syntax/bsl/parser/UnicodeBOMInputStream.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/BSLDescriptionReader.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/BSLDescriptionReader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/MethodDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/MethodDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/...ain/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java b/...ain/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/VariableDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/VariableDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/package-info.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/DescriptionReader.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/DescriptionReader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/ParameterDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/ParameterDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/TypeDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/TypeDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/package-info.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractLexerTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright © 2018-2022
+ * Copyright (c) 2018-2022
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later