Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix iOS build errors on develop #1011

Merged
merged 3 commits into from
Dec 23, 2022
Merged

Fix iOS build errors on develop #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dffafde
Fix iOS
cidkidnix Dec 16, 2022
aff5154
Update changelog
ali-abrar Dec 23, 2022
abd20e8
Merge remote-tracking branch 'origin/develop' into dylang/fix-ios
ali-abrar Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down