From 1123b166488338251a074de614bf0d52bea540cd Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 15 Apr 2024 07:48:19 +0200 Subject: [PATCH] Make AWT and Swing imports optional --- sdk/argeo-build | 2 +- swt/rap/org.argeo.swt.specific.rap/bnd.bnd | 1 + swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/argeo-build b/sdk/argeo-build index ec9a0b67c..c5ce5217b 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c +Subproject commit c5ce5217b5433d7470628c1ccb90141a028d3378 diff --git a/swt/rap/org.argeo.swt.specific.rap/bnd.bnd b/swt/rap/org.argeo.swt.specific.rap/bnd.bnd index bcd9b195f..e022057f3 100644 --- a/swt/rap/org.argeo.swt.specific.rap/bnd.bnd +++ b/swt/rap/org.argeo.swt.specific.rap/bnd.bnd @@ -2,4 +2,5 @@ Import-Package: org.eclipse.swt,\ org.eclipse.jface.dialogs,\ org.eclipse.swt.events,\ javax.servlet.http;version="[3,5)",\ +java.awt.*;resolution:=optional,\ * diff --git a/swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd b/swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd index 23ea12bc1..f8e30ba2a 100644 --- a/swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd +++ b/swt/rcp/org.argeo.swt.specific.rcp/bnd.bnd @@ -5,6 +5,9 @@ org.eclipse.core.commands;resolution:=optional,\ org.eclipse.swt,\ javax.servlet.http;resolution:=optional,\ javax.servlet;resolution:=optional,\ +java.awt.*;resolution:=optional,\ +javax.swing.*;resolution:=optional,\ +org.eclipse.swt.awt.*;resolution:=optional,\ * Export-Package: org.argeo.*,\ -- 2.30.2