1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00

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
be4a4aab48 (diff-6b07181bf8beb80046741858e13f5721f608136e00ce17749b5fa6d550cece9b)
This commit is contained in:
Jonah Graham 2025-05-15 13:08:12 -04:00
parent 4a499fbf1e
commit c13d011649
8 changed files with 31 additions and 37 deletions

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true 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-Activator: org.eclipse.cdt.ui.CUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true 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-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

View file

@ -15,9 +15,9 @@
package org.eclipse.cdt.debug.internal.ui.views.signals; package org.eclipse.cdt.debug.internal.ui.views.signals;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin; 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.IColumnPresentation;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.resource.ImageDescriptor; 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$ 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_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_STOP = PREFIX + "signalsColumn.stop"; //$NON-NLS-1$
private static final String COLUMN_ID_DESC = PREFIX + "signalsColumn.desc"; //$NON-NLS-1$ private static final String COLUMN_ID_DESC = PREFIX + "signalsColumn.desc"; //$NON-NLS-1$

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true 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-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,

View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.floatingpoint;singleton:=true 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 Bundle-Localization: plugin
Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100", Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100",
org.eclipse.debug.ui;bundle-version="3.8.1", org.eclipse.debug.ui;bundle-version="3.8.1",

View file

@ -1197,8 +1197,6 @@ class CopyAction extends Action {
setToolTipText(DebugUIMessages.CopyViewToClipboardAction_tooltip); setToolTipText(DebugUIMessages.CopyViewToClipboardAction_tooltip);
setImageDescriptor( setImageDescriptor(
DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD)); DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD));
setHoverImageDescriptor(
DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_COPY_VIEW_TO_CLIPBOARD));
setDisabledImageDescriptor( setDisabledImageDescriptor(
DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COPY_VIEW_TO_CLIPBOARD)); DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COPY_VIEW_TO_CLIPBOARD));
} }

View file

@ -214,10 +214,6 @@
<bundle id="org.eclipse.cdt.util.source" version="0.0.0"/> <bundle id="org.eclipse.cdt.util.source" version="0.0.0"/>
<bundle id="org.eclipse.cdt.remote.core" version="0.0.0"/> <bundle id="org.eclipse.cdt.remote.core" version="0.0.0"/>
<bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/> <bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
<bundle id="com.sun.xml.bind" version="0.0.0"/>
<bundle id="org.eclipse.orbit.xml-apis-ext" version="0.0.0"/>
<bundle id="javax.activation" version="1.2.2.v20221203-1659"/>
<bundle id="jakarta.xml.bind-api" version="2.3.3"/>
<bundle id="com.google.gson" version="0.0.0"/> <bundle id="com.google.gson" version="0.0.0"/>
<bundle id="org.freemarker.freemarker" version="2.3.34.stable"/> <bundle id="org.freemarker.freemarker" version="2.3.34.stable"/>
<bundle id="org.yaml.snakeyaml" version="0.0.0"/> <bundle id="org.yaml.snakeyaml" version="0.0.0"/>

View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?>
<target name="cdt" sequenceNumber="164"> <target name="cdt" sequenceNumber="165">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/cbi/updates/license/" /> <repository location="https://download.eclipse.org/cbi/updates/license/" />
<unit id="org.eclipse.license.feature.group" version="0.0.0" /> <unit id="org.eclipse.license.feature.group" version="0.0.0" />
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.34/" /> <repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/" />
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" /> <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0" />
<unit id="org.eclipse.jdt.annotation" version="0.0.0" /> <unit id="org.eclipse.jdt.annotation" version="0.0.0" />
<unit id="org.eclipse.sdk.feature.group" version="0.0.0" /> <unit id="org.eclipse.sdk.feature.group" version="0.0.0" />
@ -18,15 +18,15 @@
<repository location="https://download.eclipse.org/mylyn/updates/release/latest/" /> <repository location="https://download.eclipse.org/mylyn/updates/release/latest/" />
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/egit/updates-7.0/" /> <repository location="https://download.eclipse.org/egit/updates-stable-nightly/" />
<unit id="org.eclipse.egit.feature.group" version="0.0.0" /> <unit id="org.eclipse.egit.feature.group" version="0.0.0" />
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/linuxtools/update-docker-5.17.0/" /> <repository location="https://download.eclipse.org/linuxtools/updates-docker-nightly/" />
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0" /> <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0" />
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4e/releases/0.26.7/" /> <repository location="https://download.eclipse.org/lsp4e/snapshots/" />
<unit id="org.eclipse.lsp4e" version="0.0.0" /> <unit id="org.eclipse.lsp4e" version="0.0.0" />
<unit id="org.eclipse.lsp4e.debug" version="0.0.0" /> <unit id="org.eclipse.lsp4e.debug" version="0.0.0" />
</location> </location>
@ -40,7 +40,7 @@
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0" /> <unit id="org.eclipse.swtbot.feature.group" version="0.0.0" />
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tm4e/releases/0.14.0/" /> <repository location="https://download.eclipse.org/tm4e/releases/latest/" />
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0" /> <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0" />
<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" /> <unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" />
</location> </location>
@ -50,21 +50,21 @@
<unit id="org.eclipse.cdt.feature.group" version="0.0.0" /> <unit id="org.eclipse.cdt.feature.group" version="0.0.0" />
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.9/" /> <repository location="https://download.eclipse.org/wildwebdeveloper/releases/latest/" />
</location> </location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven"> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="DirectFromMaven" missingManifest="error" type="Maven">
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>2.0.16</version> <version>2.0.17</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<!-- slf4j-api requires 1 impl, provide the one that is generally used in the final product, such as standalone debugger --> <!-- slf4j-api requires 1 impl, provide the one that is generally used in the final product, such as standalone debugger -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>2.0.16</version> <version>2.0.17</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.11.0</version> <version>2.13.1</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -88,13 +88,13 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.18.0</version> <version>2.19.0</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<version>3.27.2</version> <version>3.27.3</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -106,43 +106,43 @@
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>5.11.4</version> <version>5.12.2</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>5.11.4</version> <version>5.12.2</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>5.15.2</version> <version>5.17.0</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>2.3</version> <version>2.4</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.jna</groupId> <groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId> <artifactId>jna-platform</artifactId>
<version>5.16.0</version> <version>5.17.0</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.jna</groupId> <groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId> <artifactId>jna</artifactId>
<version>5.16.0</version> <version>5.17.0</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>33.4.0-jre</version> <version>33.4.8-jre</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -158,31 +158,31 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
<version>9.7.1</version> <version>9.8</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId> <artifactId>asm-util</artifactId>
<version>9.7.1</version> <version>9.8</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>9.7.1</version> <version>9.8</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId> <artifactId>asm-tree</artifactId>
<version>9.7.1</version> <version>9.8</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId> <artifactId>asm-analysis</artifactId>
<version>9.7.1</version> <version>9.8</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -199,7 +199,7 @@
</dependencies> </dependencies>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/> <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06/"/>
<unit id="org.junit" version="4.13.2.v20240929-1000" /> <unit id="org.junit" version="4.13.2.v20240929-1000" />
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20240917-0534"/> <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20240917-0534"/>
<unit id="bcpg" version="0.0.0"/> <unit id="bcpg" version="0.0.0"/>