1C-Company#1329 Merge remote-tracking branch 'upstream/master' into f…

…eature/1329-manager-module-named-self-reference-bug
VAGoncharov · Jun 19, 2023 · 5932bcb · 5932bcb
2 parents c451559 + 41f9bd1
commit 5932bcb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: com.e1c.v8codestyle.autosort
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Import-Package: com._1c.g5.v8.bm.common.collections;version="[4.0.0,5.0.0)",
+Import-Package: com._1c.g5.v8.activitytracking.core;version="[1.0.0,2.0.0)",
+ com._1c.g5.v8.bm.common.collections;version="[4.0.0,5.0.0)",
  com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
  com._1c.g5.v8.bm.core.event;version="[3.0.0,4.0.0)",
  com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)",

diff --git a/...estyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java b/...estyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java
@@ -14,9 +14,10 @@
 
 import org.eclipse.core.runtime.Plugin;
 
+import com._1c.g5.v8.activitytracking.core.ISystemIdleService;
 import com._1c.g5.v8.dt.core.model.IModelEditingSupport;
-import com._1c.g5.v8.dt.core.platform.IBmModelManager;
 import com._1c.g5.v8.dt.core.platform.IConfigurationProvider;
+import com._1c.g5.v8.dt.core.platform.IDerivedDataManagerProvider;
 import com.e1c.g5.v8.dt.cli.api.components.BaseCliCommandExternalDependencyModule;
 
 /**
@@ -38,9 +39,10 @@ protected void doConfigure()
     {
         super.doConfigure();
         // V8 DT
-        bind(IBmModelManager.class).toService();
         bind(IConfigurationProvider.class).toService();
         bind(IModelEditingSupport.class).toService();
+        bind(ISystemIdleService.class).toService();
+        bind(IDerivedDataManagerProvider.class).toService();
     }
 
 }
diff --git a/...e.autosort.itests/src/com/e1c/v8codestyle/autosort/itests/ExternalDependenciesModule.java b/...e.autosort.itests/src/com/e1c/v8codestyle/autosort/itests/ExternalDependenciesModule.java
@@ -12,7 +12,9 @@
  *******************************************************************************/
 package com.e1c.v8codestyle.autosort.itests;
 
+import com._1c.g5.v8.activitytracking.core.ISystemIdleService;
 import com._1c.g5.v8.dt.core.platform.IBmModelManager;
+import com._1c.g5.v8.dt.core.platform.IDerivedDataManagerProvider;
 import com._1c.g5.v8.dt.core.platform.IDtProjectManager;
 import com._1c.g5.wiring.AbstractServiceAwareModule;
 import com.e1c.v8codestyle.autosort.ISortService;
@@ -39,6 +41,8 @@ protected void doConfigure()
         bind(ISortService.class).toService();
         bind(IBmModelManager.class).toService();
         bind(IDtProjectManager.class).toService();
+        bind(ISystemIdleService.class).toService();
+        bind(IDerivedDataManagerProvider.class).toService();
     }
 
 }