Skip to content

Commit 76baa99

Browse files
nixel2007nixel2007
committed
Merge branch 'develop' for release v0.19.0
2 parents a0a954f + 2ca9028 commit 76baa99

49 files changed

Lines changed: 767 additions & 28 deletions

File tree

Some content is hidden

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

‎.github/workflows/check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: ./gradlew check --stacktrace
3333
- name: Upload Test Results
3434
if: always()
35-
uses: actions/upload-artifact@v6
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: Test Results (Java ${{ matrix.java_version }}.${{ matrix.os }})
3838
path: "**/test-results/test/**/*.xml"
@@ -47,7 +47,7 @@ jobs:
4747
if: always()
4848
steps:
4949
- name: Download Artifacts
50-
uses: actions/download-artifact@v7
50+
uses: actions/download-artifact@v8
5151
with:
5252
path: artifacts
5353
- name: Publish Test Results

‎build.gradle.kts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ plugins {
77
jacoco
88
id("cloud.rio.license") version "0.18.0"
99
id("me.qoomon.git-versioning") version "6.4.4"
10-
id("io.freefair.lombok") version "9.2.0"
11-
id("io.freefair.javadoc-links") version "9.2.0"
12-
id("io.freefair.javadoc-utf-8") version "9.2.0"
10+
id("io.freefair.lombok") version "9.4.0"
11+
id("io.freefair.javadoc-links") version "9.4.0"
12+
id("io.freefair.javadoc-utf-8") version "9.4.0"
1313
// id("io.freefair.maven-central.validate-poms") version "9.1.0" не работает на 9 градле
14-
id("com.github.ben-manes.versions") version "0.53.0"
14+
id("com.github.ben-manes.versions") version "0.54.0"
1515
id("ru.vyarus.pom") version "3.0.0"
16-
id("org.jreleaser") version "1.21.0"
16+
id("org.jreleaser") version "1.23.0"
1717
id("org.sonarqube") version "7.2.2.6593"
1818
id("me.champeau.jmh") version "0.7.3"
1919
}
@@ -55,12 +55,12 @@ dependencies {
5555
implementation("com.thoughtworks.xstream:xstream:1.4.21")
5656

5757
// логирование
58-
implementation("org.slf4j:slf4j-api:2.0.16")
58+
implementation("org.slf4j:slf4j-api:2.0.17")
5959

6060
// прочее
61-
implementation("commons-io:commons-io:2.21.0")
61+
implementation("commons-io:commons-io:2.22.0")
6262

63-
implementation("io.github.1c-syntax:bsl-common-library:0.10.0")
63+
implementation("io.github.1c-syntax:bsl-common-library:0.11.0")
6464
implementation("io.github.1c-syntax:utils:0.7.0")
6565
implementation("io.github.1c-syntax:supportconf:0.16.0")
6666

@@ -82,7 +82,7 @@ dependencies {
8282
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
8383

8484
// логирование
85-
testImplementation("org.slf4j:slf4j-reload4j:2.0.16")
85+
testImplementation("org.slf4j:slf4j-reload4j:2.0.17")
8686

8787
// бенчмарк
8888
jmh("org.openjdk.jmh:jmh-core:1.37")
@@ -238,7 +238,7 @@ tasks.register("precommit") {
238238
description = "Run all precommit tasks"
239239
group = "Developer tools"
240240
dependsOn(":test")
241-
dependsOn(":updateLicenses")
241+
dependsOn(":licenseFormat")
242242
}
243243

244244
jreleaser {

‎gradle/wrapper/gradle-wrapper.jar‎

2.73 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-9.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
2525
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
2626
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
27+
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
2728
import com.github._1c_syntax.bsl.mdo.support.CodeSeries;
2829
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
2930
import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -46,7 +47,7 @@
4647
@Builder(toBuilder = true)
4748
@ToString(of = {"name", "uuid"})
4849
@EqualsAndHashCode(of = {"name", "uuid"})
49-
public class Catalog implements ReferenceObject, AccessRightsOwner {
50+
public class Catalog implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
5051

5152
private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();
5253

@@ -103,6 +104,12 @@ public class Catalog implements ReferenceObject, AccessRightsOwner {
103104
* Свое
104105
*/
105106

107+
/**
108+
* Предопределенные значения
109+
*/
110+
@Singular
111+
List<PredefinedValue> predefinedValues;
112+
106113
/**
107114
* Пояснение
108115
*/

‎src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
2727
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
2828
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
29+
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
2930
import com.github._1c_syntax.bsl.mdo.support.CodeSeries;
3031
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
3132
import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -48,7 +49,7 @@
4849
@Builder(toBuilder = true)
4950
@ToString(of = {"name", "uuid"})
5051
@EqualsAndHashCode(of = {"name", "uuid"})
51-
public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner {
52+
public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
5253

5354
/*
5455
* ReferenceObject
@@ -105,6 +106,12 @@ public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner {
105106
* Свое
106107
*/
107108

109+
/**
110+
* Предопределенные значения
111+
*/
112+
@Singular
113+
List<PredefinedValue> predefinedValues;
114+
108115
/**
109116
* Признаки учета
110117
*/

‎src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
2525
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
2626
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
27+
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
2728
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
2829
import com.github._1c_syntax.bsl.mdo.support.RoleRight;
2930
import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
@@ -45,7 +46,7 @@
4546
@Builder(toBuilder = true)
4647
@ToString(of = {"name", "uuid"})
4748
@EqualsAndHashCode(of = {"name", "uuid"})
48-
public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwner {
49+
public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
4950

5051
/*
5152
* ReferenceObject
@@ -100,6 +101,12 @@ public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwn
100101
* Свое
101102
*/
102103

104+
/**
105+
* Предопределенные значения
106+
*/
107+
@Singular
108+
List<PredefinedValue> predefinedValues;
109+
103110
/**
104111
* Пояснение
105112
*/

‎src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
2525
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
2626
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
27+
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
2728
import com.github._1c_syntax.bsl.mdo.support.CodeSeries;
2829
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
2930
import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -48,7 +49,8 @@
4849
@Builder(toBuilder = true)
4950
@ToString(of = {"name", "uuid"})
5051
@EqualsAndHashCode(of = {"name", "uuid"})
51-
public class ChartOfCharacteristicTypes implements ReferenceObject, AccessRightsOwner, ValueTypeOwner {
52+
public class ChartOfCharacteristicTypes
53+
implements ReferenceObject, AccessRightsOwner, ValueTypeOwner, PredefinedDataOwner {
5254

5355
/*
5456
* ReferenceObject
@@ -111,6 +113,12 @@ public class ChartOfCharacteristicTypes implements ReferenceObject, AccessRights
111113
* Свое
112114
*/
113115

116+
/**
117+
* Предопределенные значения
118+
*/
119+
@Singular
120+
List<PredefinedValue> predefinedValues;
121+
114122
/**
115123
* Пояснение
116124
*/

‎src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
2525
import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
2626
import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
27+
import com.github._1c_syntax.bsl.mdo.children.PredefinedValue;
2728
import com.github._1c_syntax.bsl.mdo.support.AutoRecordType;
2829
import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
2930
import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -46,7 +47,7 @@
4647
@Builder(toBuilder = true)
4748
@ToString(of = {"name", "uuid"})
4849
@EqualsAndHashCode(of = {"name", "uuid"})
49-
public class ExchangePlan implements ReferenceObject, AccessRightsOwner {
50+
public class ExchangePlan implements ReferenceObject, AccessRightsOwner, PredefinedDataOwner {
5051

5152
private static final List<RoleRight> POSSIBLE_RIGHTS = computePossibleRights();
5253

@@ -103,6 +104,12 @@ public class ExchangePlan implements ReferenceObject, AccessRightsOwner {
103104
* Свое
104105
*/
105106

107+
/**
108+
* Предопределенные значения
109+
*/
110+
@Singular
111+
List<PredefinedValue> predefinedValues;
112+
106113
/**
107114
* Распределенная информационная база
108115
*/

0 commit comments

Comments
 (0)