From 70585358dbca7b0a812b61a577fcbf98014ea209 Mon Sep 17 00:00:00 2001
From: diegolmello <diegolmello@gmail.com>
Date: Mon, 5 Aug 2019 13:21:00 -0300
Subject: [PATCH] Migrate packages manually

---
 ...nimodules+react-native-adapter+3.0.0.patch |  15 +-
 patches/expo-constants+6.0.0.patch            |  24 ++
 patches/expo-file-system+6.0.0.patch          |  38 ++++
 patches/expo-permissions+6.0.0.patch          |  37 ++++
 patches/expo-web-browser+6.0.0.patch          | 209 ++++++++++++++++++
 patches/react-native-audio+4.3.0.patch        |  15 ++
 6 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 patches/expo-constants+6.0.0.patch
 create mode 100644 patches/expo-file-system+6.0.0.patch
 create mode 100644 patches/expo-permissions+6.0.0.patch
 create mode 100644 patches/expo-web-browser+6.0.0.patch
 create mode 100644 patches/react-native-audio+4.3.0.patch

diff --git a/patches/@unimodules+react-native-adapter+3.0.0.patch b/patches/@unimodules+react-native-adapter+3.0.0.patch
index f1f32cbd0..218f24197 100644
--- a/patches/@unimodules+react-native-adapter+3.0.0.patch
+++ b/patches/@unimodules+react-native-adapter+3.0.0.patch
@@ -14,4 +14,17 @@ index 70d03a5..d17b348 100644
 +  // }
 +  implementation 'com.facebook.react:react-native:+'
    api 'com.github.bumptech.glide:glide:4.9.0'
