Merge pull request #487 from 1c-syntax/feature/bumpAndFix250102

Небольшие правки и обновление зависимостей

Author: theshadowco

.github/workflows/check.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '20']
+        java_version: ['17', '21']
         os: [ubuntu-latest, windows-latest, macOS-latest]
         include:
           - os: windows-latest
@@ -29,13 +29,27 @@ jobs:
         distribution: 'liberica'
     - name: Build with Gradle
       run: ./gradlew check --stacktrace
-    - name: Archive test results
-      if: always() && matrix.prefix == 'nix'
-      uses: EnricoMi/publish-unit-test-result-action@v2
+    - name: Upload Test Results
+      if: always()
+      uses: actions/upload-artifact@v4
       with:
-        junit_files: "**/test-results/test/**/*.xml"
-    - name: Archive test results
-      if: always() && matrix.prefix != 'nix'
-      uses: EnricoMi/publish-unit-test-result-action/composite@v2
-      with:
-        junit_files: "**/test-results/test/**/*.xml"
+          name: Test Results (Java ${{ matrix.java_version }}.${{ matrix.os }})
+          path: "**/test-results/test/**/*.xml"
+  publish-test-results:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: read
+      issues: read
+    if: always()
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          junit_files: "artifacts/**/*.xml"

.gitignore

@@ -16,3 +16,5 @@ Gradle_*.xml
 /.idea/material_theme_project_new.xml
 *.hprof
 *.hprof.idom
+*.cf
+**/ConfigDumpInfo.xml

build.gradle.kts

