[ios][android] Drop SDK 33 (#7014)

# Why Resolves #7012. # How Run `et remove-sdk`. # Test Plan | 🛠 | Android | iOS | | --- | :---: | :---: | | NCL | ✅ | ✅ |
expo · Feb 13, 2020 · 38ccf62 · 38ccf62
1 parent 4311483
commit 38ccf62
Show file tree

Hide file tree

Showing 4,053 changed files with 3,337 additions and 269,880 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -209,10 +209,6 @@ dependencies {
   implementation(project(':expoview-abi34_0_0'))
   // END_SDK_34
 
-  // BEGIN_SDK_33
-  implementation(project(':expoview-abi33_0_0'))
-  // END_SDK_33
-
   // This is not needed in shell apps, the Amplitude module will include this dep if installed
   implementation 'com.amplitude:android-sdk:2.23.2'
 
@@ -221,7 +217,7 @@ dependencies {
 
   /* UNCOMMENT WHEN DISTRIBUTING
   api 'org.webkit:android-jsc:r245459' // needs to be before react-native
-  api 'com.facebook.react:react-native:33.0.0'
+  api 'com.facebook.react:react-native:+'
   END UNCOMMENT WHEN DISTRIBUTING */
 
   // WHEN_DETACHING_REMOVE_FROM_HERE

diff --git a/android/app/src/androidTest/java/host/exp/exponent/TestSuiteTests.java b/android/app/src/androidTest/java/host/exp/exponent/TestSuiteTests.java
@@ -158,14 +158,6 @@ public void sdkUnversionedTestSuite() {
     runTestSuiteTest(ExponentBuildConstants.TEST_APP_URI, true);
   }
 
-  @Ignore
-  @Test
-  @ExpoTestSuiteTest
-  @ExpoSdkVersionTest("33.0.0")
-  public void sdk33TestSuite() {
-    runTestSuiteTest("exp://exp.host/@exponent_ci_bot/test-suite-sdk-33-0-0", false);
-  }
-
   @Test
   @ExpoAlwaysPassThroughFilter
   public void junitIsSillyAndWillFailIfThereIsntOneTestRunPerFile() {

diff --git a/android/build.gradle b/android/build.gradle
@@ -39,9 +39,6 @@ allprojects {
     maven {
       url "$rootDir/versioned-abis/expoview-abi36_0_0/maven"
     }
-    maven {
-      url "$rootDir/versioned-abis/expoview-abi33_0_0/maven"
-    }
     maven {
       url "$rootDir/versioned-abis/expoview-abi34_0_0/maven"
     }

diff --git a/android/expoview/build.gradle b/android/expoview/build.gradle
@@ -188,9 +188,6 @@ dependencies {
   // BEGIN_SDK_34
   api 'host.exp:reactandroid-abi34_0_0:1.0.0'
   // END_SDK_34
-  // BEGIN_SDK_33
-  api 'host.exp:reactandroid-abi33_0_0:1.0.0'
-  // END_SDK_33
   // WHEN_PREPARING_SHELL_REMOVE_TO_HERE
   // WHEN_VERSIONING_REMOVE_TO_HERE
   // WHEN_DISTRIBUTING_REMOVE_TO_HERE

diff --git a/android/expoview/src/main/java/host/exp/exponent/Constants.java b/android/expoview/src/main/java/host/exp/exponent/Constants.java
@@ -77,9 +77,6 @@ public static void setSdkVersions(List<String> sdkVersions) {
     // BEGIN_SDK_34
     abiVersions.add("34.0.0");
     // END_SDK_34
-    // BEGIN_SDK_33
-    abiVersions.add("33.0.0");
-    // END_SDK_33
     // WHEN_PREPARING_SHELL_REMOVE_TO_HERE
     // WHEN_DISTRIBUTING_REMOVE_TO_HERE
 

diff --git a/...poview/src/main/java/host/exp/exponent/experience/MultipleVersionReactNativeActivity.java b/...poview/src/main/java/host/exp/exponent/experience/MultipleVersionReactNativeActivity.java
@@ -7,9 +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_33
-    abi33_0_0.com.facebook.react.modules.core.DefaultHardwareBackBtnHandler,
-    // END_SDK_33
     // BEGIN_SDK_34
     abi34_0_0.com.facebook.react.modules.core.DefaultHardwareBackBtnHandler,
     // END_SDK_34

diff --git a/android/sdkVersions.json b/android/sdkVersions.json
@@ -1 +1 @@
-{"sdkVersions":["33.0.0","34.0.0","35.0.0"]}
+{"sdkVersions":["34.0.0","35.0.0"]}
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -12,7 +12,6 @@ project(':ReactAndroid').projectDir = new File(rootDir, 'ReactAndroid')
     "abi36_0_0",
     "abi35_0_0",
     "abi34_0_0",
-    "abi33_0_0",
 ].forEach({ abiVariant ->
   include ":expoview-$abiVariant"
   project(":expoview-$abiVariant").projectDir = new File(rootDir, "versioned-abis/expoview-$abiVariant")

diff --git a/android/versioned-abis/expoview-abi33_0_0/build.gradle b/android/versioned-abis/expoview-abi33_0_0/build.gradle
diff --git a/...-abis/expoview-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/1.0.0/_remote.repositories b/...-abis/expoview-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/1.0.0/_remote.repositories
diff --git a/...ew-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/1.0.0/reactandroid-abi33_0_0-1.0.0.aar b/...ew-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/1.0.0/reactandroid-abi33_0_0-1.0.0.aar
diff --git a/...ew-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/1.0.0/reactandroid-abi33_0_0-1.0.0.pom b/...ew-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/1.0.0/reactandroid-abi33_0_0-1.0.0.pom
diff --git a/...ed-abis/expoview-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/maven-metadata-local.xml b/...ed-abis/expoview-abi33_0_0/maven/host/exp/reactandroid-abi33_0_0/maven-metadata-local.xml
diff --git a/android/versioned-abis/expoview-abi33_0_0/src/main/AndroidManifest.xml b/android/versioned-abis/expoview-abi33_0_0/src/main/AndroidManifest.xml