Skip to content

Commit 5c5fbad

Browse files
committed
Версия 0.12.0
- Реализован поддержка формата файла с переносами - обновлен gradle до 8.4 - обновлены зависимости - добавлены тесты и исправлены небольшие ошибки
2 parents 763fd67 + 2d1a55e commit 5c5fbad

File tree

19 files changed

+599449
-227
lines changed

19 files changed

+599449
-227
lines changed

.github/workflows/check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
java_version: ['11', '17']
11+
java_version: ['11', '17', '20']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
14-
- uses: actions/checkout@v3.0.2
14+
- uses: actions/checkout@v3
1515
with:
1616
submodules: true
1717
- name: Set up JDK ${{ matrix.java_version }}
@@ -23,7 +23,7 @@ jobs:
2323
run: ./gradlew check --stacktrace
2424
- name: Archive test results
2525
if: failure()
26-
uses: actions/upload-artifact@v3.1.0
26+
uses: actions/upload-artifact@v3.1.2
2727
with:
2828
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
2929
path: build/reports/tests/test

.github/workflows/qa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
1414
steps:
15-
- uses: actions/checkout@v3.0.2
15+
- uses: actions/checkout@v3
1616
with:
1717
fetch-depth: ''
1818
submodules: true
1919
- run: |
2020
git fetch --prune --unshallow
21-
- name: Set up JDK 11
21+
- name: Set up JDK 17
2222
uses: actions/setup-java@v3
2323
with:
24-
java-version: 11
24+
java-version: 17
2525
distribution: 'adopt'
2626
- name: SonarCloud Scan
27-
run: ./gradlew check sonarqube
27+
run: ./gradlew check sonar
2828
env:
2929
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
name: Publish release
1111
steps:
1212
- name: Checkout source
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
- name: Set up JDK
15-
uses: actions/setup-java@v1
15+
uses: actions/setup-java@v3
1616
with:
1717
java-version: 11
1818
- name: Build with Gradle
1919
run: ./gradlew build
2020
- name: Upload jar to release
21-
uses: AButler/upload-release-assets@v1.0
21+
uses: AButler/upload-release-assets@v2.0
2222
with:
2323
files: './build/libs/*.jar'
2424
repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,49 @@
1+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
2+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
3+
4+
# User-specific stuff
5+
.idea/**/workspace.xml
6+
.idea/**/tasks.xml
7+
.idea/**/usage.statistics.xml
8+
.idea/**/dictionaries
9+
.idea/**/shelf
10+
11+
# Generated files
12+
.idea/**/contentModel.xml
13+
14+
# Sensitive or high-churn files
15+
.idea/**/dataSources/
16+
.idea/**/dataSources.ids
17+
.idea/**/dataSources.local.xml
18+
.idea/**/sqlDataSources.xml
19+
.idea/**/dynamic.xml
20+
.idea/**/uiDesigner.xml
21+
.idea/**/dbnavigator.xml
22+
23+
# Gradle
24+
.idea/**/gradle.xml
25+
.idea/**/libraries
26+
27+
# Gradle and Maven with auto-import
28+
# When using Gradle or Maven with auto-import, you should exclude module files,
29+
# since they will be recreated, and may cause churn. Uncomment if using
30+
# auto-import.
31+
.idea/artifacts
32+
.idea/compiler.xml
33+
.idea/jarRepositories.xml
34+
.idea/modules.xml
35+
.idea/*.iml
36+
.idea/modules
37+
*.iml
38+
*.ipr
39+
40+
# temp files
41+
*.bak
42+
*.orig
143
build/
44+
45+
# other
46+
.idea/sonarlint/
247
.gradle/
48+
/.idea/misc.xml
349

4-
/.idea/sonarlint/
5-
*.orig
6-
/.idea/jarRepositories.xml
7-
/.idea/compiler.xml
8-
/.idea/sonarlint-state.xml
9-
/.idea/sonarlint.xml
10-
/.idea/workspace.xml
11-
12-
/.idea/gradle.xml
13-
/.idea/misc.xml
14-
/.idea/vcs.xml

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 416 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ plugins {
66
jacoco
77
id("org.cadixdev.licenser") version "0.6.1"
88
id("com.github.gradle-git-version-calculator") version "1.1.0"
9-
id("io.freefair.lombok") version "6.5.0.2"
10-
id("io.freefair.javadoc-links") version "6.5.0.2"
11-
id("io.freefair.javadoc-utf-8") version "6.5.0.2"
12-
id("org.sonarqube") version "3.4.0.2513"
9+
id("io.freefair.lombok") version "8.3"
10+
id("io.freefair.javadoc-links") version "8.3"
11+
id("io.freefair.javadoc-utf-8") version "8.3"
12+
id("org.sonarqube") version "4.0.0.2929"
1313
}
1414

1515
group = "io.github.1c-syntax"
@@ -27,11 +27,11 @@ dependencies {
2727

2828
// прочее
2929
implementation("commons-io", "commons-io", "2.8.0")
30-
implementation("io.github.1c-syntax", "bsl-common-library", "904b9172")
30+
api("io.github.1c-syntax", "bsl-common-library", "0.4.0")
3131

3232
// тестирование
3333
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.7.0")
34-
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.7.0")
34+
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.7.0")
3535
testImplementation("org.assertj", "assertj-core", "3.18.1")
3636
// логирование
3737
// https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
@@ -99,6 +99,7 @@ license {
9999
ext["project"] = "Support Configuration"
100100
exclude("**/*.properties")
101101
exclude("**/*.orig")
102+
exclude("**/*.xml")
102103
}
103104

104105
publishing {

gradle/wrapper/gradle-wrapper.jar

3.75 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)