Skip to content

Commit 08ce50c

Browse files
committed
fix(deps): upgrade to Eclipse 2025-03
1 parent f08e12e commit 08ce50c

File tree

7 files changed

+25
-13
lines changed

7 files changed

+25
-13
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ defaults:
3737
shell: bash
3838

3939
env:
40-
JAVA_VERSION: 17
40+
JAVA_VERSION: 21
4141

4242
jobs:
4343

@@ -136,9 +136,9 @@ jobs:
136136
137137
# remove unused dynamic libs
138138
rm -rf \
139-
org.dart4e.studio/linux/gtk/x86_64/plugins/com.sun.jna_*/com/sun/jna/{aix,darwin,freebsd,linux-a,linux-l,linux-m,linux-p,linux-r,linux-s,openbsd,sunos,win32}* \
140-
org.dart4e.studio/macosx/cocoa/x86_64/Eclipse.app/Contents/Eclipse/plugins/com.sun.jna_*/com/sun/jna/{aix,freebsd,linux,openbsd,sunos,win32}* \
141-
org.dart4e.studio/win32/win32/x86_64/plugins/com.sun.jna_*/com/sun/jna/{aix,darwin,freebsd,linux,openbsd,sunos}*
139+
org.dart4e.studio/linux/gtk/x86_64/plugins/com.sun.jna_*/com/sun/jna/{aix,darwin,dragonflybsd,freebsd,linux-a,linux-l,linux-m,linux-p,linux-r,linux-s,openbsd,sunos,win32}* \
140+
org.dart4e.studio/macosx/cocoa/x86_64/Eclipse.app/Contents/Eclipse/plugins/com.sun.jna_*/com/sun/jna/{aix,dragonflybsd,freebsd,linux,openbsd,sunos,win32}* \
141+
org.dart4e.studio/win32/win32/x86_64/plugins/com.sun.jna_*/com/sun/jna/{aix,darwin,dragonflybsd,freebsd,linux,openbsd,sunos}*
142142
143143
# generate linux x86_64 archive
144144
(

build.target

+15-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?pde version="3.8"?>
33
<target includeMode="feature" name="Dart4E Studio Build Target">
44

5-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-22"/>
5+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-23"/>
66

77
<locations>
88

@@ -17,7 +17,7 @@
1717
</location>
1818

1919
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
20-
<repository location="https://download.eclipse.org/releases/2024-12/"/>
20+
<repository location="https://download.eclipse.org/releases/2025-03/"/>
2121
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
2222
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="0.0.0"/>
2323
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
@@ -27,8 +27,20 @@
2727
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
2828
</location>
2929

30+
<!-- workaround to solve since 2025-03:
31+
[ERROR] Cannot resolve dependencies of project org.haxe4e.studio:org.haxe4e.studio.product:eclipse-repository:1.0.0-SNAPSHOT
32+
[ERROR] with context {osgi.os=linux, org.eclipse.update.install.features=true, osgi.arch=x86_64, org.eclipse.update.install.sources=true, osgi.ws=gtk, org.eclipse.justj.buildtime=true}
33+
[ERROR] Software being installed: org.haxe4e.studio 1.0.0.qualifier
34+
[ERROR] Missing requirement: org.haxe4e.studio 1.0.0.qualifier requires 'org.eclipse.equinox.p2.iu; org.eclipse.ecf.core.ssl.feature.feature.group 0.0.0' but it could not be found: See log for details
35+
-->
3036
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
31-
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
37+
<repository location="https://download.eclipse.org/rt/ecf/latest/site.p2/"/>
38+
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
39+
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
40+
</location>
41+
42+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
43+
<repository location="https://download.eclipse.org/eclipse/updates/4.35/"/>
3244
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
3345
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
3446
</location>

feature/feature.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name=Dart4E Studio
22
description=Eclipse based IDE for the Dart programming language and the Flutter application framework
33

44
copyright=\
5-
Copyright 2022-2024 by the Dart4E authors.\n\
5+
Copyright 2022-2025 by the Dart4E authors.\n\
66
\n\
77
All rights reserved. This program and the accompanying materials \
88
are made available under the terms of the Eclipse Public License v2.0 \

feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</url>
3232

3333
<requires>
34-
<import plugin="org.eclipse.platform" version="4.34.0" match="greaterOrEqual"/>
34+
<import plugin="org.eclipse.platform" version="4.35.0" match="greaterOrEqual"/>
3535
<import plugin="org.eclipse.core.contenttype"/>
3636
<import plugin="org.eclipse.core.externaltools"/>
3737
<import plugin="org.eclipse.core.filebuffers"/>

plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: The Dart4E Project
77
Automatic-Module-Name: org.dart4e.studio.plugin
88
Bundle-Activator: org.dart4e.studio.Dart4EStudioPlugin
9-
Bundle-RequiredExecutionEnvironment: JavaSE-17
9+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1010
Bundle-ClassPath: .
1111
Require-Bundle: org.eclipse.platform,
1212
org.eclipse.core.contenttype,

plugin/about.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Dart4E Studio\n\
55
\n\
66
Eclipse based IDE for the Dart programming language and the Flutter application framework.\n\
77
\n\
8-
Copyright 2022-2024 by the Dart4E authors.\n\
8+
Copyright 2022-2025 by the Dart4E authors.\n\
99
\n\
1010
All rights reserved. This program and the accompanying materials \
1111
are made available under the terms of the Eclipse Public License v2.0 \

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666

6767
<properties>
68-
<java.version>17</java.version>
68+
<java.version>21</java.version>
6969
<tycho.version>4.0.12</tycho.version>
7070

7171
<!-- to prevent:
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>com.vegardit.no-npe</groupId>
9393
<artifactId>no-npe-eea-all</artifactId>
94-
<version>[1.2.0,)</version>
94+
<version>[1.3.0,)</version>
9595
<scope>provided</scope>
9696
</dependency>
9797
</dependencies>

0 commit comments

Comments
 (0)