Skip to content

Commit e353781

Browse files
liamxujialiamxujia
committed
[podspec] Distinguish between Source and Framework
1 parent e8398dd commit e353781

648 files changed

Lines changed: 64130 additions & 304 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ DerivedData
2323
.bundle
2424

2525
# Add this line if you want to avoid checking in source code from Carthage dependencies.
26-
# Carthage/Checkouts
27-
26+
Carthage/Checkouts
2827
Carthage/Build
2928

3029
# We recommend against adding the Pods directory to your .gitignore. However

‎Example/Podfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ use_frameworks!
44
inhibit_all_warnings!
55

66
target 'ReactNativeCore_Example' do
7-
pod 'react-ios', :path => '../'
8-
pod 'react-component'
9-
pod 'react-expo'
7+
# pod 'react-ios', :path => '../'
8+
# pod 'react-component', :path => '../../react-component'
9+
# pod 'react-expo', :path => '../../react-expo'
10+
11+
pod 'react-ios/framework', :path => '../'
12+
# pod 'react-component/framework', :path => '../../react-component'
13+
# pod 'react-expo/framework', :path => '../../react-expo'
1014

1115
target 'ReactNativeCore_Tests' do
1216
inherit! :search_paths

‎Example/Podfile.lock‎

Lines changed: 4 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,22 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
33
- DoubleConversion (1.1.5)
4-
- DVAssetLoaderDelegate (0.3.3)
54
- glog (0.3.4)
6-
- libwebp (1.2.0):
7-
- libwebp/demux (= 1.2.0)
8-
- libwebp/mux (= 1.2.0)
9-
- libwebp/webp (= 1.2.0)
10-
- libwebp/demux (1.2.0):
11-
- libwebp/webp
12-
- libwebp/mux (1.2.0):
13-
- libwebp/demux
14-
- libwebp/webp (1.2.0)
15-
- lottie-ios (3.1.9)
16-
- react-component (1.0.0):
17-
- DVAssetLoaderDelegate (~> 0.3.1)
18-
- lottie-ios (~> 3.1.8)
19-
- react-ios (~> 0.63.4.1)
20-
- SDWebImage (~> 5.8)
21-
- SDWebImageWebPCoder (~> 0.6.1)
22-
- Sentry (~> 6.1.4)
23-
- SPTPersistentCache (~> 1.1.0)
24-
- react-expo (0.0.1):
25-
- react-component (~> 1.0.0)
26-
- react-ios (~> 0.63.4.1)
27-
- react-ios (0.63.4.1):
28-
- react-ios/All (= 0.63.4.1)
29-
- react-ios/All (0.63.4.1):
30-
- react-ios/callinvoker
31-
- react-ios/cxxreact
32-
- react-ios/Default
33-
- react-ios/FBLazyVector
34-
- react-ios/folly
35-
- react-ios/jsi
36-
- react-ios/jsiexecutor
37-
- react-ios/jsinspector
38-
- react-ios/RCTAnimation
39-
- react-ios/RCTBlob
40-
- react-ios/RCTImage
41-
- react-ios/RCTLinking
42-
- react-ios/RCTNetwork
43-
- react-ios/RCTRequired
44-
- react-ios/RCTSettings
45-
- react-ios/RCTText
46-
- react-ios/RCTVibration
47-
- react-ios/callinvoker (0.63.4.1)
48-
- react-ios/cxxreact (0.63.4.1):
5+
- react-ios/framework (0.63.4.1):
496
- boost-for-react-native (= 1.63.0)
507
- DoubleConversion (= 1.1.5)
518
- glog (= 0.3.4)
52-
- react-ios/callinvoker
53-
- react-ios/folly
54-
- react-ios/jsinspector
55-
- react-ios/Default (0.63.4.1):
56-
- glog (= 0.3.4)
57-
- react-ios/callinvoker
58-
- react-ios/cxxreact
59-
- react-ios/FBLazyVector
60-
- react-ios/folly
61-
- react-ios/jsi
62-
- react-ios/jsiexecutor
63-
- react-ios/jsinspector
64-
- react-ios/RCTRequired
659
- Yoga (= 1.14.0)
66-
- react-ios/FBLazyVector (0.63.4.1)
67-
- react-ios/folly (0.63.4.1):
68-
- boost-for-react-native (= 1.63.0)
69-
- DoubleConversion (= 1.1.5)
70-
- glog (= 0.3.4)
71-
- react-ios/jsi (0.63.4.1):
72-
- boost-for-react-native (= 1.63.0)
73-
- DoubleConversion (= 1.1.5)
74-
- glog (= 0.3.4)
75-
- react-ios/folly
76-
- react-ios/jsiexecutor (0.63.4.1):
77-
- DoubleConversion (= 1.1.5)
78-
- glog (= 0.3.4)
79-
- react-ios/cxxreact
80-
- react-ios/folly
81-
- react-ios/jsi
82-
- react-ios/jsinspector (0.63.4.1)
83-
- react-ios/RCTAnimation (0.63.4.1):
84-
- react-ios/Default
85-
- react-ios/folly
86-
- react-ios/jsi
87-
- react-ios/RCTBlob (0.63.4.1):
88-
- react-ios/Default
89-
- react-ios/folly
90-
- react-ios/jsi
91-
- react-ios/RCTNetwork
92-
- react-ios/RCTImage (0.63.4.1):
93-
- react-ios/Default
94-
- react-ios/folly
95-
- react-ios/jsi
96-
- react-ios/RCTNetwork
97-
- react-ios/RCTLinking (0.63.4.1):
98-
- react-ios/Default
99-
- react-ios/folly
100-
- react-ios/jsi
101-
- react-ios/RCTNetwork (0.63.4.1):
102-
- react-ios/Default
103-
- react-ios/folly
104-
- react-ios/jsi
105-
- react-ios/RCTRequired (0.63.4.1)
106-
- react-ios/RCTSettings (0.63.4.1):
107-
- react-ios/Default
108-
- react-ios/folly
109-
- react-ios/jsi
110-
- react-ios/RCTText (0.63.4.1):
111-
- react-ios/Default
112-
- react-ios/RCTVibration (0.63.4.1):
113-
- react-ios/Default
114-
- react-ios/folly
115-
- react-ios/jsi
116-
- SDWebImage (5.11.1):
117-
- SDWebImage/Core (= 5.11.1)
118-
- SDWebImage/Core (5.11.1)
119-
- SDWebImageWebPCoder (0.6.1):
120-
- libwebp (~> 1.0)
121-
- SDWebImage/Core (~> 5.7)
122-
- Sentry (6.1.4):
123-
- Sentry/Core (= 6.1.4)
124-
- Sentry/Core (6.1.4)
125-
- SPTPersistentCache (1.1.0)
12610
- Yoga (1.14.0)
12711

