From 3049cdf3f9facf2adf4c9d55eb28d019102de7fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 13:14:39 +0000 Subject: [PATCH 1/8] Bump com.github.ben-manes.versions from 0.40.0 to 0.41.0 Bumps com.github.ben-manes.versions from 0.40.0 to 0.41.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a6eb25f7..091473ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.hierynomus.license") version "0.16.1" id("org.sonarqube") version "3.3" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("com.github.ben-manes.versions") version "0.40.0" + id("com.github.ben-manes.versions") version "0.41.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" From f63d211922aef0de33772ccad15db05b27d5b703 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 13:16:19 +0000 Subject: [PATCH 2/8] Bump actions/setup-python from 2.3.1 to 2.3.2 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v2.3.2) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 8daf06f5..c23119da 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -29,7 +29,7 @@ jobs: run: ./gradlew --no-daemon javadoc - name: Set up Python - uses: actions/setup-python@v2.3.1 + uses: actions/setup-python@v2.3.2 with: python-version: '3.6' architecture: 'x64' From 6d3ab6f3c14162d2e52249ce9d90c533de52ffac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 13:16:30 +0000 Subject: [PATCH 3/8] Bump com.github.ben-manes.versions from 0.41.0 to 0.42.0 Bumps com.github.ben-manes.versions from 0.41.0 to 0.42.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 091473ee..8a272ff8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.hierynomus.license") version "0.16.1" id("org.sonarqube") version "3.3" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("com.github.ben-manes.versions") version "0.41.0" + 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" From face24e671ee1523dcd7dbcb1546b4ac4bf55678 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 13:48:04 +0000 Subject: [PATCH 4/8] Bump io.freefair.javadoc-links from 6.3.0 to 6.4.0 Bumps io.freefair.javadoc-links from 6.3.0 to 6.4.0. --- updated-dependencies: - dependency-name: io.freefair.javadoc-links dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8a272ff8..7a3d6d43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { id("com.github.gradle-git-version-calculator") version "1.1.0" 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-links") version "6.4.0" id("io.freefair.javadoc-utf-8") version "6.3.0" } From 3a6b3c7ec577c1a7d8bccd1887eabdc080771530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 15:23:28 +0000 Subject: [PATCH 5/8] Bump io.freefair.javadoc-utf-8 from 6.3.0 to 6.4.0 Bumps io.freefair.javadoc-utf-8 from 6.3.0 to 6.4.0. --- updated-dependencies: - dependency-name: io.freefair.javadoc-utf-8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7a3d6d43..463a24cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { 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.4.0" - id("io.freefair.javadoc-utf-8") version "6.3.0" + id("io.freefair.javadoc-utf-8") version "6.4.0" } repositories { From 81bdc92f456a795290a7e6cde968d5e1efad3d7c Mon Sep 17 00:00:00 2001 From: theshadowco Date: Sun, 20 Feb 2022 07:53:34 +0300 Subject: [PATCH 6/8] + Update Gradle -> 7.4 + Update dependences + Add check java17 + Update license --- .github/workflows/check.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- build.gradle.kts | 67 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- license/HEADER.txt | 2 +- .../bsl/parser/JMXBSLLexerTest.java | 2 +- .../bsl/parser/JMXBSLParserTest.java | 2 +- .../parser/BSLMethodDescriptionTokenizer.java | 2 +- .../bsl/parser/BSLParserRuleContext.java | 2 +- .../_1c_syntax/bsl/parser/BSLTokenizer.java | 2 +- .../bsl/parser/CRAwareLexerATNSimulator.java | 2 +- .../bsl/parser/CaseChangingCharStream.java | 2 +- .../_1c_syntax/bsl/parser/SDBLTokenizer.java | 2 +- .../_1c_syntax/bsl/parser/Tokenizer.java | 2 +- .../bsl/parser/UnicodeBOMInputStream.java | 2 +- .../description/BSLDescriptionReader.java | 2 +- .../parser/description/MethodDescription.java | 2 +- .../SourceDefinedSymbolDescription.java | 2 +- .../description/VariableDescription.java | 2 +- .../bsl/parser/description/package-info.java | 2 +- .../support/DescriptionReader.java | 2 +- .../support/ParameterDescription.java | 2 +- .../description/support/SimpleRange.java | 2 +- .../description/support/TypeDescription.java | 2 +- .../description/support/package-info.java | 2 +- .../bsl/parser/AbstractLexerTest.java | 2 +- .../bsl/parser/AbstractParserTest.java | 2 +- .../_1c_syntax/bsl/parser/BSLLexerTest.java | 2 +- .../parser/BSLMethodDescriptionLexerTest.java | 2 +- .../BSLMethodDescriptionParserTest.java | 2 +- .../_1c_syntax/bsl/parser/BSLParserTest.java | 2 +- .../bsl/parser/BSLTokenizerTest.java | 2 +- .../_1c_syntax/bsl/parser/SDBLLexerTest.java | 2 +- .../_1c_syntax/bsl/parser/SDBLParserTest.java | 2 +- .../bsl/parser/SDBLTokenizerTest.java | 2 +- .../description/BSLDescriptionReaderTest.java | 2 +- .../description/support/SimpleRangeTest.java | 2 +- src/test/java/utils/TestUtils.java | 2 +- 38 files changed, 67 insertions(+), 74 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ee49807e..1916983b 100644 --- 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/checkout@v2.4.0 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c23119da..fe8ab96a 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -22,7 +22,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v2 with: - java-version: 16 + java-version: 17 distribution: 'adopt' - name: Build javadoc diff --git a/build.gradle.kts b/build.gradle.kts index 463a24cc..190db99f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import java.net.URI import java.util.* plugins { @@ -7,38 +6,28 @@ 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("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.4.0" - id("io.freefair.javadoc-utf-8") version "6.4.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 { - 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) @@ -49,8 +38,8 @@ dependencies { // 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 @@ -58,7 +47,13 @@ dependencies { // stat analysis compileOnly("com.google.code.findbugs", "jsr305", "3.0.2") +} +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + withSourcesJar() + withJavadocJar() } sourceSets { @@ -102,18 +97,18 @@ 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()) } } @@ -121,11 +116,11 @@ tasks.test { useJUnitPlatform() testLogging { - events("passed", "skipped", "failed") + events("passed", "skipped", "failed", "standard_error") } reports { - html.isEnabled = true + html.required.set(true) } } @@ -135,24 +130,24 @@ 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 , Nikita Fedkin , Sergey Batanov " + ext["name"] = + "Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov " ext["project"] = "BSL Parser" exclude("**/*.tokens") exclude("**/*.interp") @@ -160,8 +155,6 @@ license { 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 index 0f80bbf5..41dfb879 100644 --- 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 index 190dd123..debb3edd 100644 --- 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 index ec2d5c32..ac38102c 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 10cd7dfa..0b1fd189 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index d4a96887..b31b0ade 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index e5bc0811..f3ad128a 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 32019de7..144c2986 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index ee9128d5..7e757f1c 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index e7908d25..b3c359b7 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index f9596f87..ac754abc 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index e85bc234..14a02bf8 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 7fd06465..38a68faa 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index f3c3ffb6..bc951c2a 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index f73a2e58..dd9d4295 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java index 2aa1e0dc..418ef100 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java +++ b/src/main/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 , Nikita Fedkin , Sergey Batanov * * 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 index f5030042..43b0247d 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index cd532e68..2cbf0316 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 95923a68..7d872b04 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 84324898..201d8609 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index e9abd167..0be9a38f 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 8d4dc5ef..8c53288c 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index 44460839..14d68dca 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * 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 index ea2b1528..34e1be53 100644 --- 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 , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractParserTest.java index cf0a01e6..267a4935 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractParserTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractParserTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java index 367f5cfe..ca5a349b 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionLexerTest.java index 1d5badd8..99b01eb4 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionLexerTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionLexerTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionParserTest.java index 3a836d57..b1f6f28d 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionParserTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionParserTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserTest.java index 9f0c4071..dd1f56ec 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLTokenizerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLTokenizerTest.java index 122cdce5..021406fa 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLTokenizerTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLTokenizerTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLLexerTest.java index 6f17c7be..54612b28 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLLexerTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLLexerTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLParserTest.java index 4f2945c1..7d4053ae 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLParserTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLParserTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later 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 index 2dcd6662..1a60d69c 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizerTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizerTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later 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 index 6f19d465..845ac8f7 100644 --- 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 @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRangeTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRangeTest.java index 145c48e3..70553ca5 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRangeTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRangeTest.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/utils/TestUtils.java b/src/test/java/utils/TestUtils.java index 36520d1d..fbefad33 100644 --- a/src/test/java/utils/TestUtils.java +++ b/src/test/java/utils/TestUtils.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Parser. * - * Copyright © 2018-2022 + * Copyright (c) 2018-2022 * Alexey Sosnoviy , Nikita Fedkin , Sergey Batanov * * SPDX-License-Identifier: LGPL-3.0-or-later From c55670a24a55eca4354a514e8c66b2f263d8137d Mon Sep 17 00:00:00 2001 From: theshadowco Date: Sun, 20 Feb 2022 07:57:09 +0300 Subject: [PATCH 7/8] Update dependence utils -> 0.3.4 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 190db99f..cfe5a10c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ 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") From 9d61f4822beb5830ba760f7a2edd91b917afa6be Mon Sep 17 00:00:00 2001 From: theshadowco Date: Sun, 20 Feb 2022 08:03:41 +0300 Subject: [PATCH 8/8] add missing encoding --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index cfe5a10c..77cb3c89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,6 +56,10 @@ java { withJavadocJar() } +tasks.withType { + options.encoding = "UTF-8" +} + sourceSets { main { java.srcDirs("src/main/java", "src/main/gen")