From c13d011649b59a2005edc6d9506052c5443a56ae Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 15 May 2025 13:08:12 -0400 Subject: [PATCH] Use latest Eclipse Platform and all dependencies for CDT 12.1 Includes removal of references to Platform internals that have been changed. Note the removal of setHoverImageDescriptor matches the change made to platform in https://github.com/eclipse-platform/eclipse.platform/commit/be4a4aab487dd8b762da580d9af076fbd1ce2279#diff-6b07181bf8beb80046741858e13f5721f608136e00ce17749b5fa6d550cece9b --- core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../SignalsViewColumnPresentation.java | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ui/memory/floatingpoint/FPRendering.java | 2 - releng/org.eclipse.cdt.repo/category.xml | 4 -- releng/org.eclipse.cdt.target/cdt.target | 50 +++++++++---------- 8 files changed, 31 insertions(+), 37 deletions(-) diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index fceb0be4b98..296e16b200b 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true -Bundle-Version: 9.0.0.qualifier +Bundle-Version: 9.0.100.qualifier Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index aed7d6bd236..f7131ddfedd 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true -Bundle-Version: 8.5.600.qualifier +Bundle-Version: 8.5.700.qualifier Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java index 35b98199b8b..e380f050725 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java @@ -15,9 +15,9 @@ package org.eclipse.cdt.debug.internal.ui.views.signals; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; -import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; +import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; /** @@ -29,7 +29,7 @@ public class SignalsViewColumnPresentation implements IColumnPresentation { public static final String ID = PREFIX + "signalsViewColumnPresentationId"; //$NON-NLS-1$ - private static final String COLUMN_ID_NAME = VariableColumnPresentation.COLUMN_VARIABLE_NAME; + private static final String COLUMN_ID_NAME = IDebugUIConstants.COLUMN_ID_VARIABLE_VALUE; private static final String COLUMN_ID_PASS = PREFIX + "signalsColumn.pass"; //$NON-NLS-1$ private static final String COLUMN_ID_STOP = PREFIX + "signalsColumn.stop"; //$NON-NLS-1$ private static final String COLUMN_ID_DESC = PREFIX + "signalsColumn.desc"; //$NON-NLS-1$ diff --git a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF index 6ae31ff4e10..297731d55c9 100644 --- a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF +++ b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true -Bundle-Version: 1.2.500.qualifier +Bundle-Version: 1.2.600.qualifier Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, diff --git a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF index ec47d53a20e..42c3cf3a8a7 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF +++ b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.floatingpoint;singleton:=true -Bundle-Version: 1.2.200.qualifier +Bundle-Version: 1.2.300.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100", org.eclipse.debug.ui;bundle-version="3.8.1", diff --git a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRendering.java index 5ecdcb255f7..006ae28a508 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRendering.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRendering.java @@ -1197,8 +1197,6 @@ class CopyAction extends Action { setToolTipText(DebugUIMessages.CopyViewToClipboardAction_tooltip); setImageDescriptor( DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD)); - setHoverImageDescriptor( - DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_COPY_VIEW_TO_CLIPBOARD)); setDisabledImageDescriptor( DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COPY_VIEW_TO_CLIPBOARD)); } diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml index 803cd6cdbae..9c2b59b53a7 100644 --- a/releng/org.eclipse.cdt.repo/category.xml +++ b/releng/org.eclipse.cdt.repo/category.xml @@ -214,10 +214,6 @@ - - - - diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 6e4bb91156e..1a46fac42d5 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,13 +1,13 @@ - + - + @@ -18,15 +18,15 @@ - + - + - + @@ -40,7 +40,7 @@ - + @@ -50,21 +50,21 @@ - + org.slf4j slf4j-api - 2.0.16 + 2.0.17 jar org.slf4j slf4j-simple - 2.0.16 + 2.0.17 jar @@ -76,7 +76,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1 jar @@ -88,13 +88,13 @@ commons-io commons-io - 2.18.0 + 2.19.0 jar org.assertj assertj-core - 3.27.2 + 3.27.3 jar @@ -106,43 +106,43 @@ org.junit.jupiter junit-jupiter-api - 5.11.4 + 5.12.2 jar org.junit.jupiter junit-jupiter-engine - 5.11.4 + 5.12.2 jar org.mockito mockito-core - 5.15.2 + 5.17.0 jar org.yaml snakeyaml - 2.3 + 2.4 jar net.java.dev.jna jna-platform - 5.16.0 + 5.17.0 jar net.java.dev.jna jna - 5.16.0 + 5.17.0 jar com.google.guava guava - 33.4.0-jre + 33.4.8-jre jar @@ -158,31 +158,31 @@ org.ow2.asm asm-commons - 9.7.1 + 9.8 jar org.ow2.asm asm-util - 9.7.1 + 9.8 jar org.ow2.asm asm - 9.7.1 + 9.8 jar org.ow2.asm asm-tree - 9.7.1 + 9.8 jar org.ow2.asm asm-analysis - 9.7.1 + 9.8 jar @@ -199,7 +199,7 @@ - +