Skip to content

Commit

Permalink
Переход на EDT 2024.2 (#1458)
Browse files Browse the repository at this point in the history
* Поднятие версий com._1c.g5.v8.dt.form

* Перевод таргета на 2024.2

* Подъем версий в dt.bsl.comment

* G5V8DT-25485

* Поднятие версий com.e1c.g5.v8.dt.cli.api (#1468)

* Исправление ошибок в сообщениях

* Поднятие версий com._1c.g5.v8.dt.ui.util

* Исправление ошибок в сообщениях

* Fix build.yml

* G5V8DT-25849 Нет переноса строки при создании новой области в модуле

* Revert "G5V8DT-25849 Нет переноса строки при создании новой области в модуле"

This reverts commit af7a666.

* G5V8DT-25849 Нет переноса строки при создании новой области в модуле

* G5V8DT-24042 Починить все тесты, падающие в публичных плагинах (#1467)

* G5V8DT-24042 Починить все тесты, падающие в публичных плагинах

* G5V8DT-24042 fix build-ci

* G5V8DT-24042 Починить все тесты, падающие в публичных плагинах

* G5V8DT-24042 Починить все тесты, падающие в публичных плагинах

* G5V8DT-24042 Починить все тесты, падающие в публичных плагинах

* G5V8DT-24042: Запуск билда без ожидания всего WS

Для защиты от блокировки нескольких проектов во время ожидания

---------

Co-authored-by: Alexander Tretyakevich <alexander.tretyakevich@xored.com>

* Исправлена версия зависимостей на theming.ui.util

* G5V8DT-24085 DcsOutputParameters содержит несуществующие поля

Versioning

* G5V8DT-26116 При добавлении модулей излишне добавляется область

* Update build.yml

Removed wrong goal from maven build

* Update build.yml

Removed verbose output

* G5V8DT-25625 Повышение гибкости настройки индексов (#1478)

Поднятие версий

---------

Co-authored-by: Alexander Tretyakevich <alexander.tretyakevich@xored.com>
Co-authored-by: Almaz Nasibullin <AlmazNasibullin@users.noreply.github.com>
Co-authored-by: Maxim Dzyuba <dzym@1c.ru>
Co-authored-by: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com>
Co-authored-by: Dmitry Savenko <dsavenko@xored.com>
Co-authored-by: Nikita Kuznetsov <kuzn@1c.ru>
Co-authored-by: Alexander Tretyakevich <tretyakevich@gmail.com>
  • Loading branch information
8 people authored Dec 23, 2024
1 parent aa29756 commit 3ca4963
Show file tree
Hide file tree
Showing 118 changed files with 2,346 additions and 677 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
4 changes: 2 additions & 2 deletions bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ 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.e1c.g5.v8.dt.cli.api;version="[2.0.0,3.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)",
com.google.common.base;version="[32.1.0,33.0.0)",
Expand Down
8 changes: 4 additions & 4 deletions bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0
com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
com._1c.g5.v8.dt.bsl.comment;version="[3.0.0,4.0.0)",
com._1c.g5.v8.dt.bsl.common;version="[7.0.0,8.0.0)",
com._1c.g5.v8.dt.bsl.documentation.comment;version="[5.0.0,6.0.0)",
com._1c.g5.v8.dt.bsl.documentation.comment;version="[6.0.0,7.0.0)",
com._1c.g5.v8.dt.bsl.formatting;version="[3.0.0,4.0.0)",
com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
com._1c.g5.v8.dt.bsl.model.util;version="[4.7.0,5.0.0)",
Expand All @@ -42,9 +42,9 @@ 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.theming.ui.util;version="[1.0.0,2.0.0)",
com._1c.g5.v8.dt.ui.util;version="[7.0.0,8.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)",
com._1c.g5.wiring;version="[2.2.0,3.0.0)",
com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
Expand Down Expand Up @@ -76,6 +77,8 @@ public class ModuleStructurePropertyPage

private Button createStrictTypesButton;

private Button openButton;

private CheckboxTableViewer checkBoxViewer;

private final Set<ModuleType> existTemplates = new HashSet<>();
Expand Down Expand Up @@ -192,7 +195,8 @@ private void saveTemplate(ModuleType type)
return;
}
ScriptVariant script = v8Project.getScriptVariant();
Supplier<InputStream> content = moduleStructureProvider.getModuleStructureTemplate(getProject(), type, script);
Supplier<InputStream> content =
moduleStructureProvider.getModuleStructureTemplate(getProject(), type, false, script);
if (content == null)
{
return;
Expand Down Expand Up @@ -292,7 +296,7 @@ private void addSecondSection(Composite parent)
checkBoxViewer.setInput(ModuleType.VALUES);

Composite buttonPanel = createDefaultComposite(composite);
Button openButton = new Button(buttonPanel, SWT.PUSH);
openButton = new Button(buttonPanel, SWT.PUSH);
openButton.setText(Messages.ModuleStructurePropertyPage_Open_template);
openButton.setToolTipText(Messages.ModuleStructurePropertyPage_Open_template_tooltip);
openButton.setEnabled(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,7 @@ public String wrap(IBslModuleTextInsertInfo moduleTextInsertInfo, String content
builder.append(beginRegion).append(space).append(regionName);
builder.append(content);
builder.append(endRegion);
if (moduleTextInsertInfo.getPosition() == 0)
{
builder.append(lineSeparator);
}
builder.append(lineSeparator);
return builder.toString();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
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;
Expand Down Expand Up @@ -85,15 +87,22 @@ public void createModels(IDtNewWizardContext<EObject> context, Set<EObject> crea
{
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);
}
}
}
}
Expand All @@ -103,19 +112,20 @@ else if (model instanceof Module)
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);
}
}
}

