Merge pull request square#3618 from square/jw/platform/2021-08-17

Use one subtype per platform for simplicity
Tyeeee · Sep 20, 2021 · af55996 · af55996
2 parents 936bb98 + a850fc1
commit af55996
Show file tree

Hide file tree

Showing 8 changed files with 313 additions and 165 deletions.
diff --git a/retrofit/android-test/src/androidTest/java/retrofit2/PlatformTest.java b/retrofit/android-test/src/androidTest/java/retrofit2/PlatformTest.java
diff --git a/retrofit/src/main/java/retrofit2/CompletableFutureCallAdapterFactory.java b/retrofit/src/main/java/retrofit2/CompletableFutureCallAdapterFactory.java
@@ -15,6 +15,7 @@
  */
 package retrofit2;
 
+import android.annotation.TargetApi;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -23,9 +24,8 @@
 import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
 
 @IgnoreJRERequirement // Only added when CompletableFuture is available (Java 8+ / Android API 24+).
+@TargetApi(24)
 final class CompletableFutureCallAdapterFactory extends CallAdapter.Factory {
-  static final CallAdapter.Factory INSTANCE = new CompletableFutureCallAdapterFactory();
-
   @Override
   public @Nullable CallAdapter<?, ?> get(
       Type returnType, Annotation[] annotations, Retrofit retrofit) {

diff --git a/retrofit/src/main/java/retrofit2/OptionalConverterFactory.java b/retrofit/src/main/java/retrofit2/OptionalConverterFactory.java
@@ -15,6 +15,7 @@
  */
 package retrofit2;
 
+import android.annotation.TargetApi;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
@@ -25,9 +26,8 @@
 import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
 
 @IgnoreJRERequirement // Only added when Optional is available (Java 8+ / Android API 24+).
+@TargetApi(24)
 final class OptionalConverterFactory extends Converter.Factory {
-  static final Converter.Factory INSTANCE = new OptionalConverterFactory();
-
   @Override
   public @Nullable Converter<ResponseBody, ?> responseBodyConverter(
       Type type, Annotation[] annotations, Retrofit retrofit) {