Skip to content

Commit c1d49ca

Browse files
committed
Релиз v0.14.0
2 parents 404c71f + dfdf0d4 commit c1d49ca

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12+
groups:
13+
freefair:
14+
patterns:
15+
- "io.freefair.*"
1216
- package-ecosystem: "github-actions"
1317
directory: "/"
1418
schedule:

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: ./gradlew check --stacktrace
2424
- name: Archive test results
2525
if: failure()
26-
uses: actions/upload-artifact@v4.1.0
26+
uses: actions/upload-artifact@v4.3.1
2727
with:
2828
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
2929
path: build/reports/tests/test

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ plugins {
99
id("org.sonarqube") version "4.4.1.3373"
1010
id("org.cadixdev.licenser") version "0.6.1"
1111
id("me.qoomon.git-versioning") version "6.4.3"
12-
id("io.freefair.lombok") version "8.4"
13-
id("io.freefair.javadoc-links") version "8.4"
14-
id("io.freefair.javadoc-utf-8") version "8.4"
15-
id("io.freefair.maven-central.validate-poms") version "8.4"
16-
id("com.github.ben-manes.versions") version "0.50.0"
17-
id("ru.vyarus.pom") version "2.2.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"
16+
id("com.github.ben-manes.versions") version "0.51.0"
17+
id("ru.vyarus.pom") version "3.0.0"
1818
id("io.codearte.nexus-staging") version "0.30.0"
1919
}
2020

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static Map<String, SupportVariant> readSimple(Path path) {
7676
var rootPath = getRootPathByParentConfigurations(path);
7777
var supportMap = SUPPORT_SIMPLE_MAPS.get(rootPath);
7878
if (supportMap == null && path.toFile().exists()) {
79-
readFile(path, rootPath);
79+
readFile(path, rootPath, false);
8080
supportMap = SUPPORT_SIMPLE_MAPS.get(rootPath);
8181
}
8282

@@ -97,7 +97,7 @@ public static Map<String, Map<SupportConfiguration, SupportVariant>> readFull(Pa
9797
var rootPath = getRootPathByParentConfigurations(path);
9898
var supportMap = SUPPORT_MAPS.get(rootPath);
9999
if (supportMap == null && path.toFile().exists()) {
100-
readFile(path, rootPath);
100+
readFile(path, rootPath, true);
101101
supportMap = SUPPORT_MAPS.get(rootPath);
102102
}
103103

@@ -125,17 +125,19 @@ public static SupportVariant getSupportVariantByMDO(String uuid, Path path) {
125125
return SupportVariant.NONE;
126126
}
127127

128-
private void readFile(Path pathToBinFile, Path rootPath) {
129-
LOGGER.debug("Чтения файла поставки ParentConfigurations.bin");
128+
private void readFile(Path pathToBinFile, Path rootPath, boolean fullRead) {
129+
LOGGER.debug("Чтения файла поставки ParentConfigurations.bin, полное чтение = " + fullRead);
130130

131131
try {
132132
var supportMap = read(pathToBinFile);
133-
SUPPORT_MAPS.put(rootPath, supportMap);
134-
135-
Map<String, SupportVariant> result = new HashMap<>();
136-
supportMap.forEach((String uuid, Map<SupportConfiguration, SupportVariant> supportVariantMap)
137-
-> result.put(uuid, SupportVariant.max(supportVariantMap.values())));
138-
SUPPORT_SIMPLE_MAPS.put(rootPath, result);
133+
if(fullRead) {
134+
SUPPORT_MAPS.put(rootPath, supportMap);
135+
} else {
136+
Map<String, SupportVariant> result = new HashMap<>();
137+
supportMap.forEach((String uuid, Map<SupportConfiguration, SupportVariant> supportVariantMap)
138+
-> result.put(uuid, SupportVariant.max(supportVariantMap.values())));
139+
SUPPORT_SIMPLE_MAPS.put(rootPath, result);
140+
}
139141
} catch (FileNotFoundException | NumberFormatException exception) {
140142
LOGGER.error(
141143
String.format("Ошибка чтения файла %s", pathToBinFile.toFile()));

0 commit comments

Comments
 (0)