summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-03-09 09:06:28 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2020-03-09 09:07:48 -0600
commit056cf472d98a135c9300b8e4ebe4cca109529cf2 (patch)
tree76c8550b3fd53af81d3490e8fb3ea2074f4e210e
parent0c161cc0c2bcd62ef10666d44107384cfc05b4b0 (diff)
ModuleLoader: move to right project
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--tunnel/build.gradle1
-rw-r--r--tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java (renamed from ui/src/main/java/com/wireguard/android/util/ModuleLoader.java)2
-rw-r--r--ui/build.gradle1
-rw-r--r--ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java2
4 files changed, 2 insertions, 4 deletions
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index 9c7d43f6..10494823 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -28,4 +28,5 @@ dependencies {
implementation "androidx.collection:collection:$collectionVersion"
implementation "com.google.code.findbugs:jsr305:$jsr305Version"
implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
+ implementation "net.i2p.crypto:eddsa:$eddsaVersion"
}
diff --git a/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java b/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java
index dcd5a041..f09d9a87 100644
--- a/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright © 2019 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2019-2020 WireGuard LLC. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
diff --git a/ui/build.gradle b/ui/build.gradle
index e4caeb6b..99852751 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -80,7 +80,6 @@ dependencies {
implementation "androidx.preference:preference:$preferenceVersion"
implementation "com.google.android.material:material:$materialComponentsVersion"
implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
- implementation "net.i2p.crypto:eddsa:$eddsaVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
}
diff --git a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
index aac649dd..5c83f1dc 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
@@ -14,8 +14,6 @@ import android.widget.Toast;
import com.wireguard.android.Application;
import com.wireguard.android.R;
import com.wireguard.android.util.ErrorMessages;
-import com.wireguard.android.util.ModuleLoader;
-import com.wireguard.android.util.ToolsInstaller;
import androidx.annotation.Nullable;
import androidx.preference.Preference;