12812
DEPENDENCIES:
129-
- react-component
130-
- react-expo
131-
- react-ios (from `../`)
13+
- react-ios/framework (from `../`)
13214

13315
SPEC REPOS:
13416
trunk:
13517
- boost-for-react-native
13618
- DoubleConversion
137-
- DVAssetLoaderDelegate
13819
- glog
139-
- libwebp
140-
- lottie-ios
141-
- react-component
142-
- react-expo
143-
- SDWebImage
144-
- SDWebImageWebPCoder
145-
- Sentry
146-
- SPTPersistentCache
14720
- Yoga
14821

14922
EXTERNAL SOURCES:
@@ -153,19 +26,10 @@ EXTERNAL SOURCES:
15326
SPEC CHECKSUMS:
15427
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
15528
DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
156-
DVAssetLoaderDelegate: 0caec20e4e08b8560b691131539e9180024d4bce
15729
glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
158-
libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0
159-
lottie-ios: 3a3758ef5a008e762faec9c9d50a39842f26d124
160-
react-component: 33619ff556e5f7d0e8df6ba2976b79382f7af137
161-
react-expo: 6bde3c2820ea764caf1321a1f1846aa0cc801040
162-
react-ios: b7559a8cb53134256a8e00793ab9ec828a42acbe
163-
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
164-
SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
165-
Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc
166-
SPTPersistentCache: df36ea46762d7cf026502bbb86a8b79d0080dff4
30+
react-ios: 56486cebeb7e2008be087cc284ef9302ae5e2cae
16731
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
16832

169-
PODFILE CHECKSUM: 5559c8bfa86b31441e9210a452eb57329d8489c9
33+
PODFILE CHECKSUM: 10f9cf722d267339dd976b9693ed2dc54ff9a3c5
17034

17135
COCOAPODS: 1.10.1

