Merge commit '6651d8c34680a0104c31abe65223d55cce237f96' into 0.67-merge-latest

This commit is contained in:
Adam Gleitman 2022-04-27 17:17:24 -07:00
Родитель 5b52f670c7 6651d8c346
Коммит ebaec036f2
3 изменённых файлов: 93 добавлений и 30 удалений

Просмотреть файл

@ -0,0 +1,52 @@
# Copyright (c) Facebook, Inc. and its affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
# TODO: Delete me before merging
require "json"
package = JSON.parse(File.read(File.join(__dir__, "../package.json")))
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
folly_version = '2021.06.28.00-v2' # TODO(macOS GH#774)
Pod::Spec.new do |s|
s.name = "ScreenshotManager"
s.version = package["version"]
s.summary = package["description"]
s.description = "ScreenshotManager"
s.homepage = "https://github.com/facebook/react-native.git"
s.license = "MIT"
s.platforms = { :ios => "11.0", :osx => "10.15", :tvos => "11.0" } # TODO(macOS GH#774)
s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness'
s.author = "Facebook, Inc. and its affiliates"
s.source = { :git => "https://github.com/facebook/react-native.git", :tag => "#{s.version}" }
s.source_files = "**/*.{h,m,mm,swift}"
# [TODO(macOS GH#774)
s.ios.exclude_files = "ScreenshotMacOS.{h,mm}"
s.osx.exclude_files = "Screenshot.{h,m}"
# ]TODO(macOS GH#774)
s.requires_arc = true
s.dependency "React"
s.dependency "RCT-Folly", folly_version
# [TODO(macOS GH#774)
s.osx.dependency "React-TurboModuleCxx-RNW"
s.osx.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
# ]TODO(macOS GH#774)
# s.dependency "..."
# Enable codegen for this library
use_react_native_codegen!(s, {
:react_native_path => "../../..",
:js_srcs_dir => "./",
:output_dir => "./"
})
end

Просмотреть файл

@ -44,6 +44,9 @@ def pods(options = {})
pod 'React-TurboModuleCxx-WinRTPort', :path => "#{prefix_path}/ReactTurboModuleCxx" # TODO(macOS GH#774)
pod 'React-TurboModuleCxx-RNW', :podspec => "#{prefix_path}/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec" # TODO(macOS GH#774)
# Additional Pods which are classed as unstable
# RNTester native modules and components
pod 'ScreenshotManager', :path => "NativeModuleExample"
end
target 'RNTester' do

Просмотреть файл

