Merge branch 'dev-v2.30'

.nvmrc

@@ -1 +1 @@
-v20.18.0
+v22.11.0

README.md

@@ -1107,7 +1107,7 @@ with an error.
 ```ts
 function stopUpload(jobId: number): void;
 ```
-**VERIFIED:** iOS.
+**VERIFIED:** iOS. **NOT SUPPORTED**: Android, Windows.
 
 iOS only. Abort the current upload job with given ID.
 

android/src/main/java/com/drpogodin/reactnativefs/ReactNativeFsModule.kt

@@ -74,8 +74,8 @@ class ReactNativeFsModule internal constructor(context: ReactApplicationContext)
         constants["PicturesDirectoryPath"] = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).absolutePath
         constants["CachesDirectoryPath"] = this.reactApplicationContext.cacheDir.absolutePath
         constants["DownloadDirectoryPath"] = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath
-        constants["FileTypeRegular"] = 0
-        constants["FileTypeDirectory"] = 1
+        constants["FileTypeRegular"] = "0"
+        constants["FileTypeDirectory"] = "1"
         constants["ExternalStorageDirectoryPath"] = Environment.getExternalStorageDirectory()?.absolutePath
         constants["ExternalDirectoryPath"] = this.reactApplicationContext.getExternalFilesDir(null)?.absolutePath
         constants["ExternalCachesDirectoryPath"] = this.reactApplicationContext.externalCacheDir?.absolutePath
@@ -172,7 +172,10 @@ class ReactNativeFsModule internal constructor(context: ReactApplicationContext)
             // If the queue has drained, it is success, we are done.
             if (queue.isEmpty()) return promise.resolve(null)
 
-            val next = queue.removeAt(queue.size - 1)
+            val next =
+              if (Build.VERSION.SDK_INT >= 35) queue.removeLast()
+              else queue.removeAt(queue.size - 1)
+
             currentFrom = next.first
             currentInto = next.second
           }
@@ -526,7 +529,7 @@ class ReactNativeFsModule internal constructor(context: ReactApplicationContext)
                 fileMap.putString("name", childFile.name)
                 fileMap.putString("path", childFile.absolutePath)
                 fileMap.putDouble("size", childFile.length().toDouble())
-                fileMap.putInt("type", if (childFile.isDirectory) 1 else 0)
+                fileMap.putString("type", if (childFile.isDirectory) "1" else "0")
                 fileMaps.pushMap(fileMap)
             }
             promise.resolve(fileMaps)
@@ -559,7 +562,7 @@ class ReactNativeFsModule internal constructor(context: ReactApplicationContext)
                     isDirectory = !ex.message!!.contains("compressed")
                 }
                 fileMap.putInt("size", length)
-                fileMap.putInt("type", if (isDirectory) 1 else 0) // if 0, probably a folder..
+                fileMap.putString("type", if (isDirectory) "1" else "0") // if 0, probably a folder..
                 fileMaps.pushMap(fileMap)
             }
             promise.resolve(fileMaps)
@@ -673,7 +676,7 @@ class ReactNativeFsModule internal constructor(context: ReactApplicationContext)
             statMap.putInt("ctime", (file.lastModified() / 1000).toInt())
             statMap.putInt("mtime", (file.lastModified() / 1000).toInt())
             statMap.putDouble("size", file.length().toDouble())
-            statMap.putInt("type", if (file.isDirectory) 1 else 0)
+            statMap.putString("type", if (file.isDirectory) "1" else "0")
             statMap.putString("originalFilepath", originalFilepath)
             promise.resolve(statMap)
         } catch (ex: Exception) {

example/Gemfile

@@ -6,3 +6,4 @@ ruby ">= 2.6.10"
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'