From 9ca6deff63a772a341e4e21dbaab3d468fc30fce Mon Sep 17 00:00:00 2001 From: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com> Date: Thu, 5 Sep 2024 00:08:35 +0300 Subject: [PATCH 01/10] Update ci-build.yml - added manual build running --- .github/workflows/ci-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index ab8fd6f5..b1ced8d8 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -1,6 +1,7 @@ name: CI on: + workflow_dispatch: push: branches: - master From d038f654cbe24f9836396ea1b284a1bebe40675f Mon Sep 17 00:00:00 2001 From: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com> Date: Thu, 5 Sep 2024 00:12:00 +0300 Subject: [PATCH 02/10] Update ci-build.yml - fix temporary solution --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b1ced8d8..8a04abd2 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -15,7 +15,7 @@ jobs: name: Build # This build will run on master,release/* push, local PR and PR from forks without label Analyze if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name || !contains(github.event.pull_request.labels.*.name, 'Analyze') - uses: 1C-company/v8-code-style/.github/workflows/build.yml@edt-2024-1 + uses: 1C-company/v8-code-style/.github/workflows/build.yml@master with: analyze: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name }} secrets: From 4e697801f696b8e3e756176c0c3adc37ea2a4d56 Mon Sep 17 00:00:00 2001 From: Maxim Dzyuba Date: Thu, 5 Sep 2024 01:51:30 +0300 Subject: [PATCH 03/10] G5V8DT-25485 --- bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF | 2 +- tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF | 2 +- tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF | 2 +- tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF index 3b0ce22d..fc889980 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -38,7 +38,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0 com._1c.g5.v8.dt.core.filesystem;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.model;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.form.model;version="[11.1.0,12.0.0)", + com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.lcore.nodemodel.util;version="[1.0.0,2.0.0)", com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index 4bdd5138..e697bc44 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -36,7 +36,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)", + com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.lcore.util;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.6.0,4.0.0)", diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF index 4f1c92c0..de6d9596 100644 --- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.dcs.model.core;version="[2.6.0,3.0.0)", com._1c.g5.v8.dt.dcs.model.schema;version="[2.2.0,3.0.0)", com._1c.g5.v8.dt.dcs.model.settings;version="[3.2.0,4.0.0)", - com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)", + com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.form.model.util;version="[7.2.0,8.0.0)", com._1c.g5.v8.dt.form.service;version="[8.0.0,9.0.0)", com._1c.g5.v8.dt.form.service.datasourceinfo;version="[3.0.0,4.0.0)", diff --git a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF index 171cc967..f5a273d6 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)", + com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.md.naming;version="[5.1.0,6.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", com._1c.g5.v8.dt.validation.marker;version="[9.0.0,10.0.0)", diff --git a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF index fcdfa282..47215f16 100644 --- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-Localization: fragment Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)", + com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.form.naming;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", diff --git a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF index d9f95472..1e6d39da 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-Localization: fragment Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.dcs.util;version="[14.0.0,15.0.0)", - com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)", + com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.testing;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.validation.marker;version="[9.0.0,10.0.0)", From 67afef80358fffcf86522e267ca678676de5c1e0 Mon Sep 17 00:00:00 2001 From: Vadim Geraskin Date: Tue, 1 Oct 2024 13:10:23 +0700 Subject: [PATCH 04/10] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsl/strict/check/messages_ru.properties | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/messages_ru.properties b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/messages_ru.properties index 734a6370..73d50767 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/messages_ru.properties +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/messages_ru.properties @@ -16,11 +16,11 @@ AbstractDynamicFeatureAccessTypeCheck_Skip_source_object_types = Если объ DocCommentFieldTypeCheck_Field__N__has_no_type_definition = Поле "{0}" не имеет определения типа -DocCommentFieldTypeCheck_description = Система строгой типизации кода проверяет что поле документирующего комментария имеет описание типа +DocCommentFieldTypeCheck_description = Система строгой типизации кода проверяет, что поле документирующего комментария имеет описание типа DocCommentFieldTypeCheck_title = Поле документирующего комментария имеет описание типа -DynamicFeatureAccessMethodNotFoundCheck_description = Система строгой типизации кода проверяет что динамически вызываемый метод существует в объекте +DynamicFeatureAccessMethodNotFoundCheck_description = Система строгой типизации кода проверяет, что динамически вызываемый метод существует в объекте DynamicFeatureAccessMethodNotFoundCheck_title = Метод в объекте не найден @@ -28,11 +28,11 @@ DynamicFeatureAccessTypeCheck_Feature_access_M_has_no_return_type = Свойст DynamicFeatureAccessTypeCheck_Method_M_not_found_in_accessed_object = Метод "{0}" не найден в исходном объекте -DynamicFeatureAccessTypeCheck_description = Система строгой типизации кода проверяет что динамическое свойство объекта имеет тип возвращаемого значения +DynamicFeatureAccessTypeCheck_description = Система строгой типизации кода проверяет, что динамическое свойство объекта имеет тип возвращаемого значения DynamicFeatureAccessTypeCheck_title = Свойство объекта имеет тип возвращаемого значения -FunctionCtorReturnSectionCheck_Declared_property__N__with_type__T__missing_returning_types__M = Декларируемое свойство "{0}" с типом: "{1}" не содержит возвращемые типы "{2}" +FunctionCtorReturnSectionCheck_Declared_property__N__with_type__T__missing_returning_types__M = Декларируемое свойство "{0}" с типом: "{1}" не содержит возвращаемые типы "{2}" FunctionCtorReturnSectionCheck_Declared_property__N__with_type__T__not_returning = Декларируемое свойство "{0}" с типом: "{1}" не возвращается @@ -42,25 +42,25 @@ FunctionCtorReturnSectionCheck_Return_non_declared_type__T = Возвращае FunctionCtorReturnSectionCheck_User_extandable_Data_type_list_comma_separated = Список типов данных расширяемых пользователем, через запятую -FunctionCtorReturnSectionCheck_description = Система строгой типизации кода проверяет что возвращаемые значения функции эквивалентны секции возвращаемого значения документирующего комментария +FunctionCtorReturnSectionCheck_description = Система строгой типизации кода проверяет, что возвращаемые значения функции эквивалентны секции возвращаемого значения документирующего комментария FunctionCtorReturnSectionCheck_title = Секция возвращаемого значения функции-конструктора данных FunctionReturnTypeCheck_Function_has_no_return_value_type = Функция не имеет типа возвращаемого значения -FunctionReturnTypeCheck_description = Система строгой типизации кода проверяет что каждая функция возвращает типизированное значение +FunctionReturnTypeCheck_description = Система строгой типизации кода проверяет, что каждая функция возвращает типизированное значение FunctionReturnTypeCheck_title = Функция возвращает типизированное значение InvocationParamIntersectionCheck_Allow_dynamic_types_check_for_local_method_call = Разрешить проверку динамических типов для вызова локального метода -InvocationParamIntersectionCheck_description = Система строгой типизации кода проверяет что тип вызываемого выражения пересекается с типом параметра вызываемого метода +InvocationParamIntersectionCheck_description = Система строгой типизации кода проверяет, что тип вызываемого выражения пересекается с типом параметра вызываемого метода InvocationParamIntersectionCheck_title = Вызываемый тип пересекается с типом параметра MethodParamTypeCheck_Method_param_N_has_no_value_type = Параметр метода "{0}" не имеет типа значения -MethodParamTypeCheck_description = Система строгой типизации кода проверяет что каждый параметр метода имеет тип значения +MethodParamTypeCheck_description = Система строгой типизации кода проверяет, что каждый параметр метода имеет тип значения MethodParamTypeCheck_title = Параметр метода имеет тип @@ -68,7 +68,7 @@ SimpleStatementTypeCheck_Allow_local_Variable_reset_to_Undefined_type = Разр SimpleStatementTypeCheck_Value_type_N_changed_to_M = Тип значения "{0}" заменен на "{1}" -SimpleStatementTypeCheck_description = Система строгой типизации кода проверяет что утверждение (строка присвоения значения) меняет тип +SimpleStatementTypeCheck_description = Система строгой типизации кода проверяет, что утверждение (строка присвоения значения) меняет тип SimpleStatementTypeCheck_title = Утверждение меняет тип @@ -80,7 +80,7 @@ StructureCtorValueTypeCheck_Structure_key__N__K__has_no_default_value_initialize StructureCtorValueTypeCheck_Structure_key__N__K__value_initialized_with_empty_types = Ключ {0} "{1}" Структуры инициализируется с пустым типом -StructureCtorValueTypeCheck_description = Проверяет строковый литерал в конструкторе структуры что каждый ключ имеет типзированное значение +StructureCtorValueTypeCheck_description = Проверяет строковый литерал в конструкторе структуры, что каждый ключ имеет типзированное значение StructureCtorValueTypeCheck_title = Типизация значений в конструкторе структуры @@ -106,6 +106,6 @@ TypedValueAddingToUntypedCollectionCheck_title = Добавление типиз VariableTypeCheck_Variable_M_has_no_value_type = Переменная "{0}" не имеет типа -VariableTypeCheck_description = Система строгой типизации кода проверяет что каждая переменная имеет тип значения +VariableTypeCheck_description = Система строгой типизации кода проверяет, что каждая переменная имеет тип значения VariableTypeCheck_title = Переменная имеет тип значения From 108c117b1779583dd9aba2b2bc4613ae1f54cdf4 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Mon, 25 Nov 2024 19:06:21 +0300 Subject: [PATCH 05/10] =?UTF-8?q?G5V8DT-24085=20DcsOutputParameters=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D1=82=20=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versioning --- tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF index 1e6d39da..0af2145e 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.dcs.util;version="[14.0.0,15.0.0)", + com._1c.g5.v8.dt.dcs.util;version="[15.0.0,16.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.testing;version="[3.0.0,4.0.0)", From ef241f2368b23b8a523cdae5442d3551225dc760 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Thu, 28 Nov 2024 15:47:12 +0300 Subject: [PATCH 06/10] =?UTF-8?q?G5V8DT-26116=20=D0=9F=D1=80=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9=20=D0=B8=D0=B7=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BE=D0=B1=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModuleStructurePropertyPage.java | 3 ++- ...tructureNewWizardRelatedModelsFactory.java | 23 +++++++++++++------ .../bsl/IModuleStructureProvider.java | 4 +++- .../internal/bsl/ModuleStructureProvider.java | 9 ++++++-- .../templates/en/common_module_reusable.bsl | 12 ++++++++++ .../templates/ru/common_module_reusable.bsl | 12 ++++++++++ .../ModuleStructurePropertyPageTest.java | 17 +++++++------- 7 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl create mode 100644 bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java index 0b7cd12a..c0beaa11 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java @@ -195,7 +195,8 @@ public class ModuleStructurePropertyPage return; } ScriptVariant script = v8Project.getScriptVariant(); - Supplier content = moduleStructureProvider.getModuleStructureTemplate(getProject(), type, script); + Supplier content = + moduleStructureProvider.getModuleStructureTemplate(getProject(), type, false, script); if (content == null) { return; diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java index 3e73d30c..58147287 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java @@ -35,6 +35,8 @@ import com._1c.g5.v8.dt.common.PreferenceUtils; import com._1c.g5.v8.dt.common.StringUtils; import com._1c.g5.v8.dt.core.filesystem.IQualifiedNameFilePathConverter; import com._1c.g5.v8.dt.metadata.mdclass.AbstractForm; +import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; +import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse; import com._1c.g5.v8.dt.metadata.mdclass.ScriptVariant; import com._1c.g5.v8.dt.ui.wizards.IDtNewWizardContext; import com.e1c.v8codestyle.bsl.IModuleStructureProvider; @@ -85,15 +87,22 @@ public class ModuleStructureNewWizardRelatedModelsFactory { formToAddModule = (AbstractForm)model; } - else if (model instanceof Module) + else if (model instanceof Module module) { formToAddModule = null; - Module module = (Module)model; IFile bslFile = getModuleFile(module); if (bslFile != null) { ModuleType type = BslUtil.computeModuleType(module, qualifiedNameFilePathConverter); - createOrUpdateModule(bslFile, type, context); + if (type == ModuleType.COMMON_MODULE && context.getModel() instanceof CommonModule commonModule) + { + createOrUpdateModule(bslFile, ModuleType.COMMON_MODULE, + commonModule.getReturnValuesReuse() != ReturnValuesReuse.DONT_USE, context); + } + else + { + createOrUpdateModule(bslFile, type, false, context); + } } } } @@ -103,7 +112,7 @@ public class ModuleStructureNewWizardRelatedModelsFactory IFile bslFile = getModuleFile(formToAddModule, project); if (bslFile != null) { - createOrUpdateModule(bslFile, ModuleType.FORM_MODULE, context); + createOrUpdateModule(bslFile, ModuleType.FORM_MODULE, false, context); EObject module = createBslProxyModule(bslFile); createdModels.add(module); @@ -111,11 +120,12 @@ public class ModuleStructureNewWizardRelatedModelsFactory } } - private void createOrUpdateModule(IFile bslFile, ModuleType type, IDtNewWizardContext context) + private void createOrUpdateModule(IFile bslFile, ModuleType type, boolean reusableModule, + IDtNewWizardContext context) { ScriptVariant script = context.getV8project().getScriptVariant(); Supplier content = - moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, script); + moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, reusableModule, script); if (content == null) { return; @@ -178,5 +188,4 @@ public class ModuleStructureNewWizardRelatedModelsFactory UiPlugin.log(status); } } - } diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java index 3c9c2ec8..1eb41c05 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java @@ -54,11 +54,13 @@ public interface IModuleStructureProvider * * @param project the project, cannot be {@code null}. * @param moduleType the module type, cannot be {@code null}. + * @param reusableModule module is reusable common module. * @param script the script, cannot be {@code null}. * @return the module structure template supplier of input stream, may return {@code null} if there is no template * for such module type and script variant. */ - Supplier getModuleStructureTemplate(IProject project, ModuleType moduleType, ScriptVariant script); + Supplier getModuleStructureTemplate(IProject project, ModuleType moduleType, boolean reusableModule, + ScriptVariant script); /** * Gets the module structure top regions in order of as they should be in module. diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java index e67268af..cc88533e 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java @@ -53,6 +53,8 @@ public class ModuleStructureProvider private static final String FOLDER_EN = "/templates/en/"; //$NON-NLS-1$ + private static final String REUSABLE_SUFFIX = "_reusable"; //$NON-NLS-1$ + private static final IPath FOLDER_SETTINGS = new org.eclipse.core.runtime.Path(".settings/templates"); //$NON-NLS-1$ @Override @@ -68,9 +70,8 @@ public class ModuleStructureProvider @Override public Supplier getModuleStructureTemplate(IProject project, ModuleType moduleType, - ScriptVariant script) + boolean reusableModule, ScriptVariant script) { - if (moduleType == null || script == null) { return null; @@ -78,6 +79,10 @@ public class ModuleStructureProvider StringBuilder sb = new StringBuilder(); sb.append(moduleType.getName().toLowerCase()); + if (reusableModule) + { + sb.append(REUSABLE_SUFFIX); + } sb.append("."); //$NON-NLS-1$ sb.append(BSL_FILE_EXTENSION); diff --git a/bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl b/bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl new file mode 100644 index 00000000..a65ab195 --- /dev/null +++ b/bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl @@ -0,0 +1,12 @@ + +#Region Internal + +// Enter code here. + +#EndRegion + +#Region Private + +// Enter code here. + +#EndRegion diff --git a/bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl b/bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl new file mode 100644 index 00000000..ed9847cf --- /dev/null +++ b/bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl @@ -0,0 +1,12 @@ + +#Область СлужебныйПрограммныйИнтерфейс + +// Код процедур и функций + +#КонецОбласти + +#Область СлужебныеПроцедурыИФункции + +// Код процедур и функций + +#КонецОбласти diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java index 004f6571..bc048187 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java @@ -69,8 +69,7 @@ public class ModuleStructurePropertyPageTest private static final String EDTOR_TITLE = "/" + PROJECT_NAME + "/" + SETTINGS_TEMPLATES_COMMON_MODULE_BSL; - private static final String PROPERTY_PAGE_ID = - "com.e1c.v8codestyle.bsl.ui.properties.moduleStructurePropertyPage"; + private static final String PROPERTY_PAGE_ID = "com.e1c.v8codestyle.bsl.ui.properties.moduleStructurePropertyPage"; @Rule public TestingWorkspace testingWorkspace = new TestingWorkspace(true, false); @@ -130,13 +129,14 @@ public class ModuleStructurePropertyPageTest { IModuleStructureProvider moduleStructureProvider = ServiceAccess.get(IModuleStructureProvider.class); - Supplier templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, - ModuleType.COMMON_MODULE, null); + Supplier templateProvider = + moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, null); assertNull(templateProvider); - templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, null, ScriptVariant.ENGLISH); + templateProvider = + moduleStructureProvider.getModuleStructureTemplate(project, null, false, ScriptVariant.ENGLISH); assertNull(templateProvider); - templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, - ModuleType.COMMON_MODULE, ScriptVariant.ENGLISH); + templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, + ScriptVariant.ENGLISH); assertNotNull(templateProvider); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); @@ -167,7 +167,6 @@ public class ModuleStructurePropertyPageTest waitEventSetnd(dialog); assertTrue(buttonOpen.isEnabled()); - buttonOpen.notifyListeners(SWT.Selection, new Event()); assertNull(dialog.getShell()); waitEventSetnd(); @@ -199,7 +198,7 @@ public class ModuleStructurePropertyPageTest file.setContents(in, true, true, new NullProgressMonitor()); } - templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, + templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, ScriptVariant.ENGLISH); try (InputStream template = templateProvider.get(); From 56009d6559084db12d7e868f055d9405dd12ae7a Mon Sep 17 00:00:00 2001 From: Alexander Tretyakevich Date: Fri, 29 Nov 2024 15:13:06 +0700 Subject: [PATCH 07/10] Update build.yml Removed wrong goal from maven build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34730850..eb0c305f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: run: | Xvfb :5 -screen 0 1280x1024x8 -fbdir /tmp & export DISPLAY=:5 - mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -X -B -V 1C + mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -X -B -V - name: Cache SonarCloud packages uses: actions/cache@v2 From a3a940aae51290e7991ac7d1f9feb5c44e7e44f2 Mon Sep 17 00:00:00 2001 From: Alexander Tretyakevich Date: Fri, 29 Nov 2024 15:33:14 +0700 Subject: [PATCH 08/10] Update build.yml Removed verbose output --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb0c305f..cfd63c0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: run: | Xvfb :5 -screen 0 1280x1024x8 -fbdir /tmp & export DISPLAY=:5 - mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -X -B -V + mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -B -V - name: Cache SonarCloud packages uses: actions/cache@v2 From 81753c6740b7efec7030862f7d5aa4e68104167c Mon Sep 17 00:00:00 2001 From: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com> Date: Thu, 19 Dec 2024 02:16:00 +0300 Subject: [PATCH 09/10] =?UTF-8?q?G5V8DT-25625=20=D0=9F=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=B8=D0=B1=D0=BA=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA=D1=81=D0=BE=D0=B2?= =?UTF-8?q?=20(#1478)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Поднятие версий --- bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF | 4 ++-- bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF | 2 +- tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF index 95fe8977..fb2af3d9 100644 --- a/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", com.e1c.v8codestyle.autosort;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF index 5c8d0d47..6fb8ee9b 100644 --- a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Import-Package: com._1c.g5.v8.activitytracking.core;version="[1.0.0,2.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com.e1c.g5.v8.dt.cli.api;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.cli.api.components;version="[3.0.0,4.0.0)", com.e1c.v8codestyle;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF index 420bf1a1..f9a14fa4 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -42,7 +42,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0 com._1c.g5.v8.dt.lcore.nodemodel.util;version="[1.0.0,2.0.0)", com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.theming.ui.util;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.ui.util;version="[8.0.0,9.0.0)", com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index 222a7f1e..8910cc30 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.lcore.util;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.6.0,4.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)", com._1c.g5.wiring;version="[2.0.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF index 35ba93e1..1ffaa5fe 100644 --- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF @@ -28,8 +28,8 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.form.service.datasourceinfo;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.metadata.dbview;version="[4.0.0,5.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.dbview;version="[5.0.0,6.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.14.0,3.0.0)", com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ql.resource;version="[5.0.0,6.0.0)", diff --git a/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF index cf27ca06..5e16d4dd 100644 --- a/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Localization: plugin Import-Package: com._1c.g5.v8.dt.common;version="[6.4.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.md.ui.shared;version="[2.3.200,3.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF index 75024fc4..2d4adfcf 100644 --- a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.13.0,4.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.schedule.model;version="[2.0.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF index dd170f99..9f8387fe 100644 --- a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata.dbview;version="4.0.0", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ql.typesystem;version="5.0.0", com._1c.g5.wiring;version="[2.2.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF index 289bceac..a5e5ac0a 100644 --- a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.md;version="[20.0.0,21.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.rights;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.rights.model;version="[4.0.0,5.0.0)", diff --git a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF index 47215f16..65f22cd9 100644 --- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.form.naming;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", com._1c.g5.v8.dt.validation.marker;version="[9.0.0,10.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", From aa29756b5ec51efab18a36571c7b83eea0a17467 Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Sat, 21 Dec 2024 23:01:07 +0300 Subject: [PATCH 10/10] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?= =?UTF-8?q?=20upload-artifact?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 ++++---- .github/workflows/release.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62dd2dee..1c1d3c76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,19 +86,19 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Upload repo - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: v8-code-style-repository path: repositories/com.e1c.v8codestyle.repository/target/repository/ - name: Upload SDK repo - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: v8-code-style-repository-sdk path: repositories/com.e1c.v8codestyle.repository.sdk/target/repository/ - name: Upload JaCoCo exec data - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: jacoco @@ -106,7 +106,7 @@ jobs: ./**/target/site/jacoco*/ - name: Upload test logs on failure - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3a35c35..f210234d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,19 +42,19 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Upload repo - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: repo path: repositories/com.e1c.v8codestyle.repository/target/repository/ - name: Upload SDK repo - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: sdk-repo path: repositories/com.e1c.v8codestyle.repository.sdk/target/repository/ - name: Upload JaCoCo exec data - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: jacoco @@ -63,7 +63,7 @@ jobs: ./**/target/site/jacoco*/ - name: Upload test logs on failure - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: logs