Skip to content

Commit 90a3ec5

Browse files
michalchudziakmichalchudziak
authored
Merge pull request #14 from callstack-internal/fix/autolinking
fix: iOS autolinking
2 parents 391f480 + b560834 commit 90a3ec5

File tree

5 files changed

+66
-53
lines changed

5 files changed

+66
-53
lines changed

‎ios/ReactNativeBrownfield.podspec renamed to ‎ReactNativeBrownfield.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'json'
22

3-
package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
3+
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
44

55
Pod::Spec.new do |spec|
66
spec.name = "ReactNativeBrownfield"
@@ -14,7 +14,7 @@ Pod::Spec.new do |spec|
1414

1515
# s.source = { :git => "[email protected]/michalchudziak/react-native-brownfield.git", :tag => "v#{s.version}" }
1616
spec.source = { :path => "." }
17-
spec.source_files = "**/*.{h,m}"
17+
spec.source_files = "ios/**/*.{h,m}"
1818

1919
spec.dependency 'React'
2020
end

‎example/objc/Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,4 @@ target 'NativeExample' do
2929

3030
use_native_modules!('../..')
3131

32-
pod 'ReactNativeBrownfield', :path => '../../ios'
33-
3432
end

‎example/objc/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ DEPENDENCIES:
109109
- React-RCTText (from `../../node_modules/react-native/Libraries/Text`)
110110
- React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`)
111111
- React-RCTWebSocket (from `../../node_modules/react-native/Libraries/WebSocket`)
112-
- ReactNativeBrownfield (from `../../ios`)
112+
- ReactNativeBrownfield (from `../../`)
113113
- RNGestureHandler (from `../../node_modules/react-native-gesture-handler`)
114114
- yoga (from `../../node_modules/react-native/ReactCommon/yoga`)
115115

@@ -161,7 +161,7 @@ EXTERNAL SOURCES:
161161
React-RCTWebSocket:
162162
:path: "../../node_modules/react-native/Libraries/WebSocket"
163163
ReactNativeBrownfield:
164-
:path: "../../ios"
164+
:path: "../../"
165165
RNGestureHandler:
166166
:path: "../../node_modules/react-native-gesture-handler"
167167
yoga:
@@ -190,10 +190,10 @@ SPEC CHECKSUMS:
190190
React-RCTText: 685fca2e13b024271048e7e247ef24476f28a41e
191191
React-RCTVibration: 4ee1cf208ab17a50fafb1c16ffe28fe594a64e4f
192192
React-RCTWebSocket: fca087d583724aa0e5fef7d911f0f2a28d0f2736
193-
ReactNativeBrownfield: 9ea6e9bee9cbe4389598631670e815997024ff2a
193+
ReactNativeBrownfield: af3caba0d9116aaec5964348258636293fa94f7c
194194
RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
195195
yoga: 616fde658be980aa60a2158835170f3f9c2d04b4
196196

197-
PODFILE CHECKSUM: 9eb067650fd7e3b5b51f03a2fce8acb6f2d9b5f3
197+
PODFILE CHECKSUM: ba373afec6fc96ea314dd755df3ac5ef81b30999
198198

199199
COCOAPODS: 1.7.3

‎ios/project.pbxproj renamed to ‎ios/ReactNativeBrownfield.xcodeproj/project.pbxproj

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,38 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
28B1707222BF9F5700C4A94C /* ReactNativeBrownfield.m in Sources */ = {isa = PBXBuildFile; fileRef = 28B1707122BF9F5700C4A94C /* ReactNativeBrownfield.m */; };
11-
28B1707322BF9F5700C4A94C /* ReactNativeBrownfield.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 28B1707022BF9F5700C4A94C /* ReactNativeBrownfield.h */; };
10+
696CB249230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB243230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m */; };
11+
696CB24A230EF9EA000207AF /* ReactNativeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB244230EF9EA000207AF /* ReactNativeViewController.m */; };
12+
696CB24B230EF9EA000207AF /* ReactNativeBrownfield.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB245230EF9EA000207AF /* ReactNativeBrownfield.m */; };
13+
696CB24C230EF9EA000207AF /* ReactNativeBrownfieldModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB246230EF9EA000207AF /* ReactNativeBrownfieldModule.m */; };
1214
/* End PBXBuildFile section */
1315

1416
/* Begin PBXCopyFilesBuildPhase section */
15-
28B1706B22BF9F5700C4A94C /* CopyFiles */ = {
17+
696CB227230EF910000207AF /* CopyFiles */ = {
1618
isa = PBXCopyFilesBuildPhase;
1719
buildActionMask = 2147483647;
1820
dstPath = "include/$(PRODUCT_NAME)";
1921
dstSubfolderSpec = 16;
2022
files = (
21-
28B1707322BF9F5700C4A94C /* ReactNativeBrownfield.h in CopyFiles */,
2223
);
2324
runOnlyForDeploymentPostprocessing = 0;
2425
};
2526
/* End PBXCopyFilesBuildPhase section */
2627

2728
/* Begin PBXFileReference section */
28-
28B1706D22BF9F5700C4A94C /* libReactNativeBrownfield.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNativeBrownfield.a; sourceTree = BUILT_PRODUCTS_DIR; };
29-
28B1707022BF9F5700C4A94C /* ReactNativeBrownfield.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfield.h; sourceTree = "<group>"; };
30-
28B1707122BF9F5700C4A94C /* ReactNativeBrownfield.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfield.m; sourceTree = "<group>"; };
29+
696CB229230EF910000207AF /* libReactNativeBrownfield.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNativeBrownfield.a; sourceTree = BUILT_PRODUCTS_DIR; };
30+
696CB241230EF9EA000207AF /* ReactNativeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeViewController.h; sourceTree = "<group>"; };
31+
696CB242230EF9EA000207AF /* ReactNativeBrownfieldModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfieldModule.h; sourceTree = "<group>"; };
32+
696CB243230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfieldNotifications.m; sourceTree = "<group>"; };
33+
696CB244230EF9EA000207AF /* ReactNativeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeViewController.m; sourceTree = "<group>"; };
34+
696CB245230EF9EA000207AF /* ReactNativeBrownfield.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfield.m; sourceTree = "<group>"; };
35+
696CB246230EF9EA000207AF /* ReactNativeBrownfieldModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfieldModule.m; sourceTree = "<group>"; };
36+
696CB247230EF9EA000207AF /* ReactNativeBrownfieldNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfieldNotifications.h; sourceTree = "<group>"; };
37+
696CB248230EF9EA000207AF /* ReactNativeBrownfield.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfield.h; sourceTree = "<group>"; };
3138
/* End PBXFileReference section */
3239

3340
/* Begin PBXFrameworksBuildPhase section */
34-
28B1706A22BF9F5700C4A94C /* Frameworks */ = {
41+
696CB226230EF910000207AF /* Frameworks */ = {
3542
isa = PBXFrameworksBuildPhase;
3643
buildActionMask = 2147483647;
3744
files = (
@@ -41,87 +48,96 @@
4148
/* End PBXFrameworksBuildPhase section */
4249

4350
/* Begin PBXGroup section */
44-
28B1706422BF9F5700C4A94C = {
51+
696CB220230EF910000207AF = {
4552
isa = PBXGroup;
4653
children = (
47-
28B1707022BF9F5700C4A94C /* ReactNativeBrownfield.h */,
48-
28B1707122BF9F5700C4A94C /* ReactNativeBrownfield.m */,
49-
28B1706E22BF9F5700C4A94C /* Products */,
54+
696CB248230EF9EA000207AF /* ReactNativeBrownfield.h */,
55+
696CB245230EF9EA000207AF /* ReactNativeBrownfield.m */,
56+
696CB242230EF9EA000207AF /* ReactNativeBrownfieldModule.h */,
57+
696CB246230EF9EA000207AF /* ReactNativeBrownfieldModule.m */,
58+
696CB247230EF9EA000207AF /* ReactNativeBrownfieldNotifications.h */,
59+
696CB243230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m */,
60+
696CB241230EF9EA000207AF /* ReactNativeViewController.h */,
61+
696CB244230EF9EA000207AF /* ReactNativeViewController.m */,
62+
696CB22A230EF910000207AF /* Products */,
5063
);
5164
sourceTree = "<group>";
5265
};
53-
28B1706E22BF9F5700C4A94C /* Products */ = {
66+
696CB22A230EF910000207AF /* Products */ = {
5467
isa = PBXGroup;
5568
children = (
56-
28B1706D22BF9F5700C4A94C /* libReactNativeBrownfield.a */,
69+
696CB229230EF910000207AF /* libReactNativeBrownfield.a */,
5770
);
5871
name = Products;
5972
sourceTree = "<group>";
6073
};
6174
/* End PBXGroup section */
6275

6376
/* Begin PBXNativeTarget section */
64-
28B1706C22BF9F5700C4A94C /* ReactNativeBrownfield */ = {
77+
696CB228230EF910000207AF /* ReactNativeBrownfield */ = {
6578
isa = PBXNativeTarget;
66-
buildConfigurationList = 28B1707622BF9F5700C4A94C /* Build configuration list for PBXNativeTarget "ReactNativeBrownfield" */;
79+
buildConfigurationList = 696CB232230EF910000207AF /* Build configuration list for PBXNativeTarget "ReactNativeBrownfield" */;
6780
buildPhases = (
68-
28B1706922BF9F5700C4A94C /* Sources */,
69-
28B1706A22BF9F5700C4A94C /* Frameworks */,
70-
28B1706B22BF9F5700C4A94C /* CopyFiles */,
81+
696CB225230EF910000207AF /* Sources */,
82+
696CB226230EF910000207AF /* Frameworks */,
83+
696CB227230EF910000207AF /* CopyFiles */,
7184
);
7285
buildRules = (
7386
);
7487
dependencies = (
7588
);
7689
name = ReactNativeBrownfield;
7790
productName = ReactNativeBrownfield;
78-
productReference = 28B1706D22BF9F5700C4A94C /* libReactNativeBrownfield.a */;
91+
productReference = 696CB229230EF910000207AF /* libReactNativeBrownfield.a */;
7992
productType = "com.apple.product-type.library.static";
8093
};
8194
/* End PBXNativeTarget section */
8295

8396
/* Begin PBXProject section */
84-
28B1706522BF9F5700C4A94C /* Project object */ = {
97+
696CB221230EF910000207AF /* Project object */ = {
8598
isa = PBXProject;
8699
attributes = {
87-
LastUpgradeCheck = 1010;
88-
ORGANIZATIONNAME = Callstack;
100+
LastUpgradeCheck = 1020;
101+
ORGANIZATIONNAME = callstack;
89102
TargetAttributes = {
90-
28B1706C22BF9F5700C4A94C = {
91-
CreatedOnToolsVersion = 10.1;
103+
696CB228230EF910000207AF = {
104+
CreatedOnToolsVersion = 10.2.1;
92105
};
93106
};
94107
};
95-
buildConfigurationList = 28B1706822BF9F5700C4A94C /* Build configuration list for PBXProject "ReactNativeBrownfield" */;
108+
buildConfigurationList = 696CB224230EF910000207AF /* Build configuration list for PBXProject "ReactNativeBrownfield" */;
96109
compatibilityVersion = "Xcode 9.3";
97110
developmentRegion = en;
98111
hasScannedForEncodings = 0;
99112
knownRegions = (
100113
en,
101114
);
102-
mainGroup = 28B1706422BF9F5700C4A94C;
103-
productRefGroup = 28B1706E22BF9F5700C4A94C /* Products */;
115+
mainGroup = 696CB220230EF910000207AF;
116+
productRefGroup = 696CB22A230EF910000207AF /* Products */;
104117
projectDirPath = "";
105118
projectRoot = "";
106119
targets = (
107-
28B1706C22BF9F5700C4A94C /* ReactNativeBrownfield */,
120+
696CB228230EF910000207AF /* ReactNativeBrownfield */,
108121
);
109122
};
110123
/* End PBXProject section */
111124

112125
/* Begin PBXSourcesBuildPhase section */
113-
28B1706922BF9F5700C4A94C /* Sources */ = {
126+
696CB225230EF910000207AF /* Sources */ = {
114127
isa = PBXSourcesBuildPhase;
115128
buildActionMask = 2147483647;
116129
files = (
117-
28B1707222BF9F5700C4A94C /* ReactNativeBrownfield.m in Sources */,
130+
696CB24C230EF9EA000207AF /* ReactNativeBrownfieldModule.m in Sources */,
131+
696CB24B230EF9EA000207AF /* ReactNativeBrownfield.m in Sources */,
132+
696CB249230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m in Sources */,
133+
696CB24A230EF9EA000207AF /* ReactNativeViewController.m in Sources */,
118134
);
119135
runOnlyForDeploymentPostprocessing = 0;
120136
};
121137
/* End PBXSourcesBuildPhase section */
122138

123139
/* Begin XCBuildConfiguration section */
124-
28B1707422BF9F5700C4A94C /* Debug */ = {
140+
696CB230230EF910000207AF /* Debug */ = {
125141
isa = XCBuildConfiguration;
126142
buildSettings = {
127143
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -172,15 +188,15 @@
172188
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
173189
GCC_WARN_UNUSED_FUNCTION = YES;
174190
GCC_WARN_UNUSED_VARIABLE = YES;
175-
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
191+
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
176192
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
177193
MTL_FAST_MATH = YES;
178194
ONLY_ACTIVE_ARCH = YES;
179195
SDKROOT = iphoneos;
180196
};
181197
name = Debug;
182198
};
183-
28B1707522BF9F5700C4A94C /* Release */ = {
199+
696CB231230EF910000207AF /* Release */ = {
184200
isa = XCBuildConfiguration;
185201
buildSettings = {
186202
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -225,15 +241,15 @@
225241
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
226242
GCC_WARN_UNUSED_FUNCTION = YES;
227243
GCC_WARN_UNUSED_VARIABLE = YES;
228-
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
244+
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
229245
MTL_ENABLE_DEBUG_INFO = NO;
230246
MTL_FAST_MATH = YES;
231247
SDKROOT = iphoneos;
232248
VALIDATE_PRODUCT = YES;
233249
};
234250
name = Release;
235251
};
236-
28B1707722BF9F5700C4A94C /* Debug */ = {
252+
696CB233230EF910000207AF /* Debug */ = {
237253
isa = XCBuildConfiguration;
238254
buildSettings = {
239255
CODE_SIGN_STYLE = Automatic;
@@ -245,7 +261,7 @@
245261
};
246262
name = Debug;
247263
};
248-
28B1707822BF9F5700C4A94C /* Release */ = {
264+
696CB234230EF910000207AF /* Release */ = {
249265
isa = XCBuildConfiguration;
250266
buildSettings = {
251267
CODE_SIGN_STYLE = Automatic;
@@ -260,25 +276,25 @@
260276
/* End XCBuildConfiguration section */
261277

262278
/* Begin XCConfigurationList section */
263-
28B1706822BF9F5700C4A94C /* Build configuration list for PBXProject "ReactNativeBrownfield" */ = {
279+
696CB224230EF910000207AF /* Build configuration list for PBXProject "ReactNativeBrownfield" */ = {
264280
isa = XCConfigurationList;
265281
buildConfigurations = (
266-
28B1707422BF9F5700C4A94C /* Debug */,
267-
28B1707522BF9F5700C4A94C /* Release */,
282+
696CB230230EF910000207AF /* Debug */,
283+
696CB231230EF910000207AF /* Release */,
268284
);
269285
defaultConfigurationIsVisible = 0;
270286
defaultConfigurationName = Release;
271287
};
272-
28B1707622BF9F5700C4A94C /* Build configuration list for PBXNativeTarget "ReactNativeBrownfield" */ = {
288+
696CB232230EF910000207AF /* Build configuration list for PBXNativeTarget "ReactNativeBrownfield" */ = {
273289
isa = XCConfigurationList;
274290
buildConfigurations = (
275-
28B1707722BF9F5700C4A94C /* Debug */,
276-
28B1707822BF9F5700C4A94C /* Release */,
291+
696CB233230EF910000207AF /* Debug */,
292+
696CB234230EF910000207AF /* Release */,
277293
);
278294
defaultConfigurationIsVisible = 0;
279295
defaultConfigurationName = Release;
280296
};
281297
/* End XCConfigurationList section */
282298
};
283-
rootObject = 28B1706522BF9F5700C4A94C /* Project object */;
299+
rootObject = 696CB221230EF910000207AF /* Project object */;
284300
}

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@babel/runtime": "7.4.5",
3232
"@react-native-community/eslint-config": "0.0.5",
3333
"babel-plugin-module-resolver": "3.1.3",
34-
"detox": "12.4.1",
3534
"eslint": "6.0.1",
3635
"flow-bin": "0.98.0",
3736
"jetifier": "1.6.1",

0 commit comments

Comments
 (0)