Skip to content

Commit

Permalink
Finish v0.14.1
Browse files Browse the repository at this point in the history
  • Loading branch information
theshadowco committed Jan 2, 2025
2 parents c1d49ca + e87a8f7 commit bb8e35b
Show file tree
Hide file tree
Showing 15 changed files with 66 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: ['17', '20']
java_version: ['17', '21']
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@v4
Expand All @@ -23,7 +23,7 @@ jobs:
run: ./gradlew check --stacktrace
- name: Archive test results
if: failure()
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4
with:
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
path: build/reports/tests/test
26 changes: 26 additions & 0 deletions .github/workflows/update-gradle.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Update Gradle Wrapper

on:
workflow_dispatch:
schedule:
- cron: "0 0 * * 0"

jobs:
update-gradle-wrapper:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
cache: gradle

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
set-distribution-checksum: false
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ build/
.gradle/
/.idea/misc.xml

/.idea/material_theme_project_new.xml
1 change: 0 additions & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_supportconf&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_supportconf)

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

Библиотека ранее входила в состав [MDClasses](https://github.com/1c-syntax/mdclasses), но была выделена в самостоятельную в связи с потребностью использования за рамками.
Expand Down
29 changes: 14 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ plugins {
`maven-publish`
jacoco
signing
id("org.sonarqube") version "4.4.1.3373"
id("org.sonarqube") version "6.0.1.5171"
id("org.cadixdev.licenser") version "0.6.1"
id("me.qoomon.git-versioning") version "6.4.3"
id("io.freefair.lombok") version "8.6"
id("io.freefair.javadoc-links") version "8.6"
id("io.freefair.javadoc-utf-8") version "8.6"
id("io.freefair.maven-central.validate-poms") version "8.6"
id("me.qoomon.git-versioning") version "6.4.4"
id("io.freefair.lombok") version "8.11"
id("io.freefair.javadoc-links") version "8.11"
id("io.freefair.javadoc-utf-8") version "8.11"
id("io.freefair.maven-central.validate-poms") version "8.11"
id("com.github.ben-manes.versions") version "0.51.0"
id("ru.vyarus.pom") version "3.0.0"
id("io.codearte.nexus-staging") version "0.30.0"
Expand All @@ -39,24 +39,23 @@ val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
repositories {
mavenLocal()
mavenCentral()
maven(url = "https://jitpack.io")
}

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

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

// тестирование
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.1")
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.10.1")
testImplementation("org.assertj", "assertj-core", "3.25.0")
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
testImplementation("org.assertj", "assertj-core", "3.27.0")

// логирование
// https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
testImplementation("org.slf4j", "slf4j-log4j12", "2.0.11")
testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
}

java {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 4 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

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

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

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

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is a part of Support Configuration.
*
* Copyright (c) 2019 - 2024
* Copyright (c) 2019 - 2025
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is a part of Support Configuration.
*
* Copyright (c) 2019 - 2024
* Copyright (c) 2019 - 2025
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is a part of Support Configuration.
*
* Copyright (c) 2019 - 2024
* Copyright (c) 2019 - 2025
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is a part of Support Configuration.
*
* Copyright (c) 2019 - 2024
* Copyright (c) 2019 - 2025
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is a part of Support Configuration.
*
* Copyright (c) 2019 - 2024
* Copyright (c) 2019 - 2025
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is a part of Support Configuration.
*
* Copyright (c) 2019 - 2024
* Copyright (c) 2019 - 2025
* Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
*
* SPDX-License-Identifier: LGPL-3.0-or-later
Expand Down

0 comments on commit bb8e35b

Please sign in to comment.