Bump up RN and Expo

2025-06-05 22:19:13 +02:00 · 2022-05-08 22:35:43 +02:00
parent 4c9f93497d
commit 8c2dcf2e7d
40 changed files with 2828 additions and 2982 deletions
--- a/patches/expo-av+10.2.1.patch
+++ b/patches/expo-av+10.2.1.patch
@@ -1,81 +0,0 @@
-diff --git a/node_modules/expo-av/ios/EXAV/EXAV.m b/node_modules/expo-av/ios/EXAV/EXAV.m
-index d255852..edf934f 100644
--- a/node_modules/expo-av/ios/EXAV/EXAV.m
-+++ b/node_modules/expo-av/ios/EXAV/EXAV.m
-@@ -63,7 +63,7 @@ NSString *const EXDidUpdateMetadataEventName = @"didUpdateMetadata";
- @property (nonatomic, assign) BOOL audioRecorderShouldBeginRecording;
- @property (nonatomic, assign) int audioRecorderDurationMillis;
- 
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-+@property (nonatomic, weak) EXModuleRegistry *expoModuleRegistry;
- @property (nonatomic, weak) id<EXPermissionsInterface> permissionsManager;
- 
- @end
-@@ -106,7 +106,7 @@ EX_EXPORT_MODULE(ExponentAV);
- 
- - (void)installJsiBindings
- {
-  id<EXJavaScriptContextProvider> jsContextProvider = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXJavaScriptContextProvider)];
-+  id<EXJavaScriptContextProvider> jsContextProvider = [_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXJavaScriptContextProvider)];
-   void *jsRuntimePtr = [jsContextProvider javaScriptRuntimePointer];
-   if (jsRuntimePtr) {
-     [self installJSIBindingsForRuntime:jsRuntimePtr withSoundDictionary:_soundDictionary];
-@@ -131,16 +131,16 @@ EX_EXPORT_MODULE(ExponentAV);
- 
- #pragma mark - Expo experience lifecycle
- 
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-+- (void)setModuleRegistry:(EXModuleRegistry *)expoModuleRegistry
- {
-  [[_moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)] unregisterAppLifecycleListener:self];
-  _moduleRegistry = moduleRegistry;
-  _kernelAudioSessionManagerDelegate = [_moduleRegistry getSingletonModuleForName:@"AudioSessionManager"];
-+  [[_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)] unregisterAppLifecycleListener:self];
-+  _expoModuleRegistry = expoModuleRegistry;
-+  _kernelAudioSessionManagerDelegate = [_expoModuleRegistry getSingletonModuleForName:@"AudioSessionManager"];
-   if (!_isBackgrounded) {
-     [_kernelAudioSessionManagerDelegate moduleDidForeground:self];
-   }
-  [[_moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)] registerAppLifecycleListener:self];
-  _permissionsManager = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXPermissionsInterface)];
-+  [[_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)] registerAppLifecycleListener:self];
-+  _permissionsManager = [_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXPermissionsInterface)];
-   [EXPermissionsMethodsDelegate registerRequesters:@[[EXAudioRecordingPermissionRequester new]] withPermissionsManager:_permissionsManager];
- }
- 
-@@ -478,7 +478,7 @@ withEXVideoViewForTag:(nonnull NSNumber *)reactTag
- {
-   // TODO check that the bridge is still valid after the dispatch
-   // TODO check if the queues are ok
-  [[_moduleRegistry getModuleImplementingProtocol:@protocol(EXUIManager)] executeUIBlock:^(id view) {
-+  [[_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXUIManager)] executeUIBlock:^(id view) {
-     if ([view isKindOfClass:[EXVideoView class]]) {
-       block(view);
-     } else {
-@@ -566,7 +566,7 @@ withEXVideoViewForTag:(nonnull NSNumber *)reactTag
-     return EXErrorWithMessage(@"Recorder is already prepared.");
-   }
-   
-  id<EXFileSystemInterface> fileSystem = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXFileSystemInterface)];
-+  id<EXFileSystemInterface> fileSystem = [_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXFileSystemInterface)];
-   
-   if (!fileSystem) {
-     return EXErrorWithMessage(@"No FileSystem module.");
-@@ -726,7 +726,7 @@ EX_EXPORT_METHOD_AS(loadForSound,
- 
- - (void)sendEventWithName:(NSString *)eventName body:(NSDictionary *)body
- {
-  [[_moduleRegistry getModuleImplementingProtocol:@protocol(EXEventEmitterService)] sendEventWithName:eventName body:body];
-+  [[_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXEventEmitterService)] sendEventWithName:eventName body:body];
- }
- 
- EX_EXPORT_METHOD_AS(unloadForSound,
-@@ -984,7 +984,7 @@ EX_EXPORT_METHOD_AS(unloadAudioRecorder,
- - (void)dealloc
- {
-   [_kernelAudioSessionManagerDelegate moduleWillDeallocate:self];
-  [[_moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)] unregisterAppLifecycleListener:self];
-+  [[_expoModuleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)] unregisterAppLifecycleListener:self];
-   [[NSNotificationCenter defaultCenter] removeObserver:self];
-   
-   // This will clear all @properties and deactivate the audio session:
--- a/patches/expo-file-system+13.2.0.patch
+++ b/patches/expo-file-system+13.2.0.patch
@@ -1,166 +0,0 @@
-diff --git a/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt b/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt
-index 53bf40f..0ba5d89 100644
--- a/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt
-+++ b/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt
-@@ -56,6 +56,7 @@ import okhttp3.Callback
- import okhttp3.Headers
- import okhttp3.JavaNetCookieJar
- import okhttp3.MediaType
-+import okhttp3.MediaType.Companion.toMediaTypeOrNull
- import okhttp3.MultipartBody
- import okhttp3.OkHttpClient
- import okhttp3.Request
-@@ -63,11 +64,7 @@ import okhttp3.RequestBody
- import okhttp3.Response
- import okhttp3.ResponseBody
- 
-import okio.Buffer
-import okio.BufferedSource
-import okio.ForwardingSource
-import okio.Okio
-import okio.Source
-+import okio.*
- 
- import org.apache.commons.codec.binary.Hex
- import org.apache.commons.codec.digest.DigestUtils
-@@ -766,7 +763,7 @@ open class FileSystemModule(
-       }
- 
-       val body = createRequestBody(options, decorator, fileUri.toFile())
-      return requestBuilder.method(method, body).build()
-+      return method?.let { requestBuilder.method(it, body).build() }
-     } catch (e: Exception) {
-       e.message?.let { Log.e(TAG, it) }
-       promise.reject(e)
-@@ -791,7 +788,7 @@ open class FileSystemModule(
-         } ?: URLConnection.guessContentTypeFromName(file.name)
- 
-         val fieldName = options["fieldName"]?.let { it as String } ?: file.name
-        bodyBuilder.addFormDataPart(fieldName, file.name, decorator.decorate(RequestBody.create(MediaType.parse(mimeType), file)))
-+        bodyBuilder.addFormDataPart(fieldName, file.name, decorator.decorate(RequestBody.create(mimeType.toMediaTypeOrNull(), file)))
-         bodyBuilder.build()
-       }
-       else -> {
-@@ -816,9 +813,9 @@ open class FileSystemModule(
- 
-         override fun onResponse(call: Call, response: Response) {
-           val result = Bundle().apply {
-            putString("body", response.body()?.string())
-            putInt("status", response.code())
-            putBundle("headers", translateHeaders(response.headers()))
-+            putString("body", response.body?.string())
-+            putInt("status", response.code)
-+            putBundle("headers", translateHeaders(response.headers))
-           }
-           response.close()
-           promise.resolve(result)
-@@ -866,7 +863,7 @@ open class FileSystemModule(
-     taskHandlers[uuid] = TaskHandler(call)
-     call.enqueue(object : Callback {
-       override fun onFailure(call: Call, e: IOException) {
-        if (call.isCanceled) {
-+        if (call.isCanceled()) {
-           promise.resolve(null)
-           return
-         }
-@@ -876,11 +873,11 @@ open class FileSystemModule(
- 
-       override fun onResponse(call: Call, response: Response) {
-         val result = Bundle()
-        val body = response.body()
-+        val body = response.body
-         result.apply {
-           putString("body", body?.string())
-          putInt("status", response.code())
-          putBundle("headers", translateHeaders(response.headers()))
-+          putInt("status", response.code)
-+          putBundle("headers", translateHeaders(response.headers))
-         }
-         response.close()
-         promise.resolve(result)
-@@ -900,10 +897,10 @@ open class FileSystemModule(
-           val resources = context.resources
-           val packageName = context.packageName
-           val resourceId = resources.getIdentifier(url, "raw", packageName)
-          val bufferedSource = Okio.buffer(Okio.source(context.resources.openRawResource(resourceId)))
-+          val bufferedSource = context.resources.openRawResource(resourceId).source().buffer()
-           val file = uri.toFile()
-           file.delete()
-          val sink = Okio.buffer(Okio.sink(file))
-+          val sink = file.sink().buffer()
-           sink.writeAll(bufferedSource)
-           sink.close()
-           val result = Bundle()
-@@ -934,13 +931,13 @@ open class FileSystemModule(
-             override fun onResponse(call: Call, response: Response) {
-               val file = uri.toFile()
-               file.delete()
-              val sink = Okio.buffer(Okio.sink(file))
-              sink.writeAll(response.body()!!.source())
-+              val sink = file.sink().buffer()
-+              sink.writeAll(response.body!!.source())
-               sink.close()
-               val result = Bundle().apply {
-                 putString("uri", Uri.fromFile(file).toString())
-                putInt("status", response.code())
-                putBundle("headers", translateHeaders(response.headers()))
-+                putInt("status", response.code)
-+                putBundle("headers", translateHeaders(response.headers))
-                 if (options?.get("md5") == true) {
-                   putString("md5", md5(file))
-                 }
-@@ -1003,7 +1000,7 @@ open class FileSystemModule(
-         ?.addNetworkInterceptor { chain ->
-           val originalResponse = chain.proceed(chain.request())
-           originalResponse.newBuilder()
-            .body(ProgressResponseBody(originalResponse.body(), progressListener))
-+            .body(ProgressResponseBody(originalResponse.body, progressListener))
-             .build()
-         }
-         ?.build()
-@@ -1098,7 +1095,7 @@ open class FileSystemModule(
-       val options = params[0]?.options
-       return try {
-         val response = call!!.execute()
-        val responseBody = response.body()
-+        val responseBody = response.body
-         val input = BufferedInputStream(responseBody!!.byteStream())
-         val output = FileOutputStream(file, isResume == true)
-         val data = ByteArray(1024)
-@@ -1108,15 +1105,15 @@ open class FileSystemModule(
-         }
-         val result = Bundle().apply {
-           putString("uri", Uri.fromFile(file).toString())
-          putInt("status", response.code())
-          putBundle("headers", translateHeaders(response.headers()))
-+          putInt("status", response.code)
-+          putBundle("headers", translateHeaders(response.headers))
-           options?.get("md5").takeIf { it == true }?.let { putString("md5", file?.let { md5(it) }) }
-         }
-         response.close()
-         promise?.resolve(result)
-         null
-       } catch (e: Exception) {
-        if (call?.isCanceled == true) {
-+        if (call?.isCanceled() == true) {
-           promise?.resolve(null)
-           return null
-         }
-@@ -1139,7 +1136,7 @@ open class FileSystemModule(
-     override fun contentLength(): Long = responseBody?.contentLength() ?: -1
- 
-     override fun source(): BufferedSource =
-      bufferedSource ?: Okio.buffer(source(responseBody!!.source()))
-+      bufferedSource ?: source(responseBody!!.source()).buffer()
- 
-     private fun source(source: Source): Source {
-       return object : ForwardingSource(source) {
-@@ -1304,7 +1301,7 @@ open class FileSystemModule(
-   // Copied out of React Native's `NetworkingModule.java`
-   private fun translateHeaders(headers: Headers): Bundle {
-     val responseHeaders = Bundle()
-    for (i in 0 until headers.size()) {
-+    for (i in 0 until headers.size) {
-       val headerName = headers.name(i)
-       // multiple values for the same header
-       if (responseHeaders[headerName] != null) {