summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2020-03-09 19:09:34 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2020-03-09 19:24:27 +0530
commit51e428cff5787093a8f9bc60cdfa4a8055701aec (patch)
tree12c0be7edd1dbd23b92b652aa0956671752c3c8c
parent3971b414c309fb959c87f353acb1b3f191d98d75 (diff)
Use AndroidX Nullable annotation everywhere
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--tunnel/build.gradle2
-rw-r--r--tunnel/src/main/java/com/wireguard/config/InetAddresses.java2
-rw-r--r--ui/src/main/java/com/wireguard/android/util/ModuleLoader.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index 984382e1..9c7d43f6 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -24,8 +24,8 @@ android {
dependencies {
api "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
api "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
- api "com.google.code.findbugs:jsr305:$jsr305Version"
implementation "androidx.annotation:annotation:$annotationsVersion"
implementation "androidx.collection:collection:$collectionVersion"
+ implementation "com.google.code.findbugs:jsr305:$jsr305Version"
implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
}
diff --git a/tunnel/src/main/java/com/wireguard/config/InetAddresses.java b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
index 5303e27f..1479b5ff 100644
--- a/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
@@ -12,7 +12,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* Utility methods for creating instances of {@link InetAddress}.
diff --git a/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java b/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java
index bf094a5e..dcd5a041 100644
--- a/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java
+++ b/ui/src/main/java/com/wireguard/android/util/ModuleLoader.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
public class ModuleLoader {
private static final String MODULE_PUBLIC_KEY_BASE64 = "RWRmHuT9PSqtwfsLtEx+QS06BJtLgFYteL9WCNjH7yuyu5Y1DieSN7If";