diff --git a/ios/Podfile b/ios/Podfile index a71b3201cf1..4b0ef129eca 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -4,6 +4,10 @@ require File.join(File.dirname(`node --print "require.resolve('react-native/pack platform :ios, '15.1' install! 'cocoapods', :deterministic_uuids => false +# 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! 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