‎Example/ReactNativeCore.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
B57BC8B72645502800C277CF /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
7272
B57BC90B26463F7100C277CF /* app.config */ = {isa = PBXFileReference; lastKnownFileType = text; path = app.config; sourceTree = "<group>"; };
7373
B587617063A8832919675A45 /* Pods-ReactNativeCore_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeCore_Example.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeCore_Example/Pods-ReactNativeCore_Example.debug.xcconfig"; sourceTree = "<group>"; };
74+
B5B5DB7B264E2436008BC86C /* Component.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Component.xcframework; path = "../../react-component/ios/Component.xcframework"; sourceTree = "<group>"; };
75+
B5B5DB80264E243B008BC86C /* Expo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Expo.xcframework; path = "../../react-expo/ios/Expo.xcframework"; sourceTree = "<group>"; };
76+
B5B5DB84264E2441008BC86C /* React.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = React.xcframework; path = ../React.xcframework; sourceTree = "<group>"; };
7477
CDD2982B1137BAA44C6ABBA9 /* Pods-ReactNativeCore_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeCore_Tests.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeCore_Tests/Pods-ReactNativeCore_Tests.debug.xcconfig"; sourceTree = "<group>"; };
7578
CE72F0ACB26EB6811C14DF97 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
7679
DD94585345F9C532A66B49B3 /* Pods_ReactNativeCore_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReactNativeCore_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -127,6 +130,9 @@
127130
6003F58C195388D20070C39A /* Frameworks */ = {
128131
isa = PBXGroup;
129132
children = (
133+
B5B5DB84264E2441008BC86C /* React.xcframework */,
134+
B5B5DB80264E243B008BC86C /* Expo.xcframework */,
135+
B5B5DB7B264E2436008BC86C /* Component.xcframework */,
130136
6003F58D195388D20070C39A /* Foundation.framework */,
131137
6003F58F195388D20070C39A /* CoreGraphics.framework */,
132138
6003F591195388D20070C39A /* UIKit.framework */,
@@ -340,34 +346,16 @@
340346
);
341347
inputPaths = (
342348
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeCore_Example/Pods-ReactNativeCore_Example-frameworks.sh",
343-
"${BUILT_PRODUCTS_DIR}/DVAssetLoaderDelegate/DVAssetLoaderDelegate.framework",
344349
"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
345-
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
346-
"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
347-
"${BUILT_PRODUCTS_DIR}/SPTPersistentCache/SPTPersistentCache.framework",
348-
"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
349350
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
350351
"${BUILT_PRODUCTS_DIR}/glog/glog.framework",
351-
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
352-
"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
353-
"${BUILT_PRODUCTS_DIR}/react-component/react_component.framework",
354-
"${BUILT_PRODUCTS_DIR}/react-expo/Expo.framework",
355-
"${BUILT_PRODUCTS_DIR}/react-ios/React.framework",
352+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/React/React.framework/React",
356353
);
357354
name = "[CP] Embed Pods Frameworks";
358355
outputPaths = (
359-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DVAssetLoaderDelegate.framework",
360356
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
361-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
362-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
363-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SPTPersistentCache.framework",
364-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
365357
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
366358
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
367-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
368-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
369-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_component.framework",
370-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expo.framework",
371359
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
372360
);
373361
runOnlyForDeploymentPostprocessing = 0;
@@ -537,6 +525,7 @@
537525
GCC_PRECOMPILE_PREFIX_HEADER = YES;
538526
GCC_PREFIX_HEADER = "ReactNativeCore/ReactNativeCore-Prefix.pch";
539527
INFOPLIST_FILE = "ReactNativeCore/ReactNativeCore-Info.plist";
528+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
540529
MODULE_NAME = ExampleApp;
541530
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
542531
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -553,6 +542,7 @@
553542
GCC_PRECOMPILE_PREFIX_HEADER = YES;
554543
GCC_PREFIX_HEADER = "ReactNativeCore/ReactNativeCore-Prefix.pch";
555544
INFOPLIST_FILE = "ReactNativeCore/ReactNativeCore-Info.plist";
545+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
556546
MODULE_NAME = ExampleApp;
557547
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
558548
PRODUCT_NAME = "$(TARGET_NAME)";

‎Example/ReactNativeCore.xcodeproj/xcshareddata/xcschemes/ReactNativeCore-Example.xcscheme‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎Example/ReactNativeCore/RNCAppDelegate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@import UIKit;
1010
@import React;
11-
@import Expo;
11+
//@import Expo;
1212

1313
@interface RNCAppDelegate : UIResponder <UIApplicationDelegate>
1414

0 commit comments

Comments
 (0)