private void createOrUpdateModule(IFile bslFile, ModuleType type, IDtNewWizardContext<EObject> context)
private void createOrUpdateModule(IFile bslFile, ModuleType type, boolean reusableModule,
IDtNewWizardContext<EObject> context)
{
ScriptVariant script = context.getV8project().getScriptVariant();
Supplier<InputStream> content =
moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, script);
moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, reusableModule, script);
if (content == null)
{
return;
Expand Down Expand Up @@ -178,5 +188,4 @@ else if (!currentCode.isEmpty())
UiPlugin.log(status);
}
}

}
4 changes: 2 additions & 2 deletions bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
com._1c.g5.v8.dt.bsl.comment;version="[3.0.0,4.0.0)",
com._1c.g5.v8.dt.bsl.common;version="[7.0.0,8.0.0)",
com._1c.g5.v8.dt.bsl.contextdef;version="[2.0.0,3.0.0)",
com._1c.g5.v8.dt.bsl.documentation.comment;version="[5.0.0,6.0.0)",
com._1c.g5.v8.dt.bsl.documentation.comment;version="[6.0.0,7.0.0)",
com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
com._1c.g5.v8.dt.bsl.model.resource.owner;version="[2.0.0,3.0.0)",
com._1c.g5.v8.dt.bsl.model.util;version="[4.0.0,5.0.0)",
Expand All @@ -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)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<InputStream> getModuleStructureTemplate(IProject project, ModuleType moduleType, ScriptVariant script);
Supplier<InputStream> getModuleStructureTemplate(IProject project, ModuleType moduleType, boolean reusableModule,
ScriptVariant script);

