From 9f459875d3aac3612532f21518ba29ce74cf167c Mon Sep 17 00:00:00 2001 From: Dylan Green <67574902+cidkidnix@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:26:55 -0600 Subject: [PATCH] Fix iOS build errors on develop (#1011) * Fix iOS * Update changelog Co-authored-by: Ali Abrar --- ChangeLog.md | 1 + default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 3e2f05f39..6ef8457cd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -40,6 +40,7 @@ This project's release branch is `master`. This log is written from the perspect * [#930](https://github.com/obsidiansystems/obelisk/pull/930): Add an error to `ob run` when `static` is called with a path to a file that doesn't exist * [#940](https://github.com/obsidiansystems/obelisk/pull/940): Automatically restart the server when configuration is updated via `ob deploy push`. * [#959](https://github.com/obsidiansystems/obelisk/pull/959): Add an error to `ob run` when `staticFilePath` is called with a path to a file that doesn't exist + * [#1011](https://github.com/obsidiansystems/obelisk/pull/1011): Update default iOS SDK to 15.0 * [#835](https://github.com/obsidiansystems/obelisk/pull/835): Rebuild static assets in fewer circumstances: * Watch `frontend`, `backend`, `common`, and `static` instead of the project root to avoid spurious rebuilds when other files change * Don't call `nix show-derivation` to decide whether to rebuild since it seems to do about as much work as a no-op nix-build diff --git a/default.nix b/default.nix index a953f06f5..cea6bf484 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem , profiling ? false -, iosSdkVersion ? "13.2" +, iosSdkVersion ? "15.0" , config ? {} , terms ? { # Accepted terms, conditions, and licenses security.acme.acceptTerms = false;