Drop SDK 36 (expo#11033)

android/app/build.gradle

@@ -191,10 +191,6 @@ dependencies {
   implementation(project(':expoview-abi37_0_0'))
   // END_SDK_37
 
-  // BEGIN_SDK_36
-  implementation(project(':expoview-abi36_0_0'))
-  // END_SDK_36
-
   // This is not needed in shell apps, the Amplitude module will include this dep if installed
   implementation 'com.amplitude:android-sdk:2.23.2'
 

android/build.gradle

@@ -47,9 +47,6 @@ allprojects {
     maven {
       url "$rootDir/versioned-abis/expoview-abi37_0_0/maven"
     }
-    maven {
-      url "$rootDir/versioned-abis/expoview-abi36_0_0/maven"
-    }
     maven {
       url "$rootDir/versioned-abis/maven"
     }

android/expoview/build.gradle

@@ -221,9 +221,6 @@ dependencies {
   // BEGIN_SDK_37
   api 'host.exp:reactandroid-abi37_0_0:1.0.0'
   // END_SDK_37
-  // BEGIN_SDK_36
-  api 'host.exp:reactandroid-abi36_0_0:1.0.0'
-  // END_SDK_36
   // WHEN_PREPARING_SHELL_REMOVE_TO_HERE
   // WHEN_VERSIONING_REMOVE_TO_HERE
   // WHEN_DISTRIBUTING_REMOVE_TO_HERE

android/expoview/src/main/java/host/exp/exponent/Constants.java

@@ -84,9 +84,6 @@ public static void setSdkVersions(List<String> sdkVersions) {
     // BEGIN_SDK_37
     abiVersions.add("37.0.0");
     // END_SDK_37
-    // BEGIN_SDK_36
-    abiVersions.add("36.0.0");
-    // END_SDK_36
     // WHEN_PREPARING_SHELL_REMOVE_TO_HERE
     // WHEN_DISTRIBUTING_REMOVE_TO_HERE
 

android/expoview/src/main/java/host/exp/exponent/experience/MultipleVersionReactNativeActivity.java

@@ -7,10 +7,6 @@ public class MultipleVersionReactNativeActivity extends ReactNativeActivity impl
     // The 4-space indentation is used by android-build-aar.sh.
     // WHEN_DISTRIBUTING_REMOVE_FROM_HERE
     // WHEN_PREPARING_SHELL_REMOVE_FROM_HERE
-    // BEGIN_SDK_36
-    abi36_0_0.com.facebook.react.modules.core.DefaultHardwareBackBtnHandler,
-    abi36_0_0.com.facebook.react.modules.core.PermissionAwareActivity,
-    // END_SDK_36
     // BEGIN_SDK_37
     abi37_0_0.com.facebook.react.modules.core.DefaultHardwareBackBtnHandler,
     abi37_0_0.com.facebook.react.modules.core.PermissionAwareActivity,
@@ -30,12 +26,6 @@ public class MultipleVersionReactNativeActivity extends ReactNativeActivity impl
 
     // WHEN_DISTRIBUTING_REMOVE_FROM_HERE
     // WHEN_PREPARING_SHELL_REMOVE_FROM_HERE
-    // BEGIN_SDK_36
-    @Override
-    public void requestPermissions(String[] strings, int i, abi36_0_0.com.facebook.react.modules.core.PermissionListener permissionListener) {
-      super.requestPermissions(strings, i, permissionListener::onRequestPermissionsResult);
-    }
-    // END_SDK_36
     // BEGIN_SDK_37
     @Override
     public void requestPermissions(String[] strings, int i, abi37_0_0.com.facebook.react.modules.core.PermissionListener permissionListener) {

android/expoview/src/main/java/host/exp/exponent/experience/ReactNativeActivity.java

@@ -429,9 +429,8 @@ public RNObject startReactInstance(final Exponent.StartReactInstanceDelegate del
     RNObject versionedUtils = new RNObject("host.exp.exponent.VersionedUtils").loadVersion(mSDKVersion);
     RNObject builder = versionedUtils.callRecursive("getReactInstanceManagerBuilder", instanceManagerBuilderProperties);
 
-    if (ABIVersion.toNumber(mSDKVersion) >= ABIVersion.toNumber("36.0.0")) {
-      builder.call("setCurrentActivity", this);
-    }
+    // This used to not be called prior to SDK 36
+    builder.call("setCurrentActivity", this);
 
     // ReactNativeInstance is considered to be resumed when it has its activity attached, which is expected to be the case here
     builder.call("setInitialLifecycleState", RNObject.versionedEnum(mSDKVersion, "com.facebook.react.common.LifecycleState", "RESUMED"));

android/expoview/src/main/java/host/exp/exponent/utils/ExperienceActivityUtils.java

@@ -253,16 +253,8 @@ private static String setStyle(@Nullable final String style, final Activity acti
           appliedStatusBarStyle = STATUS_BAR_STYLE_DARK_CONTENT;
           break;
         default:
-          // TODO: remove this once SDK36 is phased out
-          if (ABIVersion.toNumber(sdkVersion) < ABIVersion.toNumber("37.0.0")) {
-            // defaults to "light-content" on pre SDK37
-            systemUiVisibilityFlags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-            appliedStatusBarStyle = STATUS_BAR_STYLE_LIGHT_CONTENT;
-          } else {
-            // default to "dark-content" since SDK37
-            systemUiVisibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-            appliedStatusBarStyle = STATUS_BAR_STYLE_DARK_CONTENT;
-          }
+          systemUiVisibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+          appliedStatusBarStyle = STATUS_BAR_STYLE_DARK_CONTENT;
           break;
       }
       decorView.setSystemUiVisibility(systemUiVisibilityFlags);

android/sdkVersions.json

@@ -1 +1 @@
-{"sdkVersions":["36.0.0","37.0.0","38.0.0","39.0.0"]}
+{"sdkVersions":["37.0.0","38.0.0","39.0.0"]}

android/settings.gradle

@@ -16,7 +16,6 @@ project(":expo-random").projectDir = new File("../packages/expo-random/android")
     "abi39_0_0",
     "abi38_0_0",
     "abi37_0_0",
-    "abi36_0_0",
 ].forEach({ abiVariant ->
   include ":expoview-$abiVariant"
   project(":expoview-$abiVariant").projectDir = new File(rootDir, "versioned-abis/expoview-$abiVariant")