Skip to content

Commit 7340940

Browse files
authored
Don't bundle org.eclipse.jdt.launching.macosx into RCPTT features (#309)
* Fix: depend on org.eclipse.jdt.launching.macosx instead of bundling it * Add macOS filter to org.eclipse.jdt.launching.macosx import Agent-Logs-Url: https://github.com/eclipse-rcptt/org.eclipse.rcptt/sessions/6c3173a2-aaba-49c3-9779-4455df49e0de Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 611cb78 commit 7340940

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

  • launching/org.eclipse.rcptt.launching-feature
  • runner/features/org.eclipse.rcptt.runner.runner-feature

launching/org.eclipse.rcptt.launching-feature/feature.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<import feature="org.eclipse.rcptt.updates" version="2.9.0" match="compatible"/>
3434
<import feature="org.eclipse.rcptt.ecl.server" version="2.9.0" match="compatible"/>
3535
<import feature="org.eclipse.rcptt.core" version="2.9.0" match="compatible"/>
36+
<import plugin="org.eclipse.jdt.launching.macosx" filter="(osgi.os=macosx)"/>
3637
</requires>
3738

3839
<plugin
@@ -83,9 +84,4 @@
8384
id="org.eclipse.osgi.compatibility.state"
8485
version="0.0.0"/>
8586

86-
<plugin
87-
id="org.eclipse.jdt.launching.macosx"
88-
os="macosx"
89-
version="0.0.0"/>
90-
9187
</feature>

runner/features/org.eclipse.rcptt.runner.runner-feature/feature.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<import feature="org.eclipse.rcptt.ecl.server" version="2.9.0" match="compatible"/>
4444
<import feature="org.eclipse.rcptt.watson" version="2.9.0" match="compatible"/>
4545
<import feature="org.eclipse.rcptt.ecl.platform" version="2.9.0" match="compatible"/>
46+
<import plugin="org.eclipse.jdt.launching.macosx" filter="(osgi.os=macosx)"/>
4647
</requires>
4748

4849
<plugin
@@ -105,11 +106,6 @@
105106
id="org.hamcrest.core"
106107
version="0.0.0"/>
107108

108-
<plugin
109-
id="org.eclipse.jdt.launching.macosx"
110-
os="macosx"
111-
version="0.0.0"/>
112-
113109
<plugin
114110
id="org.eclipse.ant.launching"
115111
version="0.0.0"/>

0 commit comments

Comments
 (0)