From 51e428cff5787093a8f9bc60cdfa4a8055701aec Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 9 Mar 2020 19:09:34 +0530 Subject: Use AndroidX Nullable annotation everywhere Signed-off-by: Harsh Shandilya --- tunnel/build.gradle | 2 +- tunnel/src/main/java/com/wireguard/config/InetAddresses.java | 2 +- ui/src/main/java/com/wireguard/android/util/ModuleLoader.java | 2 +- 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"; -- cgit v1.2.3