Skip to content

Commit bb8e35b

Browse files
committed
Finish v0.14.1
2 parents c1d49ca + e87a8f7 commit bb8e35b

File tree

15 files changed

+66
-37
lines changed

15 files changed

+66
-37
lines changed

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
java_version: ['17', '20']
11+
java_version: ['17', '21']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
1414
- uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
2323
run: ./gradlew check --stacktrace
2424
- name: Archive test results
2525
if: failure()
26-
uses: actions/upload-artifact@v4.3.1
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
2929
path: build/reports/tests/test

.github/workflows/update-gradle.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Update Gradle Wrapper
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "0 0 * * 0"
7+
8+
jobs:
9+
update-gradle-wrapper:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: 17
19+
distribution: 'temurin'
20+
cache: gradle
21+
22+
- name: Update Gradle Wrapper
23+
uses: gradle-update/update-gradle-wrapper-action@v2
24+
with:
25+
repo-token: ${{ secrets.GITHUB_TOKEN }}
26+
set-distribution-checksum: false

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ build/
4747
.gradle/
4848
/.idea/misc.xml
4949

50+
/.idea/material_theme_project_new.xml

README.MD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_supportconf&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_supportconf)
1010

1111
[![Download](https://img.shields.io/github/release/1c-syntax/supportconf.svg?label=download&style=flat)](https://github.com/1c-syntax/supportconf/releases/latest)
12-
[![JitPack](https://jitpack.io/v/1c-syntax/supportconf.svg)](https://jitpack.io/#1c-syntax/supportconf)
1312
[![GitHub Releases](https://img.shields.io/github/downloads/1c-syntax/supportconf/latest/total?style=flat-square)](https://github.com/1c-syntax/mdclasses/supportconf)
1413

1514
Библиотека ранее входила в состав [MDClasses](https://github.com/1c-syntax/mdclasses), но была выделена в самостоятельную в связи с потребностью использования за рамками.

build.gradle.kts

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ plugins {
66
`maven-publish`
77
jacoco
88
signing
9-
id("org.sonarqube") version "4.4.1.3373"
9+
id("org.sonarqube") version "6.0.1.5171"
1010
id("org.cadixdev.licenser") version "0.6.1"
11-
id("me.qoomon.git-versioning") version "6.4.3"
12-
id("io.freefair.lombok") version "8.6"
13-
id("io.freefair.javadoc-links") version "8.6"
14-
id("io.freefair.javadoc-utf-8") version "8.6"
15-
id("io.freefair.maven-central.validate-poms") version "8.6"
11+
id("me.qoomon.git-versioning") version "6.4.4"
12+
id("io.freefair.lombok") version "8.11"
13+
id("io.freefair.javadoc-links") version "8.11"
14+
id("io.freefair.javadoc-utf-8") version "8.11"
15+
id("io.freefair.maven-central.validate-poms") version "8.11"
1616
id("com.github.ben-manes.versions") version "0.51.0"
1717
id("ru.vyarus.pom") version "3.0.0"
1818
id("io.codearte.nexus-staging") version "0.30.0"
@@ -39,24 +39,23 @@ val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
3939
repositories {
4040
mavenLocal()
4141
mavenCentral()
42-
maven(url = "https://jitpack.io")
4342
}
4443

4544
dependencies {
4645
// логирование
47-
implementation("org.slf4j", "slf4j-api", "2.0.11")
46+
implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1")
4847

4948
// прочее
50-
implementation("commons-io", "commons-io", "2.15.1")
51-
api("io.github.1c-syntax", "bsl-common-library", "0.5.0")
49+
implementation("commons-io", "commons-io", "2.18.0")
50+
api("io.github.1c-syntax", "bsl-common-library", "0.7.1")
5251

5352
// тестирование
54-
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.1")
55-
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.10.1")
56-
testImplementation("org.assertj", "assertj-core", "3.25.0")
53+
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
54+
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
55+
testImplementation("org.assertj", "assertj-core", "3.27.0")
56+
5757
// логирование
58-
// https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
59-
testImplementation("org.slf4j", "slf4j-log4j12", "2.0.11")
58+
testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
6059
}
6160

6261
java {

gradle/wrapper/gradle-wrapper.jar

-19.7 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum

gradlew.bat

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

src/main/java/com/github/_1c_syntax/bsl/supconf/GeneralSupportVariant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of Support Configuration.
33
*
4-
* Copyright (c) 2019 - 2024
4+
* Copyright (c) 2019 - 2025
55
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

0 commit comments

Comments
 (0)