From c9c9ec7e4128995f0f366e476b990cbf96f8fa64 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 21 Oct 2024 09:32:23 +0200 Subject: [PATCH] Fix API errors by updating bundle versions Regression from commit 9bd3284 / #2400 Also updated version range on bundle with increased version. Fixes https://github.com/eclipse-platform/eclipse.platform.ui/issues/2430 --- bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF | 4 ++-- .../AbstractDecoratedTextEditorPreferenceConstants.java | 2 +- .../org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF | 2 +- .../eclipse/ui/texteditor/SourceViewerDecorationSupport.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF index e3cf47afb07..8e42f706134 100644 --- a/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true -Bundle-Version: 3.18.100.qualifier +Bundle-Version: 3.19.0.qualifier Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.204.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.24.0,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.130.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.17.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.19.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, org.eclipse.core.resources;bundle-version="[3.19.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.10.0,2.0.0)", diff --git a/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java b/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java index aa9904f0b20..59555ff9880 100644 --- a/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java +++ b/bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java @@ -74,7 +74,7 @@ private AbstractDecoratedTextEditorPreferenceConstants() { /** * A named preference that holds the color used to render the text editor inline annotation * - * @since 3.18 + * @since 3.19 */ public final static String EDITOR_INLINE_ANNOTATION_COLOR= "org.eclipse.ui.editors.inlineAnnotationColor"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF index b58b26bfbfc..c904670b20c 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true -Bundle-Version: 3.18.100.qualifier +Bundle-Version: 3.19.0.qualifier Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java index 29e64653200..deb6a18b4c5 100644 --- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java +++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java @@ -450,7 +450,7 @@ public void setMarginPainterPreferenceKeys(String enableKey, String colorKey, St /** * Set inline annotation color key. * - * @since 3.18 + * @since 3.19 */ public void setInlineAnnotationColorPreferenceKey(String inlineAnnotationColor) { fInlineAnnotationColorKey = inlineAnnotationColor;