Browse Source

还原改动,新增jar

fluty 4 năm trước cách đây
mục cha
commit
e5e2ede6a5
55 tập tin đã thay đổi với 53 bổ sung59 xóa
  1. 0 3
      fq_plugin_base/build.gradle
  2. BIN
      fq_plugin_base/libs/animal-sniffer-annotations-1.16.jar
  3. BIN
      fq_plugin_base/libs/conscrypt-openjdk-uber-2.4.0.jar
  4. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Address.java
  5. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Authenticator.java
  6. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Cache.java
  7. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/CacheControl.java
  8. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/CertificatePinner.java
  9. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Challenge.java
  10. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Connection.java
  11. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ConnectionPool.java
  12. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ConnectionSpec.java
  13. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Cookie.java
  14. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Dispatcher.java
  15. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/EventListener.java
  16. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/FormBody.java
  17. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Handshake.java
  18. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Headers.java
  19. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/HttpUrl.java
  20. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Interceptor.java
  21. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/MediaType.java
  22. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/MultipartBody.java
  23. 2 2
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/OkHttpClient.java
  24. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/RealCall.java
  25. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Request.java
  26. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/RequestBody.java
  27. 2 4
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Response.java
  28. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ResponseBody.java
  29. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Route.java
  30. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocket.java
  31. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocketListener.java
  32. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/Internal.java
  33. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/Util.java
  34. 0 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/annotations/EverythingIsNonNull.java
  35. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/cache/CacheStrategy.java
  36. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/cache/DiskLruCache.java
  37. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/connection/RealConnection.java
  38. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/http/RealResponseBody.java
  39. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/http2/Http2Stream.java
  40. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Android10Platform.java
  41. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/AndroidPlatform.java
  42. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/ConscryptPlatform.java
  43. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Jdk9Platform.java
  44. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/JdkWithJettyBootPlatform.java
  45. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Platform.java
  46. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/ws/RealWebSocket.java
  47. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/AsyncTimeout.java
  48. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/Buffer.java
  49. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/BufferedSource.java
  50. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/ByteString.java
  51. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/HashingSink.java
  52. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/Okio.java
  53. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/RealBufferedSource.java
  54. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/Segment.java
  55. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/SegmentPool.java

+ 0 - 3
fq_plugin_base/build.gradle

@@ -25,7 +25,4 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.google.code.findbugs:jsr305:3.0.2'
-    api 'org.codehaus.mojo:animal-sniffer-annotations:1.16'
-    implementation 'org.conscrypt:conscrypt-openjdk-uber:1.4.0'
 }

BIN
fq_plugin_base/libs/animal-sniffer-annotations-1.16.jar


BIN
fq_plugin_base/libs/conscrypt-openjdk-uber-2.4.0.jar


+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Address.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3;
 import java.net.Proxy;
 import java.net.ProxySelector;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.HostnameVerifier;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Authenticator.java

@@ -16,7 +16,7 @@
 package com.fq.threelib.okhttp3;
 
 import java.io.IOException;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Performs either <strong>preemptive</strong> authentication before connecting to a proxy server,

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Cache.java

@@ -28,7 +28,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.cache.CacheRequest;
 import com.fq.threelib.okhttp3.internal.cache.CacheStrategy;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/CacheControl.java

@@ -1,7 +1,7 @@
 package com.fq.threelib.okhttp3;
 
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.http.HttpHeaders;
 
 /**

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/CertificatePinner.java

@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import com.fq.threelib.okhttp3.internal.tls.CertificateChainCleaner;
 import com.fq.threelib.okio.ByteString;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Challenge.java

@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 import static java.util.Collections.singletonMap;
 import static java.util.Collections.unmodifiableMap;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Connection.java

@@ -17,7 +17,7 @@
 package com.fq.threelib.okhttp3;
 
 import java.net.Socket;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * The sockets and streams of an HTTP, HTTPS, or HTTPS+HTTP/2 connection. May be used for multiple

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ConnectionPool.java

@@ -27,7 +27,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.connection.RealConnection;
 import com.fq.threelib.okhttp3.internal.connection.RouteDatabase;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ConnectionSpec.java

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3;
 
 import java.util.Arrays;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.internal.Util;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Cookie.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.http.HttpDate;
 import com.fq.threelib.okhttp3.internal.publicsuffix.PublicSuffixDatabase;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Dispatcher.java

@@ -25,7 +25,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.RealCall.AsyncCall;
 import com.fq.threelib.okhttp3.internal.Util;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/EventListener.java

@@ -20,7 +20,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Listener for metrics events. Extend this class to monitor the quantity, size, and duration of

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/FormBody.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.Buffer;
 import com.fq.threelib.okio.BufferedSink;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Handshake.java

@@ -21,7 +21,7 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import com.fq.threelib.okhttp3.internal.Util;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Headers.java

@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.http.HttpDate;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/HttpUrl.java

@@ -26,7 +26,7 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.publicsuffix.PublicSuffixDatabase;
 import com.fq.threelib.okio.Buffer;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Interceptor.java

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Observes, modifies, and potentially short-circuits requests going out and the corresponding

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/MediaType.java

@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * An <a href="http://tools.ietf.org/html/rfc2045">RFC 2045</a> Media Type, appropriate to describe

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/MultipartBody.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.Buffer;
 import com.fq.threelib.okio.BufferedSink;

+ 2 - 2
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/OkHttpClient.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -551,7 +551,7 @@ public class OkHttpClient implements Cloneable, Call.Factory, WebSocket.Factory
      * body, server processing, and reading the response body. If the call requires redirects or
      * retries all must complete within one timeout period.
      */
