[pull] main from expo:main

packages/expo-background-task/CHANGELOG.md

@@ -12,7 +12,7 @@
 
 ### 🐛 Bug fixes
 
-- [Android] Prevent background task registration from replacing an already scheduled or running worker. ([#44663](https://github.com/expo/expo/pull/44663) by [@chrfalch](https://github.com/chrfalch))
+- [Android] Preserve WorkManager cancellation semantics when a background task worker is cancelled. ([#44667](https://github.com/expo/expo/pull/44667) by [@chrfalch](https://github.com/chrfalch))- [Android] Prevent background task registration from replacing an already scheduled or running worker. ([#44663](https://github.com/expo/expo/pull/44663) by [@chrfalch](https://github.com/chrfalch))
 - [iOS] Fixed a race when rescheduling background tasks concurrently. ([#44666](https://github.com/expo/expo/pull/44666) by [@chrfalch](https://github.com/chrfalch))
 
 ### 💡 Others

packages/expo-background-task/android/src/main/java/expo/modules/backgroundtask/BackgroundTaskWork.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
+import kotlinx.coroutines.CancellationException
 
 class BackgroundTaskWork(context: Context, params: WorkerParameters) : CoroutineWorker(context, params) {
   companion object {
@@ -24,6 +25,9 @@ class BackgroundTaskWork(context: Context, params: WorkerParameters) : Coroutine
       // Run tasks async using the task service. This call will return when the task has finished
       // ie. When JS task executor has notified the task manager that it is done.
       BackgroundTaskScheduler.runTasks(applicationContext, appScopeKey)
+    } catch (e: CancellationException) {
+      Log.i(TAG, "doWork: Worker was cancelled")
+      throw e
     } catch (e: Exception) {
       // Wrap exception in Data:
       val outputData = Data.Builder()

packages/expo-brownfield/CHANGELOG.md

@@ -17,6 +17,7 @@
 - [state] shared state implementation improvements ([#43279](https://github.com/expo/expo/pull/43279) by [@pmleczek](https://github.com/pmleczek))
 - Use react-native prebuilds by default ([#44332](https://github.com/expo/expo/pull/44332) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - Added `Expo.plist` to the brownfield framework target. ([#44645](https://github.com/expo/expo/pull/44645) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- [iOS] Add `DEFINE_MODULES=TRUE` build setting ([#44672](https://github.com/expo/expo/pull/44672) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ### 🐛 Bug fixes
 

packages/expo-brownfield/plugin/src/ios/utils/project.ts

@@ -165,6 +165,7 @@ const getCommonBuildSettings = (
     SWIFT_OPTIMIZATION_LEVEL: `"-Onone"`,
     CODE_SIGN_ENTITLEMENTS: `"${targetName}/${targetName}.entitlements"`,
     // DEVELOPMENT_TEAM: `""`,
+    DEFINES_MODULE: '"YES"',
     BUILD_LIBRARY_FOR_DISTRIBUTION: '"YES"',
     USER_SCRIPT_SANDBOXING: '"NO"',
     SKIP_INSTALL: '"NO"',