@ -383,6 +383,10 @@ PODS:
- React-logger (= 1000.0.0)
- React-perflogger (= 1000.0.0)
- ReactCommon/turbomodule/core (= 1000.0.0)
- ScreenshotManager (0.0.1):
- RCT-Folly (= 2021.06.28.00-v2)
- React
- React-TurboModuleCxx-RNW
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)
@ -446,6 +450,7 @@ DEPENDENCIES:
- React-TurboModuleCxx-WinRTPort (from `../../ReactTurboModuleCxx`)
- ReactCommon/turbomodule/core (from `../../ReactCommon`)
- ReactCommon/turbomodule/samples (from `../../ReactCommon`)
- ScreenshotManager (from `NativeModuleExample`)
- Yoga (from `../../ReactCommon/yoga`)
SPEC REPOS:
@ -534,6 +539,8 @@ EXTERNAL SOURCES:
:path: "../../ReactTurboModuleCxx"
ReactCommon:
:path: "../../ReactCommon"
ScreenshotManager:
:path: NativeModuleExample
Yoga:
:path: "../../ReactCommon/yoga"
@ -542,8 +549,8 @@ SPEC CHECKSUMS:
boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8
FBLazyVector: 93073f6a888e5cdd11b25ae0434551fca93fd7a3
FBReactNativeSpec: 750281e4657e4c88239014299fcbbc115b4b845f
FBLazyVector: f7b96762546df94ed127c827af9560ae1ef81a65
FBReactNativeSpec: b18a00cc3e9f4d7b0cc515eebcf35ca6555c845f
Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
@ -558,36 +565,37 @@ SPEC CHECKSUMS:
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
RCT-Folly: 43adc9ce880eb76792f88c011773cb5c664c1419
RCTRequired: f12ad50a43367f98710e6362c1bdbeef0ea5245a
RCTTypeSafety: bc2d2db0e24cdcd3f5494fe5634024c0f20c0694
React: f6928da5ac8761ea569ac2b05de808c1d7b075a7
React-callinvoker: 4f06162a050a3d4543bced3b8f03a1751cd66925
React-Core: 79783d44c69157490c468a28f6fc01ebe0d23e43
React-CoreModules: 4def0259d36fb9db39f7936f2dfea0b5aff0d68a
React-cxxreact: 3662230abd4025885f2d77e7f0909bc91edb8f95
React-jsi: 2e4e2870285e26a23b7f2f950e8b73d1de722427
React-jsiexecutor: 1754d078d34254aeb3881ab2b966b7f13638584d
React-jsinspector: d6f952abeefc9dbdabc0932bf774f5f7a462a31f
React-logger: 8b67df82c8ca64f4f13f12344b2af4259c2d4611
React-perflogger: 033848a56d5ee42a5ef3b8989958101e2cccf0dd
React-RCTActionSheet: 87b9e8cea6e12951a2bc1ddfe9c491797d4e9bfa
React-RCTAnimation: b409786e0865b62fc7f8700d9e378e917507906a
React-RCTBlob: 0e78d703e6fc2b2d31ec4595aab838b30771b497
React-RCTImage: 577bff41682f5c75c74f154bf1b63bec11a9fd45
React-RCTLinking: 08547c7f9bdad04991215db911c195448645a92a
React-RCTNetwork: eddcc4c69ff76f172de31369f9a571683330e387
React-RCTPushNotification: 1aeddd1549c5e8ea77ddc468b961fa38de5482ac
React-RCTSettings: b016199203cf366f7a1336e8896a22acd7024887
React-RCTTest: 13e9f35afc4bcf2a724c3b47e3531cd5bf54c1a1
React-RCTText: f2960f96522f049f7b727e646951434ac490b3cd
React-RCTVibration: f2450721ed5fdc45bf087e457fc35e8828d99e2b
React-runtimeexecutor: a839145ce9d28fb3d152a3aa1584994560159468
RCTRequired: b770df03d14ec341e7841d9be6ed7945a750d3d2
RCTTypeSafety: 218bf4afbba2369d211168a7c7e2bf7f9d375f06
React: 2a49a9d9e36cea2858a30405f0abba6a87cc866c
React-callinvoker: 0e3cca98785af7078c668101c905f7808fc573d0
React-Core: 6984ab44087fd2efb524e2d4854ba5e045e5db99
React-CoreModules: fe5a0046e129f2497fc1826f3ab959b416b08dc9
React-cxxreact: 32a8fc9f27df73120269e811a29f82936f90e158
React-jsi: c4c5b016d54a71a96a776b0a7b024ae9138b1084
React-jsiexecutor: b2d1d7474cb1be1c3fe54796a79d62f4a79327fd
React-jsinspector: b1340e2c1465f84b19583bfee20b6b8e241632b8
React-logger: a84c1a7bb3e18b07375c22f10da34aa9b85be61c
React-perflogger: 4f60f5f0b24d78981166eb50aebe9833e66ddd07
React-RCTActionSheet: dd559cc4e996b04ccd82dee076001074a855eb90
React-RCTAnimation: b35037b1d48f1d9418f89adb3a3efcc42beaf6a5
React-RCTBlob: 687e1490129bdf0397ab0d917cbd95ec03c53ba9
React-RCTImage: 186400b7f0ac59e96ebc4e350fde0e09121f33b3
React-RCTLinking: 757808ae10b907c553e907b49d99be477a741f73
React-RCTNetwork: 9d51e276e326d884cde92d9e94659ce77454c8ac
React-RCTPushNotification: d8a858ccaaba67adef3a00fb341c3385500fb5fc
React-RCTSettings: 3cc96fa0308a6105de836c9f77241046244bff1c
React-RCTTest: 6d69b9a94cc168435005ae7319f7ae9972ee0cf7
React-RCTText: a28d50837ea7b00e92669033089fddff1fe10b50
React-RCTVibration: dcf22c3534b78833697aa6758a5900a83a6360f9
React-runtimeexecutor: b4a3cc1e5a1ab88da607810bbefb5675a35c8a3a
React-TurboModuleCxx-RNW: f2e32cbfced49190a61d66c993a8975de79a158a
React-TurboModuleCxx-WinRTPort: 413735d46b568d10edfd1f05643d9e777f2a013b
ReactCommon: 2cf97e7f7e9ed1d9a14e2dbbd9c671e5074d32be
Yoga: 8774604124eb5f6eacf994b14d41cd6e4e383cbc
React-TurboModuleCxx-WinRTPort: 4e92b16b06c04b74eff78d167f7b34d81918a587
ReactCommon: cd6b03739441390008e63bc3aa87b39f6aad33f3
ScreenshotManager: 208b71f7505bae6a2046321744ed02bc48648ec4
Yoga: 96ccb90ce06707269603163872c3bc8301ce5b13
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: c7a7110b242497f2bf323ba74caedb9ee61ee05e
PODFILE CHECKSUM: 54afd7797b4306f176be8caf7e8a1239ca2d8f4d
COCOAPODS: 1.11.2