Skip to content

Commit d2edd86

Browse files
committed
Finish v0.15.0
2 parents 6e6efa6 + a677f1c commit d2edd86

File tree

499 files changed

+11683
-6996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

499 files changed

+11683
-6996
lines changed

.github/workflows/check.yml

Lines changed: 24 additions & 10 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', '23']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
include:
1414
- os: windows-latest
@@ -29,13 +29,27 @@ jobs:
2929
distribution: 'liberica'
3030
- name: Build with Gradle
3131
run: ./gradlew check --stacktrace
32-
- name: Archive test results
33-
if: always() && matrix.prefix == 'nix'
34-
uses: EnricoMi/publish-unit-test-result-action@v2
32+
- name: Upload Test Results
33+
if: always()
34+
uses: actions/upload-artifact@v4
3535
with:
36-
junit_files: "**/test-results/test/**/*.xml"
37-
- name: Archive test results
38-
if: always() && matrix.prefix != 'nix'
39-
uses: EnricoMi/publish-unit-test-result-action/composite@v2
40-
with:
41-
junit_files: "**/test-results/test/**/*.xml"
36+
name: Test Results (Java ${{ matrix.java_version }}.${{ matrix.os }})
37+
path: "**/test-results/test/**/*.xml"
38+
publish-test-results:
39+
needs: build
40+
runs-on: ubuntu-latest
41+
permissions:
42+
checks: write
43+
pull-requests: write
44+
contents: read
45+
issues: read
46+
if: always()
47+
steps:
48+
- name: Download Artifacts
49+
uses: actions/download-artifact@v4
50+
with:
51+
path: artifacts
52+
- name: Publish Test Results
53+
uses: EnricoMi/publish-unit-test-result-action@v2
54+
with:
55+
junit_files: "artifacts/**/*.xml"

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: ./gradlew --no-daemon javadoc
3131

3232
- name: Set up Python
33-
uses: actions/setup-python@v5.1.0
33+
uses: actions/setup-python@v5.4.0
3434
with:
3535
python-version: '3.10'
3636
architecture: 'x64'

.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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ Gradle_*.xml
1616
/.idea/material_theme_project_new.xml
1717
*.hprof
1818
*.hprof.idom
19+
*.cf
20+
**/ConfigDumpInfo.xml
21+
**/.metadata/

build.gradle.kts

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ plugins {
77
jacoco
88
signing
99
id("org.cadixdev.licenser") version "0.6.1"
10-
id("me.qoomon.git-versioning") version "6.4.3"
10+
id("me.qoomon.git-versioning") version "6.4.4"
1111
id("com.gorylenko.gradle-git-properties") version "2.4.2"
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"
12+
id("io.freefair.lombok") version "8.12.1"
13+
id("io.freefair.javadoc-links") version "8.12.1"
14+
id("io.freefair.javadoc-utf-8") version "8.12.1"
15+
id("io.freefair.maven-central.validate-poms") version "8.12.1"
1616
id("ru.vyarus.pom") version "3.0.0"
17-
id("org.sonarqube") version "5.1.0.4882"
17+
id("org.sonarqube") version "6.0.1.5171"
1818
id("io.codearte.nexus-staging") version "0.30.0"
1919
}
2020

@@ -39,43 +39,38 @@ val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
3939
repositories {
4040
mavenLocal()
4141
mavenCentral()
42-
maven(url = "https://jitpack.io")
4342
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
4443
}
4544

4645
dependencies {
4746

4847
implementation("org.apache.commons", "commons-collections4", "4.4")
4948

50-
// https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream
51-
implementation("com.thoughtworks.xstream", "xstream", "1.4.20")
49+
implementation("com.thoughtworks.xstream", "xstream", "1.4.21")
5250

5351
// логирование
5452
implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1")
5553

5654
// прочее
57-
implementation("commons-io", "commons-io", "2.8.0")
58-
implementation("io.github.1c-syntax", "utils", "0.6.1")
59-
implementation("io.github.1c-syntax", "bsl-common-library", "0.7.0")
60-
implementation("io.github.1c-syntax", "supportconf", "0.14.0") {
61-
exclude("io.github.1c-syntax", "bsl-common-library")
62-
}
55+
implementation("commons-io", "commons-io", "2.18.0")
56+
implementation("io.github.1c-syntax", "utils", "0.6.2")
57+
implementation("io.github.1c-syntax", "bsl-common-library", "0.8.0")
58+
implementation("io.github.1c-syntax", "supportconf", "0.14.2")
6359

6460
// быстрый поиск классов
65-
implementation("io.github.classgraph", "classgraph", "4.8.147")
61+
implementation("io.github.classgraph", "classgraph", "4.8.179")
6662

6763
// тестирование
68-
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.7.0")
69-
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.7.0")
70-
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.7.0")
71-
testImplementation("org.assertj", "assertj-core", "3.18.1")
72-
testImplementation("com.ginsberg", "junit5-system-exit", "1.0.0")
73-
testImplementation("org.skyscreamer", "jsonassert", "1.5.0")
74-
testImplementation("org.objenesis", "objenesis", "3.2")
64+
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
65+
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
66+
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.11.4")
67+
testImplementation("org.assertj", "assertj-core", "3.27.0")
68+
testImplementation("com.ginsberg", "junit5-system-exit", "2.0.2")
69+
testImplementation("org.skyscreamer", "jsonassert", "1.5.3")
70+
testImplementation("org.objenesis", "objenesis", "3.4")
7571

7672
// логирование
77-
// https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
78-
testImplementation("org.slf4j", "slf4j-log4j12", "2.1.0-alpha1")
73+
testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
7974
}
8075

8176
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.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-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/mdclasses/CF.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of MDClasses.
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
@@ -27,6 +27,7 @@
2727
import com.github._1c_syntax.bsl.mdo.ModuleOwner;
2828
import com.github._1c_syntax.bsl.mdo.Subsystem;
2929
import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
30+
import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
3031
import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
3132
import com.github._1c_syntax.bsl.mdo.support.UsePurposes;
3233
import com.github._1c_syntax.bsl.support.CompatibilityMode;
@@ -51,6 +52,11 @@ public interface CF extends MDClass, ConfigurationTree, CFAccess {
5152
*/
5253
ScriptVariant getScriptVariant();
5354

55+
/**
56+
* Вид интерфейса
57+
*/
58+
InterfaceCompatibilityMode getInterfaceCompatibilityMode();
59+
5460
/**
5561
* Режим совместимости
5662
*/

0 commit comments

Comments
 (0)