Релиз v0.14.0

1c-syntax · Mar 12, 2024 · c1d49ca · c1d49ca
2 parents 404c71f + dfdf0d4
commit c1d49ca
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,6 +9,10 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      freefair:
+        patterns:
+          - "io.freefair.*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -23,7 +23,7 @@ jobs:
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v4.1.0
+      uses: actions/upload-artifact@v4.3.1
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,12 +9,12 @@ plugins {
     id("org.sonarqube") version "4.4.1.3373"
     id("org.cadixdev.licenser") version "0.6.1"
     id("me.qoomon.git-versioning") version "6.4.3"
-    id("io.freefair.lombok") version "8.4"
-    id("io.freefair.javadoc-links") version "8.4"
-    id("io.freefair.javadoc-utf-8") version "8.4"
-    id("io.freefair.maven-central.validate-poms") version "8.4"
-    id("com.github.ben-manes.versions") version "0.50.0"
-    id("ru.vyarus.pom") version "2.2.2"
+    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("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"
 }
 

diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java
@@ -76,7 +76,7 @@ public static Map<String, SupportVariant> readSimple(Path path) {
     var rootPath = getRootPathByParentConfigurations(path);
     var supportMap = SUPPORT_SIMPLE_MAPS.get(rootPath);
     if (supportMap == null && path.toFile().exists()) {
-      readFile(path, rootPath);
+      readFile(path, rootPath, false);
       supportMap = SUPPORT_SIMPLE_MAPS.get(rootPath);
     }
 
@@ -97,7 +97,7 @@ public static Map<String, Map<SupportConfiguration, SupportVariant>> readFull(Pa
     var rootPath = getRootPathByParentConfigurations(path);
     var supportMap = SUPPORT_MAPS.get(rootPath);
     if (supportMap == null && path.toFile().exists()) {
-      readFile(path, rootPath);
+      readFile(path, rootPath, true);
       supportMap = SUPPORT_MAPS.get(rootPath);
     }
 
@@ -125,17 +125,19 @@ public static SupportVariant getSupportVariantByMDO(String uuid, Path path) {
     return SupportVariant.NONE;
   }
 
-  private void readFile(Path pathToBinFile, Path rootPath) {
-    LOGGER.debug("Чтения файла поставки ParentConfigurations.bin");
+  private void readFile(Path pathToBinFile, Path rootPath, boolean fullRead) {
+    LOGGER.debug("Чтения файла поставки ParentConfigurations.bin, полное чтение = " + fullRead);
 
     try {
       var supportMap = read(pathToBinFile);
-      SUPPORT_MAPS.put(rootPath, supportMap);
-
-      Map<String, SupportVariant> result = new HashMap<>();
-      supportMap.forEach((String uuid, Map<SupportConfiguration, SupportVariant> supportVariantMap)
-        -> result.put(uuid, SupportVariant.max(supportVariantMap.values())));
-      SUPPORT_SIMPLE_MAPS.put(rootPath, result);
+      if(fullRead) {
+        SUPPORT_MAPS.put(rootPath, supportMap);
+      } else {
+        Map<String, SupportVariant> result = new HashMap<>();
+        supportMap.forEach((String uuid, Map<SupportConfiguration, SupportVariant> supportVariantMap)
+          -> result.put(uuid, SupportVariant.max(supportVariantMap.values())));
+        SUPPORT_SIMPLE_MAPS.put(rootPath, result);
+      }
     } catch (FileNotFoundException | NumberFormatException exception) {
       LOGGER.error(
         String.format("Ошибка чтения файла %s", pathToBinFile.toFile()));