- }
\ No newline at end of file
+ }
+diff --git a/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java b/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java
+index 6541f47..d86d4d3 100644
+--- a/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java
++++ b/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java
+@@ -5,7 +5,7 @@ import android.content.Intent;
+ import android.graphics.Bitmap;
+ import android.graphics.drawable.Drawable;
+ import android.os.AsyncTask;
+-import android.support.annotation.NonNull;
++import androidx.annotation.NonNull;
+ import android.util.Log;
+ import android.view.View;
+ 
diff --git a/patches/expo-constants+6.0.0.patch b/patches/expo-constants+6.0.0.patch
new file mode 100644
index 000000000..43dfa666b
--- /dev/null
+++ b/patches/expo-constants+6.0.0.patch
@@ -0,0 +1,24 @@
+diff --git a/node_modules/expo-constants/android/build.gradle b/node_modules/expo-constants/android/build.gradle
+index 5afacdf..b1054a0 100644
+--- a/node_modules/expo-constants/android/build.gradle
++++ b/node_modules/expo-constants/android/build.gradle
+@@ -75,5 +75,5 @@ dependencies {
+   unimodule 'unimodules-constants-interface'
+ 
+   api 'com.facebook.device.yearclass:yearclass:2.1.0'
+-  api "com.android.support:support-annotations:${safeExtGet("supportLibVersion", "28.0.0")}"
++  api "androidx.annotation:annotation:1.0.0"
+ }
+diff --git a/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java b/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java
+index 4989672..888d84f 100644
+--- a/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java
++++ b/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java
+@@ -3,7 +3,7 @@ package expo.modules.constants;
+ import android.content.Context;
+ import android.content.res.Resources;
+ import android.os.Build;
+-import android.support.annotation.Nullable;
++import androidx.annotation.Nullable;
+ import android.util.DisplayMetrics;
+ 
+ import com.facebook.device.yearclass.YearClass;
diff --git a/patches/expo-file-system+6.0.0.patch b/patches/expo-file-system+6.0.0.patch
new file mode 100644
index 000000000..141dd9642
--- /dev/null
+++ b/patches/expo-file-system+6.0.0.patch
@@ -0,0 +1,38 @@
+diff --git a/node_modules/expo-file-system/android/build.gradle b/node_modules/expo-file-system/android/build.gradle
+index cd9ab67..83764fd 100644
+--- a/node_modules/expo-file-system/android/build.gradle
++++ b/node_modules/expo-file-system/android/build.gradle
+@@ -78,6 +78,6 @@ dependencies {
+   api 'commons-io:commons-io:1.4'
+   api 'com.squareup.okhttp3:okhttp:3.10.0'
+   api 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
+-  api "com.android.support:support-v4:${safeExtGet("supportLibVersion", "28.0.0")}"
++  api "androidx.legacy:legacy-support-v4:1.0.0"
+ }
+   
+diff --git a/node_modules/expo-file-system/android/src/main/AndroidManifest.xml b/node_modules/expo-file-system/android/src/main/AndroidManifest.xml
+index da97401..ec3f033 100644
+--- a/node_modules/expo-file-system/android/src/main/AndroidManifest.xml
++++ b/node_modules/expo-file-system/android/src/main/AndroidManifest.xml
+@@ -9,7 +9,7 @@
+     <application>
+         <provider
+             tools:replace="android:authorities"
+-            android:name="android.support.v4.content.FileProvider"
++            android:name="androidx.core.content.FileProvider"
+             android:authorities="${applicationId}.provider"
+             android:exported="false"
+             android:grantUriPermissions="true"
+diff --git a/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java b/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java
+index 93e4385..ee53f7c 100644
+--- a/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java
++++ b/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java
+@@ -6,7 +6,7 @@ import android.content.res.Resources;
+ import android.net.Uri;
+ import android.os.AsyncTask;
+ import android.os.Bundle;
+-import android.support.v4.content.FileProvider;
++import androidx.core.content.FileProvider;
+ import android.util.Base64;
+ import android.util.Log;
+ 
diff --git a/patches/expo-permissions+6.0.0.patch b/patches/expo-permissions+6.0.0.patch
new file mode 100644
index 000000000..adff93922
--- /dev/null
+++ b/patches/expo-permissions+6.0.0.patch
@@ -0,0 +1,37 @@
+diff --git a/node_modules/expo-permissions/android/build.gradle b/node_modules/expo-permissions/android/build.gradle
+index 5d0fd9e..aa5ebf2 100644
+--- a/node_modules/expo-permissions/android/build.gradle
++++ b/node_modules/expo-permissions/android/build.gradle
+@@ -74,5 +74,5 @@ dependencies {
+   unimodule 'unimodules-core'
+   unimodule 'unimodules-permissions-interface'
+ 
+-  api "com.android.support:appcompat-v7:${safeExtGet("supportLibVersion", "28.0.0")}"
++  api "androidx.appcompat:appcompat:1.0.0"
+ }
+diff --git a/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsModule.java b/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsModule.java
+index 9027678..53edd85 100644
+--- a/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsModule.java
++++ b/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsModule.java
+@@ -12,7 +12,7 @@ import android.net.Uri;
+ import android.os.Build;
+ import android.os.Bundle;
+ import android.provider.Settings;
+-import android.support.v4.app.NotificationManagerCompat;
++import androidx.core.app.NotificationManagerCompat;
+ 
+ import org.unimodules.core.ExportedModule;
+ import org.unimodules.core.ModuleRegistry;
+diff --git a/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.java b/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.java
+index f9a3d06..b2d77cc 100644
+--- a/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.java
++++ b/node_modules/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.java
+@@ -2,7 +2,7 @@ package expo.modules.permissions;
+ 
+ import android.content.Context;
+ import android.content.pm.PackageManager;
+-import android.support.v4.content.ContextCompat;
++import androidx.core.content.ContextCompat;
+ 
+ import java.util.Arrays;
+ import java.util.Collections;
diff --git a/patches/expo-web-browser+6.0.0.patch b/patches/expo-web-browser+6.0.0.patch
new file mode 100644
index 000000000..44d7aa198
--- /dev/null
+++ b/patches/expo-web-browser+6.0.0.patch
@@ -0,0 +1,209 @@
+diff --git a/node_modules/expo-web-browser/android/build.gradle b/node_modules/expo-web-browser/android/build.gradle
+index b67b498..6968ca5 100644
+--- a/node_modules/expo-web-browser/android/build.gradle
++++ b/node_modules/expo-web-browser/android/build.gradle
+@@ -73,5 +73,5 @@ if (new File(rootProject.projectDir.parentFile, 'package.json').exists()) {
+ dependencies {
+   unimodule 'unimodules-core'
+ 
+-  api "com.android.support:customtabs:${safeExtGet("supportLibVersion", "28.0.0")}"
++  api "androidx.browser:browser:1.0.0"
+ }
+diff --git a/node_modules/expo-web-browser/android/expo-web-browser.iml b/node_modules/expo-web-browser/android/expo-web-browser.iml
+new file mode 100644
+index 0000000..915990b
+--- /dev/null
++++ b/node_modules/expo-web-browser/android/expo-web-browser.iml
+@@ -0,0 +1,131 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<module external.linked.project.id=":expo-web-browser" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../../android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
++  <component name="FacetManager">
++    <facet type="android-gradle" name="Android-Gradle">
++      <configuration>
++        <option name="GRADLE_PROJECT_PATH" value=":expo-web-browser" />
++      </configuration>
++    </facet>
++    <facet type="android" name="Android">
++      <configuration>
++        <option name="SELECTED_BUILD_VARIANT" value="debug" />
++        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
++        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
++        <afterSyncTasks>
++          <task>generateDebugSources</task>
++        </afterSyncTasks>
++        <option name="ALLOW_USER_CONFIGURATION" value="false" />
++        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
++        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
++        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
++        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
++        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
++        <option name="PROJECT_TYPE" value="1" />
++      </configuration>
++    </facet>
++  </component>
++  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
++    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
++    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
++    <exclude-output />
++    <content url="file://$MODULE_DIR$">
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
++      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
++      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
++      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
++      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
++    </content>
++    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
++    <orderEntry type="sourceFolder" forTests="false" />
++    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.browser:browser:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
++    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
++    <orderEntry type="module" module-name="unimodules-core" />
++  </component>
++</module>
+\ No newline at end of file
+diff --git a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java
+index 26d4c53..1c582a0 100644
+--- a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java
++++ b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java
+@@ -5,10 +5,10 @@ import android.content.Intent;
+ import android.content.pm.PackageManager;
+ import android.content.pm.ResolveInfo;
+ import android.net.Uri;
+-import android.support.annotation.NonNull;
+-import android.support.annotation.Nullable;
+-import android.support.customtabs.CustomTabsClient;
+-import android.support.customtabs.CustomTabsIntent;
++import androidx.annotation.NonNull;
++import androidx.annotation.Nullable;
++import androidx.browser.customtabs.CustomTabsClient;
++import androidx.browser.customtabs.CustomTabsIntent;
+ 
+ import org.unimodules.core.ModuleRegistry;
+ import org.unimodules.core.errors.CurrentActivityNotFoundException;
+@@ -22,7 +22,7 @@ import java.util.List;
+ 
+ import expo.modules.webbrowser.error.PackageManagerNotFoundException;
+ 
+-import static android.support.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION;
++import static androidx.browser.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION;
+ 
+ class CustomTabsActivitiesHelper {
+ 
+diff --git a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java
+index 1b783a3..08647a8 100644
+--- a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java
++++ b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java
+@@ -3,9 +3,9 @@ package expo.modules.webbrowser;
+ import android.content.ComponentName;
+ import android.content.Context;
+ import android.net.Uri;
+-import android.support.customtabs.CustomTabsClient;
+-import android.support.customtabs.CustomTabsServiceConnection;
+-import android.support.customtabs.CustomTabsSession;
++import androidx.browser.customtabs.CustomTabsClient;
++import androidx.browser.customtabs.CustomTabsServiceConnection;
++import androidx.browser.customtabs.CustomTabsSession;
+ 
+ import org.unimodules.core.interfaces.LifecycleEventListener;
+ 
+diff --git a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java
+index 4112a7d..660d67b 100644
+--- a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java
++++ b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java
+@@ -6,8 +6,8 @@ import android.content.pm.ResolveInfo;
+ import android.graphics.Color;
+ import android.net.Uri;
+ import android.os.Bundle;
+-import android.support.annotation.Nullable;
+-import android.support.customtabs.CustomTabsIntent;
++import androidx.annotation.Nullable;
++import androidx.browser.customtabs.CustomTabsIntent;
+ import android.text.TextUtils;
+ 
+ import org.unimodules.core.ExportedModule;
diff --git a/patches/react-native-audio+4.3.0.patch b/patches/react-native-audio+4.3.0.patch
new file mode 100644
index 000000000..3264c7a8f
--- /dev/null
+++ b/patches/react-native-audio+4.3.0.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java b/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java
+index f6cecf6..e9070b5 100644
+--- a/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java
++++ b/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java
+@@ -27,8 +27,8 @@ import android.os.Build;
+ import android.os.Environment;
+ import android.media.MediaRecorder;
+ import android.media.AudioManager;
+-import android.support.v4.app.ActivityCompat;
+-import android.support.v4.content.ContextCompat;
++import androidx.core.app.ActivityCompat;
++import androidx.core.content.ContextCompat;
+ import android.util.Base64;
+ import android.util.Log;
+ import com.facebook.react.modules.core.DeviceEventManagerModule;