@@ -39,43 +39,40 @@ val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
 repositories {
     mavenLocal()
     mavenCentral()
-    maven(url = "https://jitpack.io")
     maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
 }
 
 dependencies {
 
     implementation("org.apache.commons", "commons-collections4", "4.4")
 
-    // https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream
-    implementation("com.thoughtworks.xstream", "xstream", "1.4.20")
+    implementation("com.thoughtworks.xstream", "xstream", "1.4.21")
 
     // логирование
     implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1")
 
     // прочее
-    implementation("commons-io", "commons-io", "2.8.0")
-    implementation("io.github.1c-syntax", "utils", "0.6.1")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.7.0")
-    implementation("io.github.1c-syntax", "supportconf", "0.14.0") {
+    implementation("commons-io", "commons-io", "2.18.0")
+    implementation("io.github.1c-syntax", "utils", "0.6.2")
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.8.0-rc.1")
+    implementation("io.github.1c-syntax", "supportconf", "0.14.1") {
         exclude("io.github.1c-syntax", "bsl-common-library")
     }
 
     // быстрый поиск классов
-    implementation("io.github.classgraph", "classgraph", "4.8.147")
+    implementation("io.github.classgraph", "classgraph", "4.8.179")
 
     // тестирование
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.7.0")
-    testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.7.0")
-    testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.7.0")
-    testImplementation("org.assertj", "assertj-core", "3.18.1")
-    testImplementation("com.ginsberg", "junit5-system-exit", "1.0.0")
-    testImplementation("org.skyscreamer", "jsonassert", "1.5.0")
-    testImplementation("org.objenesis", "objenesis", "3.2")
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
+    testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
+    testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.11.4")
+    testImplementation("org.assertj", "assertj-core", "3.27.0")
+    testImplementation("com.ginsberg", "junit5-system-exit", "2.0.2")
+    testImplementation("org.skyscreamer", "jsonassert", "1.5.3")
+    testImplementation("org.objenesis", "objenesis", "3.4")
 
     // логирование
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
-    testImplementation("org.slf4j", "slf4j-log4j12", "2.1.0-alpha1")
+    testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
 }
 
 java {

src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of MDClasses.
  *
- * Copyright (c) 2019 - 2024
+ * Copyright (c) 2019 - 2025
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -27,6 +27,7 @@
 import com.github._1c_syntax.bsl.mdo.ModuleOwner;
 import com.github._1c_syntax.bsl.mdo.Subsystem;
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
+import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
 import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.mdo.support.UsePurposes;
 import com.github._1c_syntax.bsl.support.CompatibilityMode;
@@ -51,6 +52,11 @@ public interface CF extends MDClass, ConfigurationTree, CFAccess {
    */
   ScriptVariant getScriptVariant();
 
+  /**
+   * Вид интерфейса
+   */
+  InterfaceCompatibilityMode getInterfaceCompatibilityMode();
+
   /**
    * Режим совместимости
    */

src/main/java/com/github/_1c_syntax/bsl/mdclasses/CFAccess.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of MDClasses.
  *
- * Copyright (c) 2019 - 2024
+ * Copyright (c) 2019 - 2025
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of MDClasses.
  *
- * Copyright (c) 2019 - 2024
+ * Copyright (c) 2019 - 2025
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -57,6 +57,7 @@
 import com.github._1c_syntax.bsl.mdo.Language;
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.mdo.Module;
+import com.github._1c_syntax.bsl.mdo.PaletteColor;
 import com.github._1c_syntax.bsl.mdo.Report;
 import com.github._1c_syntax.bsl.mdo.Role;
 import com.github._1c_syntax.bsl.mdo.ScheduledJob;
@@ -72,6 +73,7 @@
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
+import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
 import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -88,7 +90,6 @@
 import lombok.Builder;
 import lombok.Builder.Default;
 import lombok.EqualsAndHashCode;
-import lombok.NonNull;
 import lombok.Singular;
 import lombok.ToString;
 import lombok.Value;
@@ -105,7 +106,6 @@
 @Builder
 @ToString(of = {"name", "uuid"})
 @EqualsAndHashCode(of = {"name", "uuid"})
-@NonNull
 public class Configuration implements CF {
 
   /**
@@ -140,6 +140,8 @@ public class Configuration implements CF {
   @Default
   ScriptVariant scriptVariant = ScriptVariant.ENGLISH;
   @Default
+  InterfaceCompatibilityMode interfaceCompatibilityMode = InterfaceCompatibilityMode.VERSION_8_2;
+  @Default
   CompatibilityMode compatibilityMode = new CompatibilityMode();
   @Default
   CompatibilityMode configurationExtensionCompatibilityMode = new CompatibilityMode();
@@ -208,6 +210,8 @@ public class Configuration implements CF {
   @Singular
   List<StyleItem> styleItems;
   @Singular
+  List<PaletteColor> paletteColors;
+  @Singular
   List<Style> styles;
   @Singular
   List<Language> languages;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of MDClasses.
  *
- * Copyright (c) 2019 - 2024
+ * Copyright (c) 2019 - 2025
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -57,6 +57,7 @@
 import com.github._1c_syntax.bsl.mdo.Language;
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.mdo.Module;
+import com.github._1c_syntax.bsl.mdo.PaletteColor;
 import com.github._1c_syntax.bsl.mdo.Report;
 import com.github._1c_syntax.bsl.mdo.Role;
 import com.github._1c_syntax.bsl.mdo.ScheduledJob;
@@ -72,6 +73,7 @@
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.ConfigurationExtensionPurpose;
+import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
 import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -131,6 +133,8 @@ public class ConfigurationExtension implements CF {
   @Default
   ScriptVariant scriptVariant = ScriptVariant.ENGLISH;
   @Default
+  InterfaceCompatibilityMode interfaceCompatibilityMode = InterfaceCompatibilityMode.VERSION_8_2;
+  @Default
   CompatibilityMode compatibilityMode = new CompatibilityMode();
   @Default
   CompatibilityMode configurationExtensionCompatibilityMode = new CompatibilityMode();
@@ -199,6 +203,8 @@ public class ConfigurationExtension implements CF {
   @Singular
   List<StyleItem> styleItems;
   @Singular
+  List<PaletteColor> paletteColors;
+  @Singular
   List<Style> styles;
   @Singular
   List<Language> languages;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTree.java

@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.mdclasses;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2025
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.mdclasses;
 
 import com.github._1c_syntax.bsl.mdo.AccountingRegister;
 import com.github._1c_syntax.bsl.mdo.AccumulationRegister;
@@ -55,6 +55,7 @@
 import com.github._1c_syntax.bsl.mdo.IntegrationService;
 import com.github._1c_syntax.bsl.mdo.Interface;
 import com.github._1c_syntax.bsl.mdo.Language;
+import com.github._1c_syntax.bsl.mdo.PaletteColor;
 import com.github._1c_syntax.bsl.mdo.Report;
 import com.github._1c_syntax.bsl.mdo.Role;
 import com.github._1c_syntax.bsl.mdo.ScheduledJob;
@@ -400,6 +401,18 @@ default Optional<StyleItem> findStyleItem(Predicate<? super StyleItem> predicate
     return getStyleItems().stream().filter(predicate).findFirst();
   }
 
+  /**
+   * Цвет палитры
+   */
+  List<PaletteColor> getPaletteColors();
+
+  /**
+   * Поиск элемента стиля по условию
+   */
+  default Optional<PaletteColor> findPaletteColor(Predicate<? super PaletteColor> predicate) {
+    return getPaletteColors().stream().filter(predicate).findFirst();
+  }
+
   /**
    * Стили
    */

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of MDClasses.
  *
- * Copyright (c) 2019 - 2024
+ * Copyright (c) 2019 - 2025
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of MDClasses.
  *
- * Copyright (c) 2019 - 2024
+ * Copyright (c) 2019 - 2025
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later