Версия 0.12.0

- Реализован поддержка формата файла с переносами
- обновлен gradle до 8.4
- обновлены зависимости
- добавлены тесты и исправлены небольшие ошибки

.github/workflows/check.yml

@@ -8,10 +8,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '17']
+        java_version: ['11', '17', '20']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Set up JDK ${{ matrix.java_version }}
@@ -23,7 +23,7 @@ jobs:
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/[email protected].0
+      uses: actions/[email protected].2
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test

.github/workflows/qa.yml

@@ -12,19 +12,19 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: ''
           submodules: true
       - run: |
           git fetch --prune --unshallow
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: SonarCloud Scan
-        run: ./gradlew check sonarqube
+        run: ./gradlew check sonar
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -10,15 +10,15 @@ jobs:
     name: Publish release
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload jar to release
-        uses: AButler/upload-release-assets@v1.0
+        uses: AButler/upload-release-assets@v2.0
         with:
           files: './build/libs/*.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,14 +1,49 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
+
+# temp files
+*.bak
+*.orig
 build/
+
+# other
+.idea/sonarlint/
 .gradle/
+/.idea/misc.xml
 
-/.idea/sonarlint/
-*.orig
-/.idea/jarRepositories.xml
-/.idea/compiler.xml
-/.idea/sonarlint-state.xml
-/.idea/sonarlint.xml
-/.idea/workspace.xml
-
-/.idea/gradle.xml
-/.idea/misc.xml
-/.idea/vcs.xml

build.gradle.kts

@@ -6,10 +6,10 @@ plugins {
     jacoco
     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.5.0.2"
-    id("io.freefair.javadoc-links") version "6.5.0.2"
-    id("io.freefair.javadoc-utf-8") version "6.5.0.2"
-    id("org.sonarqube") version "3.4.0.2513"
+    id("io.freefair.lombok") version "8.3"
+    id("io.freefair.javadoc-links") version "8.3"
+    id("io.freefair.javadoc-utf-8") version "8.3"
+    id("org.sonarqube") version "4.0.0.2929"
 }
 
 group = "io.github.1c-syntax"
@@ -27,11 +27,11 @@ dependencies {
 
     // прочее
     implementation("commons-io", "commons-io", "2.8.0")
-    implementation("io.github.1c-syntax", "bsl-common-library", "904b9172")
+    api("io.github.1c-syntax", "bsl-common-library", "0.4.0")
 
     // тестирование
     testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.7.0")
-    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.7.0")
+    testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.7.0")
     testImplementation("org.assertj", "assertj-core", "3.18.1")
     // логирование
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
@@ -99,6 +99,7 @@ license {
     ext["project"] = "Support Configuration"
     exclude("**/*.properties")
     exclude("**/*.orig")
+    exclude("**/*.xml")
 }
 
 publishing {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists