Skip to content

Commit 26958fc

Browse files
fortmarekfortmarek
committed
Add Swift code to MyNativeView
1 parent 9772c62 commit 26958fc

File tree

6 files changed

+55
-38
lines changed

6 files changed

+55
-38
lines changed

‎packages/rn-tester/NativeComponentExample/MyNativeView.podspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require "json"
77

88
package = JSON.parse(File.read(File.join(__dir__, "../" "package.json")))
99

10-
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
10+
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DRN_FABRIC_ENABLED -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
1111
folly_version = '2021.06.28.00-v2'
1212
boost_version = '1.76.0'
1313
boost_compiler_flags = '-Wno-documentation'
@@ -28,7 +28,8 @@ Pod::Spec.new do |s|
2828
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
2929
}
3030

31-
s.source_files = "ios/**/*.{h,m,mm,cpp}"
31+
s.swift_version = "5.0"
32+
s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
3233
s.requires_arc = true
3334

3435
s.dependency "React"

‎packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#ifdef RN_FABRIC_ENABLED
89
#import <React/RCTViewComponentView.h>
910
#import <UIKit/UIKit.h>
1011

@@ -17,3 +18,4 @@ NS_ASSUME_NONNULL_BEGIN
1718
@end
1819

1920
NS_ASSUME_NONNULL_END
21+
#endif /* RN_FABRIC_ENABLED */

‎packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*/
7-
7+
#ifdef RN_FABRIC_ENABLED
88
#import "RNTMyNativeViewComponentView.h"
99

1010
#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
@@ -86,3 +86,4 @@ - (void)callNativeMethodToChangeBackgroundColor:(NSString *)colorString
8686
{
8787
return RNTMyNativeViewComponentView.class;
8888
}
89+
#endif /* RN_FABRIC_ENABLED */

‎packages/rn-tester/NativeComponentExample/ios/ViewComponentView.swift

Whitespace-only changes.

