Skip to content

Commit 9f29d6c

Browse files
authored
jdk 25 + дополнения по регистру бухии (#553)
* 1. поддержка сборки jdk 25 2. поддержка стандартного реквизита регистра бухгалтерии PeriodAdjustment * gradle 9 * license's rule
1 parent 11e938a commit 9f29d6c

27 files changed

Lines changed: 121 additions & 92 deletions

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
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', '21', '23']
11+
java_version: ['17', '21', '25']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
include:
1414
- os: windows-latest

build.gradle.kts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
`java-library`
66
`maven-publish`
77
jacoco
8-
id("org.cadixdev.licenser") version "0.6.1"
8+
id("cloud.rio.license") version "0.18.0"
99
id("me.qoomon.git-versioning") version "6.4.4"
1010
id("io.freefair.lombok") version "9.1.0"
1111
id("io.freefair.javadoc-links") version "9.1.0"
1212
id("io.freefair.javadoc-utf-8") version "9.1.0"
13-
id("io.freefair.maven-central.validate-poms") version "9.1.0"
13+
// id("io.freefair.maven-central.validate-poms") version "9.1.0" не работает на 9 градле
1414
id("com.github.ben-manes.versions") version "0.53.0"
1515
id("ru.vyarus.pom") version "3.0.0"
1616
id("org.jreleaser") version "1.21.0"
@@ -79,6 +79,7 @@ dependencies {
7979

8080
// логирование
8181
testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
82+
testRuntimeOnly("org.junit.platform", "junit-platform-launcher", "6.1.0-M1")
8283

8384
// бенчмарк
8485
jmh("org.openjdk.jmh:jmh-core:1.37")
@@ -168,20 +169,14 @@ artifacts {
168169
}
169170

170171
license {
171-
header(rootProject.file("license/HEADER.txt"))
172-
newLine(false)
172+
header = rootProject.file("license/HEADER.txt")
173+
skipExistingHeaders = false
174+
strictCheck = true
173175
ext["year"] = "2019 - " + Calendar.getInstance().get(Calendar.YEAR)
174176
ext["name"] = "Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com>"
175177
ext["project"] = "MDClasses"
176-
exclude("**/*.yml")
177-
exclude("**/*.bin")
178-
exclude("**/*.html")
179-
exclude("**/*.properties")
180-
exclude("**/*.xml")
181-
exclude("**/*.json")
182-
exclude("**/*.os")
183-
exclude("**/*.bsl")
184-
exclude("**/*.orig")
178+
mapping("java", "SLASHSTAR_STYLE")
179+
include("**/*.java")
185180
}
186181

187182

gradle/wrapper/gradle-wrapper.jar

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

gradlew

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

gradlew.bat

Lines changed: 1 addition & 2 deletions
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/reader/common/context/std_attributes/StdAtrInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public class StdAtrInfo {
9595
public static final StdAtrInfo TYPE = new StdAtrInfo("Type", "Тип", StdAtrInfo::computeType);
9696
public static final StdAtrInfo CALCULATION_TYPE = new StdAtrInfo("CalculationType", "ВидРасчета", StdAtrInfo::computeCalculationType);
9797
public static final StdAtrInfo EXCHANGE_DATE = new StdAtrInfo("ExchangeDate", "ДатаОбмена", DATETIME_TYPE);
98-
98+
public static final StdAtrInfo PERIOD_ADJUSTMENT = new StdAtrInfo("PeriodAdjustment", "УточнениеПериода", NUMBER_TYPE);
9999

100100
String nameEn;
101101
String nameRu;

src/main/java/com/github/_1c_syntax/bsl/reader/common/context/std_attributes/StdAttributeFiller.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ private static Map<MDOType, List<StdAtrInfo>> computeRegistry() {
106106
StdAtrInfo.PERIOD,
107107
StdAtrInfo.RECORDER,
108108
StdAtrInfo.ACCOUNT,
109-
StdAtrInfo.RECORD_TYPE
109+
StdAtrInfo.RECORD_TYPE,
110+
StdAtrInfo.PERIOD_ADJUSTMENT
110111
)
111112
);
112113

src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ValueTypeDescriptionConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
5353
} else if (nodeName.endsWith("Qualifiers")) {
5454
qualifiers.add(ExtendXStream.readValue(context, Qualifier.class));
5555
} else { // что-то еще
56-
LOGGER.warn("Unknown type description field {}", nodeName);
56+
var path = ExtendXStream.getCurrentPath(reader);
57+
LOGGER.warn("Unknown type description field {} on {}", nodeName, path);
5758
}
5859
reader.moveUp();
5960
}

src/test/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ void testFullMdclasses(ArgumentsAccessor argumentsAccessor) {
204204
checkChildrenMdclasses(cf);
205205

206206
assertThat(cf.getPlainChildren())
207-
.hasSize(222 + cf.getInterfaces().size() + cf.getStyles().size())
207+
.hasSize(223 + cf.getInterfaces().size() + cf.getStyles().size())
208208
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NONE));
209209

210210
assertThat(cf.getModules().stream().filter(Module::isProtected)).isEmpty();
@@ -241,7 +241,7 @@ void testFullExt() {
241241
checkChildrenOrder(cf);
242242

243243
assertThat(cf.getPlainChildren())
244-
.hasSize(328)
244+
.hasSize(330)
245245
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NONE));
246246

247247
assertThat(cf.getAllModules().stream().filter(Module::isProtected)).isEmpty();

0 commit comments

Comments
 (0)