diff --git a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java index 337c27e44..0af537d49 100644 --- a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java +++ b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java @@ -140,7 +140,7 @@ public class AppExtensionManager { } private void loadAllExtensions() { - for (var ext : List.of("jdbc", "proc", "uacc")) { + for (var ext : List.of("proc", "uacc")) { var extension = findAndParseExtension(ext, baseLayer) .orElseThrow(() -> ExtensionException.corrupt("Missing module " + ext)); loadedExtensions.add(extension); diff --git a/build.gradle b/build.gradle index f623415f9..ef07b44ff 100644 --- a/build.gradle +++ b/build.gradle @@ -101,8 +101,7 @@ project.ext { os = org.gradle.internal.os.OperatingSystem.current() allExtensions = Stream.concat(Stream.of(project(':base')), Arrays.stream(file("$rootDir/ext").list()) .filter(s -> file("$rootDir/ext/$s/build.gradle").exists()) - .filter(s -> !s.equals('base') && !s.equals('csv') && !s.equals('office') && !s.equals('pdx') && !s.equals('jackson') && !s.equals( - 'collections')) + .filter(s -> !s.equals('base')) .map(l -> project(":$l"))).toList() fullVersion = file("$rootDir/private_files.txt").exists() arch = getArchName() @@ -208,7 +207,6 @@ def testTasks = [ project(':core').getTasksByName('test', true), project(':app').getTasksByName('test', true), project(':base').getTasksByName('localTest', true), - project(':jdbc').getTasksByName('localTest', true), project(':proc').getTasksByName('localTest', true), ] diff --git a/core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java b/core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java index 2f4c354ca..7307143dd 100644 --- a/core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java +++ b/core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java @@ -17,7 +17,7 @@ public interface NetworkTunnelStore extends DataStore { interface TunnelFunction { - NetworkTunnelSession create(int localPort, int remotePort, String address); + NetworkTunnelSession create(int localPort, int remotePort, String address) throws Exception; } DataStore getNetworkParent(); diff --git a/ext/jdbc/build.gradle b/ext/jdbc/build.gradle deleted file mode 100644 index 3e834dfae..000000000 --- a/ext/jdbc/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -plugins { id 'java' -} -apply from: "$rootDir/gradle/gradle_scripts/java.gradle" -apply from: "$rootDir/gradle/gradle_scripts/extension.gradle" diff --git a/ext/jdbc/src/main/java/module-info.java b/ext/jdbc/src/main/java/module-info.java deleted file mode 100644 index 84ec95b6e..000000000 --- a/ext/jdbc/src/main/java/module-info.java +++ /dev/null @@ -1 +0,0 @@ -module io.xpipe.ext.jdbc {}