-    @android.support.annotation.Nullable
+    @IgnoreJRERequirement
     public Builder callTimeout(Duration duration) {
       callTimeout = checkDuration("timeout", duration.toMillis(), TimeUnit.MILLISECONDS);
       return this;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/RealCall.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.NamedRunnable;
 import com.fq.threelib.okhttp3.internal.cache.CacheInterceptor;
 import com.fq.threelib.okhttp3.internal.connection.ConnectInterceptor;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Request.java

@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.http.HttpMethod;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/RequestBody.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.BufferedSink;
 import com.fq.threelib.okio.ByteString;

+ 2 - 4
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Response.java

@@ -15,12 +15,11 @@
  */
 package com.fq.threelib.okhttp3;
 
-import android.support.annotation.Nullable;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.http.HttpHeaders;
 import com.fq.threelib.okio.Buffer;
 import com.fq.threelib.okio.BufferedSource;
@@ -46,8 +45,7 @@ public final class Response implements Closeable {
   final Protocol protocol;
   final int code;
   final String message;
-  final @Nullable
-  Handshake handshake;
+  final @Nullable Handshake handshake;
   final Headers headers;
   final @Nullable ResponseBody body;
   final @Nullable Response networkResponse;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ResponseBody.java

@@ -21,7 +21,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.Buffer;
 import com.fq.threelib.okio.BufferedSource;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Route.java

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * The concrete route used by a connection to reach an abstract origin server. When creating a

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocket.java

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okhttp3;
 
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okio.ByteString;
 
 /**

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocketListener.java

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okhttp3;
 
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okio.ByteString;
 
 public abstract class WebSocketListener {

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/Internal.java

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3.internal;
 
 import java.io.IOException;
 import java.net.Socket;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.Address;
 import com.fq.threelib.okhttp3.Call;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/Util.java

@@ -40,7 +40,7 @@ import java.util.TimeZone;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;

+ 0 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/annotations/EverythingIsNonNull.java

@@ -20,7 +20,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/cache/CacheStrategy.java

@@ -16,7 +16,7 @@
 package com.fq.threelib.okhttp3.internal.cache;
 
 import java.util.Date;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.CacheControl;
 import com.fq.threelib.okhttp3.Headers;
 import com.fq.threelib.okhttp3.Request;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/cache/DiskLruCache.java

@@ -32,7 +32,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.io.FileSystem;
 import com.fq.threelib.okhttp3.internal.platform.Platform;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/connection/RealConnection.java

@@ -31,7 +31,7 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/http/RealResponseBody.java

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okhttp3.internal.http;
 
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.MediaType;
 import com.fq.threelib.okhttp3.ResponseBody;
 import com.fq.threelib.okio.BufferedSource;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/http2/Http2Stream.java

@@ -23,7 +23,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.Headers;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.AsyncTimeout;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Android10Platform.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3.internal.platform;
 import android.annotation.SuppressLint;
 import android.net.ssl.SSLSockets;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.Protocol;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/AndroidPlatform.java

@@ -29,7 +29,7 @@ import java.security.cert.Certificate;
 import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSocket;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/ConscryptPlatform.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3.internal.platform;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Jdk9Platform.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3.internal.platform;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/JdkWithJettyBootPlatform.java

@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.Protocol;
 import com.fq.threelib.okhttp3.internal.Util;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Platform.java

@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/ws/RealWebSocket.java

@@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.Call;
 import com.fq.threelib.okhttp3.Callback;
 import com.fq.threelib.okhttp3.EventListener;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/AsyncTimeout.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okio;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.concurrent.TimeUnit;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 import static com.fq.threelib.okio.Util.checkOffsetAndCount;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/Buffer.java

@@ -29,7 +29,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/BufferedSource.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.Charset;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A source that keeps a buffer internally so that callers can do small reads without a performance

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/ByteString.java

@@ -29,7 +29,7 @@ import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/HashingSink.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/Okio.java

@@ -33,7 +33,7 @@ import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 import static com.fq.threelib.okio.Util.checkOffsetAndCount;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/RealBufferedSource.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 import static com.fq.threelib.okio.Util.checkOffsetAndCount;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/Segment.java

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okio;
 
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A segment of a buffer.

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/SegmentPool.java

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okio;
 
-import android.support.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A collection of unused segments, necessary to avoid GC churn and zero-fill.