Skip to content

Commit 625b16f

Browse files
committed
feat(macOS): Consolidated Xcode Workspace (#9435)
- Derived data directory ".xcode" for Xcode workspace in project root. - Mac crafter build directory ".mac-crafter" in project root. - Added all Swift packages and Xcode projects to workspace. - Added some important top-level files and other directories. - Removed obsolete Xcode workspace in shell integration directory. - Removed obsolete OwnCloudFinderSync folder. - Updated AGENTS.md. - Updated README.md. Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
1 parent 61764e8 commit 625b16f

File tree

12 files changed

+319
-117
lines changed

12 files changed

+319
-117
lines changed

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ dlldata.c
9292
# macOS specific
9393
xcuserdata/
9494
**/.DS_Store
95-
**/Carthage/
9695

9796
# Visual C++ cache files
9897
ipch/
@@ -196,8 +195,11 @@ convert.exe
196195
theme.qrc
197196
*.AppImage
198197

199-
# Xcode Build Artifacts
200-
DerivedData
201-
202198
# Swift Package Manager Build Artifacts
203199
.swiftpm_codeql_detected_source_root
200+
201+
# Relative derived data of Xcode workspace
202+
.xcode
203+
204+
# Mac-Crafter build directory
205+
.mac-crafter

AGENTS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ Other platforms like iOS and Android are irrelevant for this project.
2323

2424
| Directory | Description | Agent Action |
2525
|-----------------|-----------------------------------------------------|----------------------|
26+
| `./admin` | Platform-specific build, packaging, and distribution tooling (macOS, Windows, Linux, Nix) | Ignore unless packaging or installer logic must be updated |
2627
| `./admin/osx/mac-crafter` | Build tool for macOS | Ignore unless the build process must be updated |
2728
| `./shell_integration/MacOSX/NextcloudIntegration` | Xcode project for macOS app extensions | Look here first for changes in context of the file provider extension |
28-
| `./translations` | Translation files from Transifex. | Do not modify |
29+
| `./translations` | Translation files from Transifex. | Do not modify |
30+
| `.mac-crafter` | Build artifacts and derived data. | Ignore |
31+
| `.xcode` | Build artifacts and derived data. | Ignore |
2932

3033
## General Guidance
3134

Nextcloud Desktop Client.xcworkspace/contents.xcworkspacedata

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shell_integration/MacOSX/Nextcloud.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to Nextcloud Desktop Client.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>IDEDidComputeMac32BitWarning</key>
6-
<true/>
7-
</dict>
4+
<dict/>
85
</plist>

Nextcloud Desktop Client.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 132 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)