Merge pull request #3390 from square/baron1405-platform-fix

Use system properties to detect Android

retrofit/android-test/src/androidTest/java/retrofit2/PlatformTest.java

+/*
+ * Copyright (C) 2020 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package retrofit2;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public final class PlatformTest {
+  @Test public void isAndroid() {
+    assertTrue(Platform.get() instanceof Platform.Android);
+  }
+}

retrofit/src/main/java/retrofit2/Platform.java

@@ -39,14 +39,9 @@ class Platform {
   }
 
   private static Platform findPlatform() {
-    try {
-      Class.forName("android.os.Build");
-      if (Build.VERSION.SDK_INT != 0) {
-        return new Android();
-      }
-    } catch (ClassNotFoundException ignored) {
-    }
-    return new Platform(true);
+    return "Dalvik".equals(System.getProperty("java.vm.name"))
+        ? new Android() //
+        : new Platform(true);
   }
 
   private final boolean hasJava8Types;

retrofit/src/test/java/retrofit2/PlatformTest.java

+/*
+ * Copyright (C) 2020 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package retrofit2;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+public final class PlatformTest {
+  @Test
+  public void isAndroid() {
+    assertFalse(Platform.get() instanceof Platform.Android);
+  }
+}