‎packages/rn-tester/Podfile.lock

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ PODS:
7474
- fmt (6.2.1)
7575
- glog (0.3.5)
7676
- libevent (2.1.12)
77+
- MyNativeView (0.0.1):
78+
- RCTRequired
79+
- RCTTypeSafety
80+
- React
81+
- React-Codegen
82+
- React-RCTFabric
83+
- ReactCommon/turbomodule/core
7784
- OpenSSL-Universal (1.1.1100)
7885
- RCT-Folly (2021.06.28.00-v2):
7986
- boost
@@ -747,6 +754,7 @@ DEPENDENCIES:
747754
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
748755
- FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
749756
- glog (from `../../third-party-podspecs/glog.podspec`)
757+
- MyNativeView (from `NativeComponentExample`)
750758
- OpenSSL-Universal (= 1.1.1100)
751759
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
752760
- RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
@@ -817,6 +825,8 @@ EXTERNAL SOURCES:
817825
:path: "../../React/FBReactNativeSpec"
818826
glog:
819827
:podspec: "../../third-party-podspecs/glog.podspec"
828+
MyNativeView:
829+
:path: NativeComponentExample
820830
RCT-Folly:
821831
:podspec: "../../third-party-podspecs/RCT-Folly.podspec"
822832
RCTRequired:
@@ -890,8 +900,8 @@ SPEC CHECKSUMS:
890900
boost: a7c83b31436843459a1961bfd74b96033dc77234
891901
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
892902
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
893-
FBLazyVector: 19e408e76fa9258dd32191a50d60c41444f52d29
894-
FBReactNativeSpec: 56756084824aeea7edd1a7015d1505b4845b5989
903+
FBLazyVector: 048c6fdffa500fb300f14ede5f083b8a7f6980da
904+
FBReactNativeSpec: d34246bfc07c77d414dab9ed08d536c27603ab16
895905
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
896906
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
897907
Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4
@@ -904,42 +914,43 @@ SPEC CHECKSUMS:
904914
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
905915
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
906916
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
917+
MyNativeView: 5ecb566853b8755d00c3e426706b9ad90b19e72f
907918
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
908919
RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
909-
RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e
910-
RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc
911-
React: 8d809d414723bb5763093ddec7658066a21ccabc
912-
React-bridging: 1329cdc45834252447f5f4cb8bd19ec78ef0f06e
913-
React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1
914-
React-Codegen: c4ae835565487e494740b756ce953d8f635a76df
915-
React-Core: 5f17b3eb71cbd4751186525e874010c264435bae
916-
React-CoreModules: 97cfc7d97cca9a3b59e5c2de5d1e6ddb9605f0c8
917-
React-cxxreact: 6c8298fa64352792a63f358db73f4f24c1317304
918-
React-Fabric: 7041000207eca7aa25e73731961630623b8f6510
919-
React-graphics: d4c10577f5e0221d34e65e658e2770842de99d08
920-
React-jsi: 08fe8a4e9a4a14a215f55ff954bd2fd8812df27b
921-
React-jsiexecutor: 6f90354b81808e2f408426dfae10ed413df2bada
922-
React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb
923-
React-logger: c7960346b021767ed90971aff592a44e3d69f8bb
924-
React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea
925-
React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1
926-
React-RCTAnimation: 37350855482bcf0737b6bffe083457a3db801dea
927-
React-RCTBlob: 209aa807339da293db61bed648a691101f23f52f
928-
React-RCTFabric: f67635c27e1287ce62f063beccd210d7c4f2af1f
929-
React-RCTImage: a64fe231fe8fb118a227c3bc12189d7a0c087ed0
930-
React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370
931-
React-RCTNetwork: abf43cb960e7b31a7d082143d66d9bd7d0589505
932-
React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051
933-
React-RCTSettings: da8c43d0c597d29cd509079411bc191f737a5a81
934-
React-RCTTest: 451f186880271c249a3ff65761f569592a7765e1
935-
React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9
936-
React-RCTVibration: 00dbb5e9451af741c77be12978281ded80046f3d
937-
React-rncore: 6daa27c74047a9e13ce3412b99660274a5780603
938-
React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7
939-
ReactCommon: 4a2e9e61ef59dc6f7b92f05a6b9e37a0013ee854
940-
ScreenshotManager: 2cece1df548810a0122fcc271d1b06f82d0cab8b
920+
RCTRequired: e8991e5a5ff56f89df7037782408386e3ef500f9
921+
RCTTypeSafety: 9f3814af2e64c84d36e801c5b3033da9d94b5e37
922+
React: aae9281460564872d1d2a9f63687e98083ae688a
923+
React-bridging: 335c9081b87abfd3914f016ff400ec4626112049
924+
React-callinvoker: fa2c158906d338c373c110abec74c5da0bca74ff
925+
React-Codegen: f96d767747606dbcb62d1dbdab9ebe205afddeef
926+
React-Core: 6a18fb1240514cd1edfc5dcf5faaddf15ddb3426
927+
React-CoreModules: 89331cc1224d1eed7c9c3b9842d15218092c115d
928+
React-cxxreact: f073b17258a49525a63c42a61805c192d1a92a1c
929+
React-Fabric: efe4e7eab89fdb288b7612467663c13a4c8dd1d6
930+
React-graphics: 4ef92095e51f212f8d74441c247d32da06c55917
931+
React-jsi: 5299343acb406d360d302957f9c498c89935796d
932+
React-jsiexecutor: 8b491da5dfc000e054732cdcfd7db1fac9d7ce1e
933+
React-jsinspector: 83c2584f9f48e761df42f03d9219fce665288a09
934+
React-logger: 921527a08c813caf18b05787f3a80423e8b4abde
935+
React-perflogger: 1316aea57415c81cc68ea7ac8a66f999f08d81ce
936+
React-RCTActionSheet: 210221bed0204a5af120b34193590b078c41008b
937+
React-RCTAnimation: 8eff3fc57cbcd1acd3e9735e6309b225496706b0
938+
React-RCTBlob: a0cfc9454acd71b66cd799396386c7db419053ab
939+
React-RCTFabric: 6f0b73a9dd4ee622cd42355ad7fd10711b833f1d
940+
React-RCTImage: 1e8836e02e10680e974d55490626ff3d33253832
941+
React-RCTLinking: 208bb5c00c91e5b5c6a4e842ee0675f767c03d2f
942+
React-RCTNetwork: 1d6f428e92f69c938308823de3ca8907ee5e7d5c
943+
React-RCTPushNotification: 5d6344cfa27ffa28dcc56b19056555b0f7b84a33
944+
React-RCTSettings: 4705073fca551f160002b2f65978bcf80005c6f9
945+
React-RCTTest: 28012fad3847555f53c7480cb1561c8d046a63e9
946+
React-RCTText: d0971d58ced299aaa5ad0adb1930740f01604816
947+
React-RCTVibration: e37dc2241ae5d994fcf7d59105d80baf7f48769a
948+
React-rncore: 7741c494817b6504d03f7f825a7f3ebae548196e
949+
React-runtimeexecutor: ad3677e8723ec5ce72030d04e17f0627aab346c2
950+
ReactCommon: 2cffc740ef01850cec70ded4ec73fa32a6351361
951+
ScreenshotManager: 3ad89d9fe639c27464079c987688a4a6ed7a559c
941952
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
942-
Yoga: 2854c07ffae3ed31bf7e1297d87d4aaa73db6640
953+
Yoga: 26781c386eef3eb958b3bbd393d7639d799a3d38
943954
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
944955

945956
PODFILE CHECKSUM: 2bf6f58f9311ff9b7a2195fe9ca589cf78abf099

‎packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,7 @@
913913
"-ObjC",
914914
"-lc++",
915915
);
916+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../..";
916917
SDKROOT = iphoneos;
917918
WARNING_CFLAGS = (
918919
"-Wextra",
@@ -989,6 +990,7 @@
989990
"-ObjC",
990991
"-lc++",
991992
);
993+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../..";
992994
SDKROOT = iphoneos;
993995
VALIDATE_PRODUCT = YES;
994996
WARNING_CFLAGS = (

0 commit comments

Comments
 (0)