From 7393bdb4ba85af90786868312ca81220d9587eb4 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 25 Jun 2026 14:44:42 -0300 Subject: [PATCH 1/2] chore(ios): default to RocketChat scheme by renaming workspace and project The experimental multi-scheme setup was removed and RocketChatRN is no longer a valid scheme, but `react-native run-ios` still inferred it as the default and failed. The CLI picks the alphabetically-greatest .xcworkspace/.xcodeproj and infers the scheme from its basename, so a workspace-only rename cannot win against RocketChatRN.xcodeproj (RocketChat is a prefix of RocketChatRN). Renaming both the workspace and the Xcode project to RocketChat makes RocketChat the flag-free default for every RN CLI invocation, with no --scheme flag in the pnpm script. The dead build_fork Fastlane lane is removed. Claude-Session: https://claude.ai/code/session_01QU3tY9QDvsM1H9yeoDAenp --- ios/Podfile | 5 +++++ ios/Podfile.lock | 2 +- .../project.pbxproj | 4 ++-- .../xcshareddata/xcschemes/NotificationService.xcscheme | 4 ++-- .../xcshareddata/xcschemes/RocketChat.xcscheme | 6 +++--- .../xcshareddata/xcschemes/ShareRocketChatRN.xcscheme | 6 +++--- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 ios/fastlane/Fastfile | 9 ++------- ios/fastlane/README.md | 8 -------- 11 files changed, 19 insertions(+), 27 deletions(-) rename ios/{RocketChatRN.xcodeproj => RocketChat.xcodeproj}/project.pbxproj (99%) rename ios/{RocketChatRN.xcodeproj => RocketChat.xcodeproj}/xcshareddata/xcschemes/NotificationService.xcscheme (94%) rename ios/{RocketChatRN.xcodeproj => RocketChat.xcodeproj}/xcshareddata/xcschemes/RocketChat.xcscheme (92%) rename ios/{RocketChatRN.xcodeproj => RocketChat.xcodeproj}/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme (93%) rename ios/{RocketChatRN.xcworkspace => RocketChat.xcworkspace}/contents.xcworkspacedata (78%) rename ios/{RocketChatRN.xcworkspace => RocketChat.xcworkspace}/xcshareddata/IDEWorkspaceChecks.plist (100%) rename ios/{RocketChatRN.xcworkspace => RocketChat.xcworkspace}/xcshareddata/WorkspaceSettings.xcsettings (100%) diff --git a/ios/Podfile b/ios/Podfile index a71b3201cf1..4d7c75f6603 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -4,6 +4,11 @@ require File.join(File.dirname(`node --print "require.resolve('react-native/pack platform :ios, '15.1' install! 'cocoapods', :deterministic_uuids => false +# Workspace name must equal the desired default scheme. `react-native run-ios` +# infers the scheme from the workspace basename, so this stays "RocketChat" +# even though the Xcode project is still "RocketChatRN". +workspace 'RocketChat' + prepare_react_native_project! def all_pods diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a80d616f080..2a2b7e38842 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4136,6 +4136,6 @@ SPEC CHECKSUMS: Yoga: 1e91d83a5286cfd3b725eade59274c92270540d4 ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: d05b9b865205e9c845b4e7c288577d4b4ae403ab +PODFILE CHECKSUM: 4a928f36cea73defa438bb62e3a52a85a0b5f71a COCOAPODS: 1.15.2 diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChat.xcodeproj/project.pbxproj similarity index 99% rename from ios/RocketChatRN.xcodeproj/project.pbxproj rename to ios/RocketChat.xcodeproj/project.pbxproj index 543f9a4aadc..6054e65659e 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChat.xcodeproj/project.pbxproj @@ -1166,7 +1166,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "RocketChatRN" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "RocketChat" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -2470,7 +2470,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "RocketChatRN" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "RocketChat" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme b/ios/RocketChat.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme similarity index 94% rename from ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme rename to ios/RocketChat.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme index 0ff42c750b3..6e5b1a779de 100644 --- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme +++ b/ios/RocketChat.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme @@ -18,7 +18,7 @@ BlueprintIdentifier = "1EFEB5942493B6640072EDC0" BuildableName = "NotificationService.appex" BlueprintName = "NotificationService" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> @@ -63,7 +63,7 @@ BlueprintIdentifier = "1EFEB5942493B6640072EDC0" BuildableName = "NotificationService.appex" BlueprintName = "NotificationService" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> diff --git a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChat.xcscheme b/ios/RocketChat.xcodeproj/xcshareddata/xcschemes/RocketChat.xcscheme similarity index 92% rename from ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChat.xcscheme rename to ios/RocketChat.xcodeproj/xcshareddata/xcschemes/RocketChat.xcscheme index 5f4de25a327..85937f795d2 100644 --- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChat.xcscheme +++ b/ios/RocketChat.xcodeproj/xcshareddata/xcschemes/RocketChat.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "7AAB3E0D257E6A6E00707CF6" BuildableName = "Rocket.Chat.app" BlueprintName = "Rocket.Chat" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> @@ -47,7 +47,7 @@ BlueprintIdentifier = "7AAB3E0D257E6A6E00707CF6" BuildableName = "Rocket.Chat.app" BlueprintName = "Rocket.Chat" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> @@ -64,7 +64,7 @@ BlueprintIdentifier = "7AAB3E0D257E6A6E00707CF6" BuildableName = "Rocket.Chat.app" BlueprintName = "Rocket.Chat" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> diff --git a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme b/ios/RocketChat.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme similarity index 93% rename from ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme rename to ios/RocketChat.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme index 1e493d7ff1b..f1678f2945c 100644 --- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme +++ b/ios/RocketChat.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme @@ -18,7 +18,7 @@ BlueprintIdentifier = "1EC6ACAF22CB9FC300A41C61" BuildableName = "ShareRocketChatRN.appex" BlueprintName = "ShareRocketChatRN" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> @@ -34,7 +34,7 @@ BlueprintIdentifier = "1EC6ACAF22CB9FC300A41C61" BuildableName = "ShareRocketChatRN.appex" BlueprintName = "ShareRocketChatRN" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> @@ -72,7 +72,7 @@ BlueprintIdentifier = "1EC6ACAF22CB9FC300A41C61" BuildableName = "ShareRocketChatRN.appex" BlueprintName = "ShareRocketChatRN" - ReferencedContainer = "container:RocketChatRN.xcodeproj"> + ReferencedContainer = "container:RocketChat.xcodeproj"> diff --git a/ios/RocketChatRN.xcworkspace/contents.xcworkspacedata b/ios/RocketChat.xcworkspace/contents.xcworkspacedata similarity index 78% rename from ios/RocketChatRN.xcworkspace/contents.xcworkspacedata rename to ios/RocketChat.xcworkspace/contents.xcworkspacedata index 49feab76894..cbaf568bc5b 100644 --- a/ios/RocketChatRN.xcworkspace/contents.xcworkspacedata +++ b/ios/RocketChat.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:RocketChat.xcodeproj"> diff --git a/ios/RocketChatRN.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/RocketChat.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from ios/RocketChatRN.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ios/RocketChat.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/ios/RocketChatRN.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/RocketChat.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from ios/RocketChatRN.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to ios/RocketChat.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 6fc94a350f6..f58f214b3c1 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -108,22 +108,17 @@ platform :ios do gym( scheme: "RocketChat", - workspace: "RocketChatRN.xcworkspace", + workspace: "RocketChat.xcworkspace", xcargs: "-allowProvisioningUpdates", output_name: "Rocket.Chat" ) end - desc "Build fork app" - lane :build_fork do - gym(scheme: "RocketChatRN", workspace: "RocketChatRN.xcworkspace", skip_codesigning: true, skip_archive: true) - end - desc "Build app for Simulator" lane :build_simulator do gym( scheme: "RocketChat", - workspace: "RocketChatRN.xcworkspace", + workspace: "RocketChat.xcworkspace", destination: "generic/platform=iOS Simulator", skip_package_ipa: true, output_name: "Rocket.Chat", diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md index 61c4fcfe27a..a11eca0d49f 100644 --- a/ios/fastlane/README.md +++ b/ios/fastlane/README.md @@ -31,14 +31,6 @@ Submit a new Beta Build to Apple TestFlight Build app -### ios build_fork - -```sh -[bundle exec] fastlane ios build_fork -``` - -Build fork app - ### ios build_simulator ```sh From 37a95d3a85c4b551341167b15886989b67c352d7 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 25 Jun 2026 15:10:42 -0300 Subject: [PATCH 2/2] chore(ios): fix stale workspace comment in Podfile The comment still claimed the Xcode project was RocketChatRN, which this branch renamed to RocketChat. Rewrite it to state why the workspace name is pinned. Claude-Session: https://claude.ai/code/session_01QU3tY9QDvsM1H9yeoDAenp --- ios/Podfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 4d7c75f6603..4b0ef129eca 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -4,9 +4,8 @@ require File.join(File.dirname(`node --print "require.resolve('react-native/pack platform :ios, '15.1' install! 'cocoapods', :deterministic_uuids => false -# Workspace name must equal the desired default scheme. `react-native run-ios` -# infers the scheme from the workspace basename, so this stays "RocketChat" -# even though the Xcode project is still "RocketChatRN". +# Pin the generated workspace name so `react-native run-ios` selects it and +# infers the matching RocketChat scheme without a --scheme flag. workspace 'RocketChat' prepare_react_native_project!