expo-camera 12.4.0 → 12.5.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 12.5.0 — 2023-01-23
+
+### 🐛 Bug fixes
+
+- Fix `Caused by java.lang.NoSuchMethodError: No interface method getOrDefault` on Android. ([#20921](https://github.com/expo/expo/pull/20921) by [@lukmccall](https://github.com/lukmccall))
+
 ## 12.4.0 — 2022-11-30
 
 _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 = '12.4.0'
+version = '12.5.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 32
-    versionName "12.4.0"
+    versionName "12.5.0"
   }
 
   lintOptions {

package/android/src/main/java/expo/modules/camera/tasks/ResolveTakenPictureAsyncTask.kt

@@ -67,7 +67,7 @@ class ResolveTakenPictureAsyncTask(
     get() = options[QUALITY_KEY]?.let {
       val requestedQuality = (it as Number).toDouble()
       (requestedQuality * 100).toInt()
-    } ?: DEFAULT_QUALITY * 100
+    } ?: (DEFAULT_QUALITY * 100)
 
   override fun doInBackground(vararg params: Void?): Bundle? {
     // handle SkipProcessing
@@ -93,7 +93,7 @@ class ResolveTakenPictureAsyncTask(
         var bitmap: Bitmap? = null
         var lastError: Error? = null
 
-        val maxDownsampling = ((options.getOrDefault("maxDownsampling", 1.0)) as Double).toInt()
+        val maxDownsampling = ((options["maxDownsampling"] as? Double) ?: 1.0).toInt()
         // If OOM exception was thrown, we try to use downsampling to recover.
         while (bitmapOptions.inSampleSize <= maxDownsampling) {
           try {

package/ios/Info-generated.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>expo.camera</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>EXCamera</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>12.5.0</string>
+	<key>CFBundleVersion</key>
+	<string>12</string>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "12.4.0",
+  "version": "12.5.0",
   "description": "A React component that renders a preview for the device's either front or back camera. Camera's parameters like zoom, auto focus, white balance and flash mode are adjustable. With expo-camera, one can also take photos and record videos that are saved to the app's cache. Morever, the component is also capable of detecting faces and bar codes appearing on the preview.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "9d56aa3da59c81a330819f759f1ee997ac547ef8"
+  "gitHead": "efda988b06632310c258c8603c35b3ddecfb06c1"
 }

package/ios/EXCamera.xcframework/Info.plist

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>EXCamera.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>EXCamera.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>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

package/ios/EXCamera.xcframework/ios-arm64/EXCamera.framework/Modules/module.modulemap

@@ -1,6 +0,0 @@
-framework module EXCamera {
-  umbrella header "EXCamera.h"
-
-  export *
-  module * { export * }
-}

package/ios/EXCamera.xcframework/ios-arm64_x86_64-simulator/EXCamera.framework/Modules/module.modulemap

@@ -1,6 +0,0 @@
-framework module EXCamera {
-  umbrella header "EXCamera.h"
-
-  export *
-  module * { export * }
-}