diff --git a/README.md b/README.md index 091b6af8c..e07ab285f 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,9 @@ For more information on the security details visit [cryptomator.org](https://doc ``` cd main -mvn clean install -Prelease +mvn clean install -Prelease,windows +# or mvn clean install -Prelease,mac +# or mvn clean install -Prelease,linux ``` This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages. diff --git a/main/buildkit/assembly-linux.xml b/main/buildkit/assembly-linux.xml index 0764ada20..1e16da9e2 100644 --- a/main/buildkit/assembly-linux.xml +++ b/main/buildkit/assembly-linux.xml @@ -14,13 +14,6 @@ libs - - target/ - - ffi-version.txt - - libs - target/ diff --git a/main/buildkit/assembly-mac.xml b/main/buildkit/assembly-mac.xml index c7a10f2ef..4a01f4067 100644 --- a/main/buildkit/assembly-mac.xml +++ b/main/buildkit/assembly-mac.xml @@ -14,13 +14,6 @@ libs - - target/ - - ffi-version.txt - - libs - target/ diff --git a/main/buildkit/assembly-win.xml b/main/buildkit/assembly-win.xml index e0ff7df4b..0297f3ec4 100644 --- a/main/buildkit/assembly-win.xml +++ b/main/buildkit/assembly-win.xml @@ -14,13 +14,6 @@ libs - - target/ - - ffi-version.txt - - libs - target/ diff --git a/main/buildkit/src/main/resources/ffi-version.txt b/main/buildkit/src/main/resources/ffi-version.txt deleted file mode 100644 index 1853c270c..000000000 --- a/main/buildkit/src/main/resources/ffi-version.txt +++ /dev/null @@ -1 +0,0 @@ -${cryptomator.jni.version} \ No newline at end of file diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 7eaccf881..28a42ec07 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -31,10 +31,6 @@ org.cryptomator integrations-api - - org.cryptomator - jni - diff --git a/main/commons/src/main/java/org/cryptomator/common/JniModule.java b/main/commons/src/main/java/org/cryptomator/common/JniModule.java deleted file mode 100644 index aaeda2964..000000000 --- a/main/commons/src/main/java/org/cryptomator/common/JniModule.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019 Skymatic GmbH. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the accompanying LICENSE file. - *******************************************************************************/ -package org.cryptomator.common; - -import dagger.Module; -import dagger.Provides; -import org.cryptomator.jni.JniFunctions; -import org.cryptomator.jni.MacFunctions; -import org.cryptomator.jni.WinFunctions; - -import javax.inject.Singleton; -import java.util.Optional; - -@Module -@Deprecated -public class JniModule { - - @Provides - @Singleton - Optional provideOptionalMacFunctions() { - return JniFunctions.macFunctions(); - } - - @Provides - @Singleton - Optional provideOptionalWinFunctions() { - return JniFunctions.winFunctions(); - } - -} diff --git a/main/pom.xml b/main/pom.xml index de425bb3a..ae8070a29 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -29,7 +29,6 @@ 0.1.0-beta1 0.1.0-beta3 0.1.0-beta1 - 2.2.3 1.2.5 1.1.15 1.0.12 @@ -125,11 +124,6 @@ integrations-linux ${cryptomator.integrations.linux.version} - - org.cryptomator - jni - ${cryptomator.jni.version} - diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 7784ee802..9e63fb4b0 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -14,10 +14,6 @@ org.cryptomator commons - - org.cryptomator - jni - diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java index 63f119291..f4bed076b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java @@ -2,7 +2,6 @@ package org.cryptomator.ui.launcher; import dagger.Module; import dagger.Provides; -import org.cryptomator.common.JniModule; import org.cryptomator.integrations.autostart.AutoStartProvider; import org.cryptomator.integrations.tray.TrayIntegrationProvider; import org.cryptomator.integrations.uiappearance.UiAppearanceProvider; @@ -17,7 +16,7 @@ import java.util.ServiceLoader; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -@Module(includes = {JniModule.class}, subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class}) +@Module(subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class}) public abstract class UiLauncherModule { @Provides