expo-file-system 13.2.0 → 13.2.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 13.2.1 — 2022-01-20
+
+### 🐛 Bug fixes
+
+- Fix build errors on React Native 0.66 caused by `okio` and `okhttp`. ([#15632](https://github.com/expo/expo/pull/15632) by [@kudo](https://github.com/kudo))
+
 ## 13.2.0 — 2021-12-22
 
 ### 🐛 Bug fixes
@@ -22,6 +28,10 @@
 
 - Updated `@expo/config-plugins` from `4.0.2` to `4.0.14` ([#15621](https://github.com/expo/expo/pull/15621) by [@EvanBacon](https://github.com/EvanBacon))
 
+## 13.1.1 — 2022-01-20
+
+_This version does not introduce any user-facing changes._
+
 ## 13.1.0 — 2021-11-17
 
 ### 🐛 Bug fixes

package/README.md

@@ -9,7 +9,7 @@ Provides access to the local file system on the device.
 
 # Installation in managed Expo projects
 
-For [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/filesystem/).
+For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/filesystem/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '13.2.0'
+version = '13.2.1'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -61,7 +61,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 30
-    versionName "13.2.0"
+    versionName "13.2.1"
   }
   lintOptions {
     abortOnError false
@@ -79,7 +79,27 @@ 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.squareup.okio:okio:1.17.5'
   api "androidx.legacy:legacy-support-v4:1.0.0"
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.6.10')}"
 }
+
+// [BEGIN] Workaround okhttp/okio compatibility issue
+// Remove when we drop support for SDK 44
+def okhttpPinnedArtifacts = []
+configurations.api.getDependencies().removeIf { it ->
+  if (['com.squareup.okhttp3', 'com.squareup.okio'].contains(it.group)) {
+    okhttpPinnedArtifacts.add("${it.group}:${it.name}:${it.version}")
+    return true
+  }
+  return false
+}
+okhttpPinnedArtifacts.each { artifact ->
+  dependencies.add('compileOnly', artifact)
+  dependencies.add('testApi', artifact)
+  configurations.all {
+    resolutionStrategy.force(artifact)
+  }
+}
+// [END] Workaround okhttp/okio compatibility issue

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

@@ -45,16 +45,7 @@ class CountingRequestBody(
   override fun writeTo(sink: BufferedSink) {
     val countingSink = CountingSink(sink, this, progressListener)
 
-    // `Okio.buffer` is deprecated in okio 2.x.
-    // To be compatible across react-native versions where
-    // react-native < 0.65, okio is 1.x
-    // react-native >= 0.65, okio is 2.x
-    // We just suppress the error.
-    // In okio 2.x, `Okio.buffer` is still an extension method proxied to `countingSink.buffer()`.
-    // See: https://github.com/square/okio/blob/b0f78aaa46/okio/src/jvmMain/kotlin/okio/-DeprecatedOkio.kt#L48-L56
-    @Suppress("DEPRECATION_ERROR")
     val bufferedSink = Okio.buffer(countingSink)
-
     requestBody.writeTo(bufferedSink)
     bufferedSink.flush()
   }

package/ios/EXFileSystem.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>EXFileSystem.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>EXFileSystem.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-file-system",
-  "version": "13.2.0",
+  "version": "13.2.1",
   "description": "Provides access to the local file system on the device.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -45,5 +45,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4cf8716f96f5b087fb984b5418ee2548b2069414"
+  "gitHead": "693e58494ed4753b55d3f379b1da1cf796cdf4e3"
 }