Skip to content

Commit 6603783

Browse files
committed
Merge remote-tracking branch 'facebook/0.71-stable' into more71
2 parents bfd67ff + 030ab8e commit 6603783

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

scripts/cocoapods/__tests__/codegen_utils-test.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
require_relative "./test_utils/CodegenScriptPhaseExtractorMock.rb"
1616
require_relative "./test_utils/FileUtilsMock.rb"
1717

18+
# mocking the min_ios_version_supported function
19+
# as it is not possible to require the original react_native_pod
20+
# without incurring in circular deps
21+
# TODO: move `min_ios_version_supported` to utils.rb
22+
def min_ios_version_supported
23+
return '12.4'
24+
end
25+
1826
class CodegenUtilsTests < Test::Unit::TestCase
1927
:base_path
2028

@@ -498,7 +506,7 @@ def get_podspec_no_fabric_no_script
498506
'source' => { :git => '' },
499507
'header_mappings_dir' => './',
500508
'platforms' => {
501-
'ios' => '12.4',
509+
'ios' => min_ios_version_supported,
502510
'osx' => '10.15',
503511
},
504512
'source_files' => "**/*.{h,mm,cpp}",

scripts/cocoapods/codegen_utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
8585
'source' => { :git => '' },
8686
'header_mappings_dir' => './',
8787
'platforms' => {
88-
'ios' => '12.4',
88+
'ios' => min_ios_version_supported,
8989
'osx' => '10.15'
9090
},
9191
'source_files' => "**/*.{h,mm,cpp}",

scripts/publish-npm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ const {
4646
publishAndroidArtifactsToMaven,
4747
saveFilesToRestore,
4848
} = require('./release-utils');
49+
macOS] */
4950
const fs = require('fs');
5051
const os = require('os');
5152
const path = require('path');
52-
macOS] */
5353
const yargs = require('yargs');
5454

5555
// [macOS] Use git to get the tag name, rather than relying on CircleCI environment variables.

0 commit comments

Comments
 (0)