fix: migrate watch app to single-target app (Xcode 27+ compat) (#92477) · openclaw/openclaw@b39a932
zats
·
2026-06-19
·
via Recent Commits to openclaw:main
File tree
Assets.xcassets/OpenClawIcon.imageset
| Original file line number | Diff line number | Diff line change |
|---|
@@ -12,7 +12,7 @@ report_include:
|
12 | 12 | - Sources/** |
13 | 13 | - ShareExtension/** |
14 | 14 | - ActivityWidget/** |
15 | | - - WatchExtension/Sources/** |
| 15 | + - WatchApp/Sources/** |
16 | 16 | build_arguments: |
17 | 17 | - -destination |
18 | 18 | - generic/platform=iOS Simulator |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -39,15 +39,6 @@
|
39 | 39 | "profileKey": "OPENCLAW_WATCH_APP_PROFILE", |
40 | 40 | "profileName": "OpenClaw App Store ai.openclawfoundation.app.watchkitapp", |
41 | 41 | "capabilities": [] |
42 | | - }, |
43 | | - { |
44 | | -"target": "OpenClawWatchExtension", |
45 | | -"displayName": "OpenClaw Watch Extension", |
46 | | -"bundleId": "ai.openclawfoundation.app.watchkitapp.extension", |
47 | | -"platform": "IOS", |
48 | | -"profileKey": "OPENCLAW_WATCH_EXTENSION_PROFILE", |
49 | | -"profileName": "OpenClaw App Store ai.openclawfoundation.app.watchkitapp.extension", |
50 | | -"capabilities": [] |
51 | 42 | } |
52 | 43 | ] |
53 | 44 | } |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -8,11 +8,9 @@ OPENCLAW_CODE_SIGN_STYLE = Automatic
|
8 | 8 | OPENCLAW_CODE_SIGN_IDENTITY = Apple Development |
9 | 9 | OPENCLAW_APP_BUNDLE_ID = ai.openclawfoundation.app |
10 | 10 | OPENCLAW_WATCH_APP_BUNDLE_ID = ai.openclawfoundation.app.watchkitapp |
11 | | -OPENCLAW_WATCH_EXTENSION_BUNDLE_ID = ai.openclawfoundation.app.watchkitapp.extension |
12 | 11 | OPENCLAW_ACTIVITY_WIDGET_BUNDLE_ID = ai.openclawfoundation.app.activitywidget |
13 | 12 | OPENCLAW_ACTIVITY_WIDGET_PROFILE = |
14 | 13 | OPENCLAW_WATCH_APP_PROFILE = |
15 | | -OPENCLAW_WATCH_EXTENSION_PROFILE = |
16 | 14 | |
17 | 15 | // Local contributors can override this by running scripts/ios-configure-signing.sh. |
18 | 16 | // Keep include after defaults: xcconfig is evaluated top-to-bottom. |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -9,11 +9,9 @@ OPENCLAW_APP_BUNDLE_ID = ai.openclawfoundation.app
|
9 | 9 | OPENCLAW_SHARE_BUNDLE_ID = ai.openclawfoundation.app.share |
10 | 10 | OPENCLAW_ACTIVITY_WIDGET_BUNDLE_ID = ai.openclawfoundation.app.activitywidget |
11 | 11 | OPENCLAW_WATCH_APP_BUNDLE_ID = ai.openclawfoundation.app.watchkitapp |
12 | | -OPENCLAW_WATCH_EXTENSION_BUNDLE_ID = ai.openclawfoundation.app.watchkitapp.extension |
13 | 12 | |
14 | 13 | // Leave empty with automatic signing. |
15 | 14 | OPENCLAW_APP_PROFILE = |
16 | 15 | OPENCLAW_SHARE_PROFILE = |
17 | 16 | OPENCLAW_ACTIVITY_WIDGET_PROFILE = |
18 | 17 | OPENCLAW_WATCH_APP_PROFILE = |
19 | | -OPENCLAW_WATCH_EXTENSION_PROFILE = |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -155,7 +155,6 @@ This should create `apps/ios/fastlane/.env` with non-secret App Store Connect va
|
155 | 155 | - `ai.openclawfoundation.app.share` |
156 | 156 | - `ai.openclawfoundation.app.activitywidget` |
157 | 157 | - `ai.openclawfoundation.app.watchkitapp` |
158 | | -- `ai.openclawfoundation.app.watchkitapp.extension` |
159 | 158 | |
160 | 159 | Use `pnpm ios:release:signing:setup` for the initial portal setup, then `MATCH_PASSWORD=... pnpm ios:release:signing:sync:push` to publish encrypted Fastlane match assets to the shared private repo. |
161 | 160 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -11,15 +11,13 @@ OPENCLAW_DEVELOPMENT_TEAM = FWJYW4S8P8
|
11 | 11 | OPENCLAW_APP_BUNDLE_ID = ai.openclawfoundation.app |
12 | 12 | OPENCLAW_SHARE_BUNDLE_ID = ai.openclawfoundation.app.share |
13 | 13 | OPENCLAW_WATCH_APP_BUNDLE_ID = ai.openclawfoundation.app.watchkitapp |
14 | | -OPENCLAW_WATCH_EXTENSION_BUNDLE_ID = ai.openclawfoundation.app.watchkitapp.extension |
15 | 14 | OPENCLAW_ACTIVITY_WIDGET_BUNDLE_ID = ai.openclawfoundation.app.activitywidget |
16 | 15 | OPENCLAW_APNS_ENTITLEMENT_ENVIRONMENT = development |
17 | 16 | |
18 | 17 | OPENCLAW_APP_PROFILE = ai.openclawfoundation.app Development |
19 | 18 | OPENCLAW_SHARE_PROFILE = ai.openclawfoundation.app.share Development |
20 | 19 | OPENCLAW_ACTIVITY_WIDGET_PROFILE = |
21 | 20 | OPENCLAW_WATCH_APP_PROFILE = |
22 | | -OPENCLAW_WATCH_EXTENSION_PROFILE = |
23 | 21 | |
24 | 22 | // Keep local includes after defaults: xcconfig is evaluated top-to-bottom, |
25 | 23 | // so later assignments in local files override the defaults above. |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -109,10 +109,10 @@ Sources/Voice/VoiceWakePreferences.swift
|
109 | 109 | ShareExtension/ShareViewController.swift |
110 | 110 | ActivityWidget/OpenClawActivityWidgetBundle.swift |
111 | 111 | ActivityWidget/OpenClawLiveActivity.swift |
112 | | -WatchExtension/Sources/OpenClawWatchApp.swift |
113 | | -WatchExtension/Sources/WatchConnectivityReceiver.swift |
114 | | -WatchExtension/Sources/WatchInboxStore.swift |
115 | | -WatchExtension/Sources/WatchInboxView.swift |
| 112 | +WatchApp/Sources/OpenClawWatchApp.swift |
| 113 | +WatchApp/Sources/WatchConnectivityReceiver.swift |
| 114 | +WatchApp/Sources/WatchInboxStore.swift |
| 115 | +WatchApp/Sources/WatchInboxView.swift |
116 | 116 | ../shared/OpenClawKit/Sources/OpenClawChatUI/ChatComposer.swift |
117 | 117 | ../shared/OpenClawKit/Sources/OpenClawChatUI/ChatMarkdownRenderer.swift |
118 | 118 | ../shared/OpenClawKit/Sources/OpenClawChatUI/ChatMarkdownPreprocessor.swift |
|
File renamed without changes.
File renamed without changes.
| Original file line number | Diff line number | Diff line change |
|---|
@@ -20,9 +20,9 @@
|
20 | 20 | <string>$(OPENCLAW_MARKETING_VERSION)</string> |
21 | 21 | <key>CFBundleVersion</key> |
22 | 22 | <string>$(OPENCLAW_BUILD_VERSION)</string> |
| 23 | + <key>WKApplication</key> |
| 24 | + <true/> |
23 | 25 | <key>WKCompanionAppBundleIdentifier</key> |
24 | 26 | <string>$(OPENCLAW_APP_BUNDLE_ID)</string> |
25 | | - <key>WKWatchKitApp</key> |
26 | | - <true/> |
27 | 27 | </dict> |
28 | 28 | </plist> |
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
