Merge branch release-10.0 into master

This commit is contained in:
crschnick
2024-06-15 10:40:03 +00:00
parent bc9b962be9
commit 4426eb2424
343 changed files with 9172 additions and 4358 deletions
+12 -34
View File
@@ -1,7 +1,7 @@
import com.fasterxml.jackson.databind.Module;
import io.xpipe.app.beacon.impl.*;
import io.xpipe.app.browser.action.BrowserAction;
import io.xpipe.app.core.AppLogs;
import io.xpipe.app.exchange.*;
import io.xpipe.app.exchange.cli.*;
import io.xpipe.app.ext.*;
import io.xpipe.app.issue.EventHandler;
import io.xpipe.app.issue.EventHandlerImpl;
@@ -10,15 +10,15 @@ import io.xpipe.app.util.AppJacksonModule;
import io.xpipe.app.util.LicenseProvider;
import io.xpipe.app.util.ProxyManagerProviderImpl;
import io.xpipe.app.util.TerminalLauncher;
import io.xpipe.beacon.BeaconInterface;
import io.xpipe.core.util.DataStateProvider;
import io.xpipe.core.util.ModuleLayerLoader;
import io.xpipe.core.util.ProxyFunction;
import io.xpipe.core.util.ProxyManagerProvider;
import com.fasterxml.jackson.databind.Module;
import org.slf4j.spi.SLF4JServiceProvider;
open module io.xpipe.app {
exports io.xpipe.app.beacon;
exports io.xpipe.app.core;
exports io.xpipe.app.util;
exports io.xpipe.app;
@@ -52,6 +52,7 @@ open module io.xpipe.app {
requires com.vladsch.flexmark;
requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;
requires com.fasterxml.jackson.annotation;
requires net.synedra.validatorfx;
requires org.kordamp.ikonli.feather;
requires io.xpipe.modulefs;
@@ -79,14 +80,6 @@ open module io.xpipe.app {
requires net.steppschuh.markdowngenerator;
requires com.shinyhut.vernacular;
// Required by extensions
requires java.security.jgss;
requires java.security.sasl;
requires java.xml;
requires java.xml.crypto;
requires java.sql;
requires java.sql.rowset;
// Required runtime modules
requires jdk.charsets;
requires jdk.crypto.cryptoki;
@@ -100,8 +93,8 @@ open module io.xpipe.app {
// For debugging
requires jdk.jdwp.agent;
requires org.kordamp.ikonli.core;
requires jdk.httpserver;
uses MessageExchangeImpl;
uses TerminalLauncher;
uses io.xpipe.app.ext.ActionProvider;
uses EventHandler;
@@ -113,11 +106,13 @@ open module io.xpipe.app {
uses BrowserAction;
uses LicenseProvider;
uses io.xpipe.app.util.LicensedFeature;
uses io.xpipe.beacon.BeaconInterface;
uses DataStorageExtensionProvider;
provides Module with
AppJacksonModule;
provides ModuleLayerLoader with
MessageExchangeImpls.Loader,
DataStorageExtensionProvider.Loader,
DataStoreProviders.Loader,
ActionProvider.Loader,
PrefsProvider.Loader,
@@ -132,26 +127,9 @@ open module io.xpipe.app {
AppLogs.Slf4jProvider;
provides EventHandler with
EventHandlerImpl;
provides MessageExchangeImpl with
ReadDrainExchangeImpl,
EditStoreExchangeImpl,
StoreProviderListExchangeImpl,
OpenExchangeImpl,
LaunchExchangeImpl,
FocusExchangeImpl,
StatusExchangeImpl,
DrainExchangeImpl,
SinkExchangeImpl,
StopExchangeImpl,
ModeExchangeImpl,
DialogExchangeImpl,
RemoveStoreExchangeImpl,
RenameStoreExchangeImpl,
ListStoresExchangeImpl,
StoreAddExchangeImpl,
provides BeaconInterface with ShellStartExchangeImpl, ShellStopExchangeImpl, ShellExecExchangeImpl, ConnectionQueryExchangeImpl, DaemonOpenExchangeImpl, DaemonFocusExchangeImpl, DaemonStatusExchangeImpl, DaemonStopExchangeImpl,
HandshakeExchangeImpl, DaemonModeExchangeImpl,
AskpassExchangeImpl,
TerminalWaitExchangeImpl,
TerminalLaunchExchangeImpl,
QueryStoreExchangeImpl,
VersionExchangeImpl;
TerminalLaunchExchangeImpl, DaemonVersionExchangeImpl;
}