expo-file-system 16.0.1 → 16.0.3

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 16.0.3 — 2024-01-10
+
+### 🎉 New features
+
+- Added support for macOS platform. ([#26253](https://github.com/expo/expo/pull/26253) by [@tsapeta](https://github.com/tsapeta))
+
+## 16.0.2 — 2023-12-19
+
+_This version does not introduce any user-facing changes._
+
 ## 16.0.1 — 2023-12-13
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '16.0.1'
+version = '16.0.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -94,7 +94,7 @@ android {
   namespace "expo.modules.filesystem"
   defaultConfig {
     versionCode 30
-    versionName "16.0.1"
+    versionName "16.0.3"
   }
 }
 

package/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt

@@ -471,7 +471,9 @@ open class FileSystemModule : Module() {
 
     AsyncFunction("uploadAsync") { url: String, fileUriString: String, options: FileSystemUploadOptions, promise: Promise ->
       val request = createUploadRequest(
-        url, fileUriString, options
+        url,
+        fileUriString,
+        options
       ) { requestBody -> requestBody }
 
       okHttpClient?.let {
@@ -519,7 +521,7 @@ open class FileSystemModule : Module() {
       val request = createUploadRequest(
         url,
         fileUriString,
-        options,
+        options
       ) { requestBody -> CountingRequestBody(requestBody, progressListener) }
 
       val call = okHttpClient!!.newCall(request)
@@ -669,7 +671,11 @@ open class FileSystemModule : Module() {
       val call = client.newCall(request)
       taskHandlers[uuid] = DownloadTaskHandler(fileUri, call)
       val params = DownloadResumableTaskParams(
-        options, call, fileUri.toFile(), resumeData != null, promise
+        options,
+        call,
+        fileUri.toFile(),
+        resumeData != null,
+        promise
       )
       moduleCoroutineScope.launch {
         downloadResumableTask(params)
@@ -1065,7 +1071,9 @@ open class FileSystemModule : Module() {
     val file = DocumentFile.fromSingleUri(context, uri)
     return if (file != null && file.isFile) {
       file
-    } else DocumentFile.fromTreeUri(context, uri)
+    } else {
+      DocumentFile.fromTreeUri(context, uri)
+    }
   }
 
   // extension functions of Uri class

package/expo-module.config.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-file-system",
-  "platforms": ["ios", "android"],
+  "platforms": ["ios", "android", "macos", "tvos"],
   "ios": {
     "modules": ["FileSystemModule"],
     "appDelegateSubscribers": ["FileSystemBackgroundSessionHandler"]

package/ios/EXFileSystem.m

@@ -5,7 +5,12 @@
 #import <ExpoFileSystem/EXFileSystem.h>
 
 #import <CommonCrypto/CommonDigest.h>
+
+#if TARGET_OS_IOS || TARGET_OS_TV
 #import <MobileCoreServices/MobileCoreServices.h>
+#elif TARGET_OS_OSX
+#import <CoreServices/CoreServices.h>
+#endif
 
 #import <ExpoFileSystem/EXFileSystemLocalFileHandler.h>
 #import <ExpoFileSystem/EXFileSystemAssetLibraryHandler.h>

package/ios/EXFileSystemAssetLibraryHandler.m

@@ -25,7 +25,7 @@
     result[@"uri"] = fileUri;
     result[@"modificationTime"] = @(asset.modificationDate.timeIntervalSince1970);
     if (options[@"md5"] || options[@"size"]) {
-      [[PHImageManager defaultManager] requestImageDataForAsset:asset options:nil resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) {
+      [[PHImageManager defaultManager] requestImageDataAndOrientationForAsset:asset options:nil resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, CGImagePropertyOrientation orientation, NSDictionary * _Nullable info) {
         result[@"size"] = @(imageData.length);
         if (options[@"md5"]) {
           result[@"md5"] = [imageData md5String];
@@ -84,7 +84,7 @@
         [EXFileSystemAssetLibraryHandler copyData:data toPath:toPath resolver:resolve rejecter:reject];
       }];
     } else {
-      [[PHImageManager defaultManager] requestImageDataForAsset:asset options:nil resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) {
+      [[PHImageManager defaultManager] requestImageDataAndOrientationForAsset:asset options:nil resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, CGImagePropertyOrientation orientation, NSDictionary * _Nullable info) {
         [EXFileSystemAssetLibraryHandler copyData:imageData toPath:toPath resolver:resolve rejecter:reject];
       }];
     }
@@ -110,10 +110,12 @@
       hasWarned = YES;
     }
     return nil;
-#else
+#elif TARGET_OS_IOS || TARGET_OS_TV
     // This is the older, deprecated way of fetching assets from assets-library
     // using the "assets-library://" protocol
     return [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
+#elif TARGET_OS_OSX
+    return nil;
 #endif
   }
 

package/ios/EXSessionTasks/EXSessionHandler.h

@@ -1,8 +1,8 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
 #import <Foundation/Foundation.h>
+#import <ExpoModulesCore/Platform.h>
 #import <ExpoModulesCore/EXSingletonModule.h>
-#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/ExpoFileSystem.podspec

@@ -10,7 +10,11 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platforms       = { :ios => '13.4', :tvos => '13.4'}
+  s.platforms       = {
+    :ios => '13.4',
+    :osx => '10.15',
+    :tvos => '13.4'
+  }
   s.swift_version  = '5.4'
   s.source         = { :git => 'https://github.com/expo/expo.git' }
   s.static_framework = true

package/ios/FileSystemBackgroundSessionHandler.swift

@@ -19,7 +19,9 @@ public final class FileSystemBackgroundSessionHandler: ExpoAppDelegateSubscriber
 
   // MARK: - ExpoAppDelegateSubscriber
 
+  #if os(iOS) || os(tvOS)
   public func application(_ application: UIApplication, handleEventsForBackgroundURLSession identifier: String, completionHandler: @escaping () -> Void) {
     completionHandlers[identifier] = completionHandler
   }
+  #endif
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-file-system",
-  "version": "16.0.1",
+  "version": "16.0.3",
   "description": "Provides access to the local file system on the device.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "1c97be7c8c3c8661698038bf7912fb7c64ba8c35"
+  "gitHead": "ca014bf2516c7644ef303f4c21fdd68de4d99f76"
 }