Skip to content

Commit baeb8a5

Browse files
sigmaaasigmaaa
authored
IEP-1637 Upgrade Eclipse target platform: LSP4E 0.27.10, CDT-LSP 3.3 (#1317)
* feat: updating target dependencies * fix: added missing units to the target * fix: adding javax.xml.jre to resolve missing w3c * fix: trying to add some units to fix swtbot tests * fix: new updating new preferences menu name * fix: updated preference name in other tests * fix: fixed one more updating name for Preferences menu * feat: updating lsp4e to 0.27.10 * fix: removing the unused feature group from the target
1 parent 8618c29 commit baeb8a5

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

‎releng/com.espressif.idf.target/com.espressif.idf.target.target‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
<target name="com.espressif.idf.target" sequenceNumber="25">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<repository location="https://download.eclipse.org/eclipse/updates/4.35"/>
6+
<repository location="https://download.eclipse.org/eclipse/updates/4.37"/>
77
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
88
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
9-
<unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
109
<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
1110
<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
1211
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
@@ -16,17 +15,21 @@
1615
<unit id="org.eclipse.help.feature.group" version="0.0.0"/>
1716
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
1817
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
19-
2018
</location>
2119
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
22-
<repository location="https://download.eclipse.org/releases/2025-03/"/>
20+
<repository location="https://download.eclipse.org/releases/2025-09/"/>
2321
<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
2422
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
2523
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
2624
<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
2725
<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
26+
<unit id="org.eclipse.tm.terminal.connector.process" version="0.0.0"/>
2827
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
28+
<unit id="org.eclipse.tm.terminal.view.ui" version="0.0.0"/>
2929
<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
30+
<unit id="org.eclipse.ui" version="0.0.0"/>
31+
<unit id="org.apache.commons.logging" version="0.0.0"/>
32+
<unit id="javax.xml.jre" version="0.0.0"/>
3033
<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
3134
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
3235
</location>
@@ -45,7 +48,7 @@
4548
<unit id="org.apache.batik.i18n" version="0.0.0"/>
4649
<unit id="org.apache.batik.constants" version="0.0.0"/>
4750
<unit id="org.commonmark" version="0.0.0"/> <!-- 0.22.0 -->
48-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03"/>
51+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-09"/>
4952
</location>
5053
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5154
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
@@ -78,7 +81,7 @@
7881
<unit id="org.eclipse.embedcdt.packs.feature.group" version="6.4.0.202307251916"/>
7982
</location>
8083
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
81-
<repository location="https://download.eclipse.org/lsp4e/releases/0.27.4/"/>
84+
<repository location="https://download.eclipse.org/lsp4e/releases/0.27.10/"/>
8285
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
8386
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
8487
<unit id="org.eclipse.lsp4j" version="0.0.0"/>
@@ -87,7 +90,7 @@
8790
<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
8891
</location>
8992
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
90-
<repository location="https://download.eclipse.org/tm4e/releases/0.14.1/"/>
93+
<repository location="https://download.eclipse.org/tm4e/releases/0.15.1/"/>
9194
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
9295
<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
9396
</location>
@@ -96,7 +99,7 @@
9699
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
97100
</location>
98101
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
99-
<repository location="https://download.eclipse.org/tools/cdt/releases/cdt-lsp-3.2/cdt-lsp-3.2.0/"/>
102+
<repository location="https://download.eclipse.org/tools/cdt/releases/cdt-lsp-3.3/cdt-lsp-3.3.0/"/>
100103
<unit id="org.eclipse.cdt.lsp.feature.feature.group" version="0.0.0"/>
101104
<unit id="org.yaml.snakeyaml" version="2.2.0"/>
102105
</location>

‎tests/com.espressif.idf.ui.test/src/com/espressif/idf/ui/test/executable/cases/project/NewEspressifIDFProjectClangFilesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ void app_main(void) {
356356

357357
private static void setupAutoSave() throws Exception
358358
{
359-
bot.menu("Window").menu("Preferences").click();
359+
bot.menu("Window").menu("Preferences...").click();
360360
SWTBotShell prefrencesShell = bot.shell("Preferences");
361361
prefrencesShell.bot().tree().getTreeItem("C/C++").select();
362362
prefrencesShell.bot().tree().getTreeItem("C/C++").expand();
@@ -441,7 +441,7 @@ private static void whenProjectIsBuiltUsingContextMenu(String projectName) throw
441441

442442
private static void whenOpenClangdPreferences() throws Exception
443443
{
444-
bot.menu("Window").menu("Preferences").click();
444+
bot.menu("Window").menu("Preferences...").click();
445445
TestWidgetWaitUtility.waitForDialogToAppear(bot, "Preferences", 10000);
446446
SWTBotShell prefrencesShell = bot.shell("Preferences");
447447
prefrencesShell.bot().tree().getTreeItem("C/C++").select();

‎tests/com.espressif.idf.ui.test/src/com/espressif/idf/ui/test/operations/EnvSetupOperations.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static void setupEspressifEnv(SWTWorkbenchBot bot) throws Exception
4747
bot.table().select("C/C++");
4848
bot.button("Open").click();
4949

50-
bot.menu("Window").menu("Preferences").click();
50+
bot.menu("Window").menu("Preferences...").click();
5151
SWTBotShell prefrencesShell = bot.shell("Preferences");
5252

5353
prefrencesShell.bot().tree().getTreeItem("General").select();

0 commit comments

Comments
 (0)