Merge branch 'next' into je/plat-12916-dsym

bugsnag · Nov 1, 2024 · f9243b7 · f9243b7
2 parents 2c7f438 + 0d4bfe5
commit f9243b7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/features/base-fixtures/rn0_69/Gemfile b/features/base-fixtures/rn0_69/Gemfile
@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 ruby '>= 2.6.10'
 
 gem 'cocoapods', '1.14.3'
+gem 'xcodeproj', '< 1.26.0'
diff --git a/features/base-fixtures/rn0_70/Gemfile b/features/base-fixtures/rn0_70/Gemfile
@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 ruby '>= 2.6.10'
 
 gem 'cocoapods', '1.14.3'
+gem 'xcodeproj', '< 1.26.0'
diff --git a/features/base-fixtures/rn0_72/Gemfile b/features/base-fixtures/rn0_72/Gemfile
@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 ruby '>= 2.6.10'
 
 gem 'cocoapods', '1.14.3'
+gem 'xcodeproj', '< 1.26.0'
diff --git a/makefile b/makefile
@@ -100,14 +100,16 @@ features/base-fixtures/rn0_69/android:
 
 .PHONY: features/base-fixtures/rn0_69/ios
 features/base-fixtures/rn0_69/ios:
-	cd $@/../ && npm i && bundle install
-	cd $@ && pod install
+	cd $@/../ && npm i 
+	cd $@ && bundle install
+	cd $@ && bundle exec pod install --repo-update
 	cd $@ && xcodebuild -workspace rn0_69.xcworkspace -scheme rn0_69 -configuration Release -sdk iphoneos build
 
 .PHONY: features/base-fixtures/rn0_69/ios/archive
 features/base-fixtures/rn0_69/ios/archive:
-	cd features/base-fixtures/rn0_69/ios/../ && npm i && bundle install
-	cd features/base-fixtures/rn0_69/ios/ && pod install
+	cd features/base-fixtures/rn0_69/ && npm i 
+	cd features/base-fixtures/rn0_69/ios/ && bundle install
+	cd features/base-fixtures/rn0_69/ios/ && bundle exec pod install --repo-update
 	cd features/base-fixtures/rn0_69/ios/ && xcrun xcodebuild -scheme rn0_69 -workspace rn0_69.xcworkspace -configuration Release -archivePath "../rn0_69.xcarchive" -allowProvisioningUpdates archive
 
 .PHONY: features/base-fixtures/rn0_70/android
@@ -117,14 +119,16 @@ features/base-fixtures/rn0_70/android:
 
 .PHONY: features/base-fixtures/rn0_70/ios
 features/base-fixtures/rn0_70/ios:
-	cd $@/../ && npm i && bundle install
-	cd $@ && pod install
+	cd $@/../ && npm i
+	cd $@ && bundle install
+	cd $@ && bundle exec pod install --repo-update
 	cd $@ && xcodebuild -workspace rn0_70.xcworkspace -scheme rn0_70 -configuration Release -sdk iphoneos build
 
 .PHONY: features/base-fixtures/rn0_70/ios/archive
 features/base-fixtures/rn0_70/ios/archive:
-	cd features/base-fixtures/rn0_70/ios/../ && npm i && bundle install
-	cd features/base-fixtures/rn0_70/ios/ && pod install
+	cd features/base-fixtures/rn0_70/ && npm i 
+	cd features/base-fixtures/rn0_70/ios/ && bundle install
+	cd features/base-fixtures/rn0_70/ios/ && bundle exec pod install --repo-update
 	cd features/base-fixtures/rn0_70/ios/ && xcrun xcodebuild -scheme rn0_70 -workspace rn0_70.xcworkspace -configuration Release -archivePath "../rn0_70.xcarchive" -allowProvisioningUpdates archive
 
 .PHONY: features/base-fixtures/rn0_72/android
@@ -134,14 +138,16 @@ features/base-fixtures/rn0_72/android:
 
 .PHONY: features/base-fixtures/rn0_72/ios
 features/base-fixtures/rn0_72/ios:
-	cd $@/../ && npm i && bundle install
-	cd $@ && pod install
+	cd $@/../ && npm i
+	cd $@ && bundle install
+	cd $@ && bundle exec pod install --repo-update
 	cd $@ && xcodebuild -workspace rn0_72.xcworkspace -scheme rn0_72 -configuration Release -sdk iphoneos build
 
 .PHONY: features/base-fixtures/rn0_72/ios/archive
 features/base-fixtures/rn0_72/ios/archive:
-	cd features/base-fixtures/rn0_72/ios/../ && npm i && bundle install
-	cd features/base-fixtures/rn0_72/ios/ && pod install
+	cd features/base-fixtures/rn0_72/ && npm i
+	cd features/base-fixtures/rn0_72/ios && bundle install
+	cd features/base-fixtures/rn0_72/ios/ && bundle exec pod install --repo-update
 	cd features/base-fixtures/rn0_72/ios/ && xcrun xcodebuild -scheme rn0_72 -workspace rn0_72.xcworkspace -configuration Release -archivePath "../rn0_72.xcarchive" -allowProvisioningUpdates archive
 
 .PHONY: features/base-fixtures/js-webpack4