/**
* Gets the module structure top regions in order of as they should be in module.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -68,16 +70,19 @@ public boolean canCreateStructure(IProject project)

@Override
public Supplier<InputStream> getModuleStructureTemplate(IProject project, ModuleType moduleType,
ScriptVariant script)
boolean reusableModule, ScriptVariant script)
{

if (moduleType == null || script == null)
{
return null;
}

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);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

#Region Internal

// Enter code here.

#EndRegion

#Region Private

// Enter code here.

#EndRegion
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

#Область СлужебныйПрограммныйИнтерфейс

// Код процедур и функций

#КонецОбласти

#Область СлужебныеПроцедурыИФункции

// Код процедур и функций

#КонецОбласти
6 changes: 3 additions & 3 deletions bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.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="[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;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)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com._1c.g5.v8.dt.form.model.FormItemContainer;
import com._1c.g5.v8.dt.form.model.FormPackage;
import com._1c.g5.v8.dt.form.service.FormItemInformationService;
import com._1c.g5.v8.dt.mcore.Event;
import com._1c.g5.v8.dt.metadata.mdclass.ScriptVariant;
import com.e1c.g5.v8.dt.check.CheckComplexity;
import com.e1c.g5.v8.dt.check.ICheckParameters;
Expand All @@ -48,7 +49,7 @@
* @author Manaev Konstantin
*/
public class FormItemsSingleEventHandlerCheck
extends BasicCheck
extends BasicCheck<EObject>
{

private static final String CHECK_ID = "form-items-single-event-handler"; //$NON-NLS-1$
Expand All @@ -74,12 +75,12 @@ public String getCheckId()
protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters,
IProgressMonitor monitor)
{
if (object instanceof Form)
if (object instanceof Form form)
{
IV8Project project = v8ProjectManager.getProject((EObject)object);
ScriptVariant variant = project == null ? ScriptVariant.ENGLISH : project.getScriptVariant();
IV8Project v8project = v8ProjectManager.getProject((EObject)object);
ScriptVariant variant = v8project == null ? ScriptVariant.ENGLISH : v8project.getScriptVariant();
Map<String, String> handlers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
checkEObjectEventHandlers((EObject)object, handlers, variant, resultAceptor, monitor);
checkEObjectEventHandlers(form, handlers, variant, resultAceptor, monitor);
}
}

Expand Down Expand Up @@ -137,19 +138,27 @@ private void checkHandlersList(EObject item, List<EventHandler> eventHandlers, M
{
return;
}
EventHandler event = eventIterator.next();
String handlerName =
variant == ScriptVariant.ENGLISH ? event.getEvent().getName() : event.getEvent().getNameRu();
if (handlers.containsKey(event.getName()))
EventHandler eventHandler = eventIterator.next();
Event event = eventHandler.getEvent();
if (event.eIsProxy())
{
continue;
}
String handlerName = eventHandler.getName();
String eventName = variant == ScriptVariant.ENGLISH ? event.getName() : event.getNameRu();

if (handlers.containsKey(handlerName))
{
resultAceptor.addIssue(MessageFormat.format(
Messages.FormItemsSingleEventHandlerCheck_the_handler_is_already_assigned_to_event, handlerName,
handlers.get(event.getName())), event, FormPackage.Literals.EVENT_HANDLER__NAME);
handlers.get(handlerName)), eventHandler, FormPackage.Literals.EVENT_HANDLER__NAME);
}
else
{
handlers.put(event.getName(), MessageFormat
.format(Messages.FormItemsSingleEventHandlerCheck_itemName_dot_eventName, itemName, handlerName));
handlers.put(handlerName,
eventName != null ? MessageFormat
.format(Messages.FormItemsSingleEventHandlerCheck_itemName_dot_eventName, itemName, eventName)
: itemName);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion targets/default/default.target
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<!-- EDT -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2024.1/"/>
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2024.2/"/>
<unit id="com._1c.g5.v8.dt.rcp" version="0.0.0"/>
<unit id="com._1c.g5.v8.dt.thirdparty.feature.group" version="0.0.0"/>
</location>
Expand Down
3 changes: 2 additions & 1 deletion tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Fragment-Host: com.e1c.v8codestyle.bsl;bundle-version="[0.7.0,0.8.0)"
Automatic-Module-Name: com.e1c.v8codestyle.md.itests
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Localization: fragment
Import-Package: com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)",
Import-Package: com._1c.g5.v8.dt.core.lifecycle;version="[9.2.0,10.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="[12.0.0,13.0.0)",
com._1c.g5.v8.dt.md.naming;version="[5.1.0,6.0.0)",
Expand Down
Loading

0 comments on commit 3ca4963

Please sign in to comment.