Merge branch 'master' of github.com:1C-Company/v8-code-style into

edt-2024-1
1C-Company · Apr 10, 2024 · 2a9aa71 · 2a9aa71
2 parents ffbe858 + 7087abc
commit 2a9aa71
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 40 deletions.
diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)",
- javax.inject;bundle-version="[1.0.0,2.0.0)",
+ com.google.inject;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.xtext;bundle-version="[2.26.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.e1c.v8codestyle.form
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
@@ -44,6 +44,4 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
  com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)",
  com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
  com.e1c.v8codestyle.check;version="[0.7.0,0.8.0)",
- com.google.common.base;version="[30.1.0,31.0.0)",
- com.google.inject;version="[5.0.1,6.0.0)",
- com.google.inject.binder;version="[5.0.1,6.0.0)"
+ com.google.common.base;version="[32.1.0,33.0.0)"
diff --git a/bundles/com.e1c.v8codestyle.right/.classpath b/bundles/com.e1c.v8codestyle.right/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/bundles/com.e1c.v8codestyle.right/.settings/org.eclipse.jdt.core.prefs b/bundles/com.e1c.v8codestyle.right/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF
@@ -8,8 +8,9 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)",
  org.eclipse.xtext;bundle-version="[2.24.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+ org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)",
+ com.google.inject;bundle-version="[7.0.0,8.0.0)
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.e1c.v8codestyle.right
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
@@ -34,5 +35,4 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
  com.e1c.g5.v8.dt.check.context;version="[2.0.0,3.0.0)",
  com.e1c.g5.v8.dt.check.ext;version="[1.0.0,2.0.0)",
  com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
- com.e1c.v8codestyle.check;version="[0.7.0,0.8.0)",
- com.google.inject;version="[5.0.1,6.0.0)"
+ com.e1c.v8codestyle.check;version="[0.7.0,0.8.0)"
diff --git a/bundles/com.e1c.v8codestyle.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/com.e1c.v8codestyle.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF
@@ -13,14 +13,14 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.12.200,2.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.11.100,4.0.0)",
- org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+ org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
+ com.google.inject;bundle-version="[7.0.0,8.0.0)
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.e1c.v8codestyle.ui
 Bundle-ActivationPolicy: lazy
 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.ui.wizards;version="[8.1.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)",
- com.e1c.v8codestyle;version="[0.7.0,0.8.0)",
- com.google.inject;version="[5.0.1,6.0.0)"
+ com.e1c.v8codestyle;version="[0.7.0,0.8.0)" 
diff --git a/bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF
@@ -7,8 +7,9 @@ Bundle-Activator: com.e1c.v8codestyle.internal.CorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+ org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)",
+ com.google.inject;bundle-version="[7.0.0,8.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.e1c.v8codestyle
 Bundle-ActivationPolicy: lazy
 Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
@@ -18,8 +19,6 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
  com.e1c.g5.v8.dt.check;version="[2.0.0,3.0.0)",
  com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)",
  com.e1c.g5.v8.dt.check.ext;version="1.0.0",
- com.e1c.g5.v8.dt.check.settings;version="1.0.0",
- com.google.inject;version="[5.0.1,6.0.0)",
- com.google.inject.binder;version="[5.0.1,6.0.0)"
+ com.e1c.g5.v8.dt.check.settings;version="1.0.0"
 Export-Package: com.e1c.v8codestyle;version="0.7.0",
  com.e1c.v8codestyle.check;version="0.7.0"
diff --git a/tests/com.e1c.v8codestyle.form.itests/.classpath b/tests/com.e1c.v8codestyle.form.itests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/com.e1c.v8codestyle.form.itests/.settings/org.eclipse.jdt.core.prefs b/tests/com.e1c.v8codestyle.form.itests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: com.e1c.v8codestyle.form;bundle-version="[0.7.0,0.8.0)"
 Automatic-Module-Name: com.e1c.v8codestyle.form.itests
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+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.naming;version="[7.0.0,8.0.0)",

diff --git a/tests/com.e1c.v8codestyle.md.itests/.classpath b/tests/com.e1c.v8codestyle.md.itests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/com.e1c.v8codestyle.md.itests/.settings/org.eclipse.jdt.core.prefs b/tests/com.e1c.v8codestyle.md.itests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: com.e1c.v8codestyle.md;bundle-version="[0.7.0,0.8.0)"
 Automatic-Module-Name: com.e1c.v8codestyle.md.itests
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+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)",

diff --git a/tests/com.e1c.v8codestyle.ql.itests/.classpath b/tests/com.e1c.v8codestyle.ql.itests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/com.e1c.v8codestyle.ql.itests/.settings/org.eclipse.jdt.core.prefs b/tests/com.e1c.v8codestyle.ql.itests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: com.e1c.v8codestyle.ql;bundle-version="[0.7.0,0.8.0)"
 Automatic-Module-Name: com.e1c.v8codestyle.ql.itests
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+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)",