Skip to content
This repository was archived by the owner on Sep 14, 2020. It is now read-only.

Commit 49c3727

Browse files
authored
fix:(ios) Fix packaging issue breaking compilation on RN <0.60 (#441)
Updating bugsnag-cocoa to 5.22.10 had the side effect of requiring the xcconfig file to compile the `BugsnagStatic` target. This change adds the missing file. Fixes #433
1 parent 154d2d2 commit 49c3727

4 files changed

Lines changed: 89 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
## TBD
5+
6+
### Bug fixes
7+
8+
* (iOS) Fix a packaging issue introduced in 2.23.3 which prevented apps using
9+
React Native 0.59 and below from building successfully
10+
411
## 2.23.4 (2020-01-06)
512

613
### Bug fixes

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@ endif
4141
@git -C ../bugsnag-cocoa fetch
4242
@git -C ../bugsnag-cocoa checkout v$(IOS_VERSION)
4343
@rsync --delete -al ../bugsnag-cocoa/Source/ cocoa/vendor/bugsnag-cocoa/Source/
44+
@rsync --delete -al ../bugsnag-cocoa/Configurations/ cocoa/vendor/bugsnag-cocoa/Configurations/
4445
@rsync --delete -al ../bugsnag-cocoa/iOS/ cocoa/vendor/bugsnag-cocoa/iOS/
4546
@git status
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
// The MIT License (MIT)
2+
//
3+
// Copyright (c) 2015 Marius Rackwitz
4+
//
5+
//Permission is hereby granted, free of charge, to any person obtaining a copy
6+
//of this software and associated documentation files (the "Software"), to deal
7+
//in the Software without restriction, including without limitation the rights
8+
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
//copies of the Software, and to permit persons to whom the Software is
10+
//furnished to do so, subject to the following conditions:
11+
//
12+
//The above copyright notice and this permission notice shall be included in all
13+
//copies or substantial portions of the Software.
14+
//
15+
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
//SOFTWARE.
22+
//
23+
// https://github.com/mrackwitz/xcconfigs
24+
25+
26+
SUPPORTED_PLATFORMS = macosx iphonesimulator iphoneos watchos watchsimulator appletvos appletvsimulator
27+
VALID_ARCHS[sdk=macosx*] = i386 x86_64
28+
VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
29+
VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64
30+
VALID_ARCHS[sdk=watchos*] = armv7k
31+
VALID_ARCHS[sdk=watchsimulator*] = i386
32+
VALID_ARCHS[sdk=appletvos*] = arm64
33+
VALID_ARCHS[sdk=appletvsimulator*] = x86_64
34+
35+
// Dynamic linking uses different default copy paths
36+
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks'
37+
LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
38+
LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
39+
LD_RUNPATH_SEARCH_PATHS[sdk=watchos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
40+
LD_RUNPATH_SEARCH_PATHS[sdk=watchsimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
41+
LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
42+
LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
43+
44+
// Platform-specific dependencies
45+
OTHER_LDFLAGS[sdk=macosx*] = $(inherited) '-framework' 'Cocoa'
46+
OTHER_LDFLAGS[sdk=iphoneos*] = $(inherited) '-framework' 'UIKit'
47+
OTHER_LDFLAGS[sdk=iphonesimulator*] = $(inherited) '-framework' 'UIKit'
48+
OTHER_LDFLAGS[sdk=appletvos*] = $(inherited) '-framework' 'UIKit'
49+
OTHER_LDFLAGS[sdk=appletvsimulator*] = $(inherited) '-framework' 'UIKit'
50+
51+
// OSX-specific default settings
52+
FRAMEWORK_VERSION[sdk=macosx*] = A
53+
COMBINE_HIDPI_IMAGES[sdk=macosx*] = YES
54+
55+
// iOS-specific default settings
56+
CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
57+
TARGETED_DEVICE_FAMILY[sdk=iphonesimulator*] = 1,2
58+
TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2
59+
60+
// TV-specific default settings
61+
TARGETED_DEVICE_FAMILY[sdk=appletvsimulator*] = 3
62+
TARGETED_DEVICE_FAMILY[sdk=appletv*] = 3
63+
64+
// Watch-specific default settings
65+
TARGETED_DEVICE_FAMILY[sdk=watchsimulator*] = 4
66+
TARGETED_DEVICE_FAMILY[sdk=watch*] = 4
67+
68+
ENABLE_BITCODE[sdk=macosx*] = NO
69+
ENABLE_BITCODE[sdk=watchsimulator*] = YES
70+
ENABLE_BITCODE[sdk=watch*] = YES
71+
ENABLE_BITCODE[sdk=iphonesimulator*] = YES
72+
ENABLE_BITCODE[sdk=iphone*] = YES
73+
ENABLE_BITCODE[sdk=appletvsimulator*] = YES
74+
ENABLE_BITCODE[sdk=appletv*] = YES
75+
76+
77+
// Unset this property to work around an issue where the build paths generated
78+
// by `xcodebuild -showBuildSettings` are wrong when building the macOS variant
79+
// of a universal framework. (FB7365403)
80+
EFFECTIVE_PLATFORM_NAME =

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"android",
2121
"cocoa/BugsnagReactNative.{h,m,xcodeproj}",
2222
"cocoa/vendor/bugsnag-cocoa/Source/**/*.{h,m,mm,cpp,c}",
23+
"cocoa/vendor/bugsnag-cocoa/Configurations/Config.xcconfig",
2324
"cocoa/vendor/bugsnag-cocoa/iOS/{Bugsnag.xcodeproj,Info.plist,module.modulemap}",
2425
"BugsnagReactNative.podspec",
2526
"react-native.config.js"

0 commit comments

Comments
 (0)