Skip to content

Commit f1dc191

Browse files
authored
Merge pull request #3211 from StoDevX/circle-xcode-10
Update to Xcode 10.1
2 parents 2009755 + 0aa0400 commit f1dc191

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ jobs:
321321
- run: *run-danger
322322

323323
ios: &ios
324-
macos: {xcode: '9.4.1'}
324+
macos: {xcode: '10.1.0'}
325325
environment: &ios-env
326326
task: IOS
327327
FASTLANE_SKIP_UPDATE_CHECK: '1'

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2424
- Pipe Detox output through xcpretty to reduce noise (#3188)
2525
- Extracted native build skipping and made it independent of branch (#3252, #3255)
2626
- Upgraded React-Navigation to v3.0.0, with associated breaking changes (#3259)
27+
- Told Circle to use Xcode 10.1 to build and test the iOS app
2728

2829
### Fixed
2930
- Fixed an issue where Fastlane was reporting build failures despite having skipped the build (#3215)

ios/AllAboutOlaf.xcodeproj/project.pbxproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,7 @@
951951
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
952952
953D3EBCD86D447894D1DC0D /* RCTMGL.xcodeproj */,
953953
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */,
954+
1F5AF589D9354B23BF7E7177 /* RCTOneSignal.xcodeproj */,
954955
DBE3B3C3883845C787D391C2 /* RCTRestart.xcodeproj */,
955956
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
956957
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
@@ -961,13 +962,12 @@
961962
CE0A6E16923B40C9930B546C /* ReactNativeCustomTabs.xcodeproj */,
962963
23880A5682F24328A190720F /* RNCalendarEvents.xcodeproj */,
963964
67A1EEA72072C1340059399D /* RNDeviceInfo.xcodeproj */,
965+
E847E37AA434496AB97586B8 /* RNGestureHandler.xcodeproj */,
964966
2560C43708D64866AA01FCC8 /* RNKeychain.xcodeproj */,
965967
7CEE763ECB05435E8CD79870 /* RNNetworkInfo.xcodeproj */,
966968
4E4DA38580594A71BEE6DAB5 /* RNSearchBar.xcodeproj */,
967969
71D5CCADA66D45008D9A38F2 /* RNVectorIcons.xcodeproj */,
968970
89FC2AFC0A394CFFAE89242D /* SafariViewManager.xcodeproj */,
969-
1F5AF589D9354B23BF7E7177 /* RCTOneSignal.xcodeproj */,
970-
E847E37AA434496AB97586B8 /* RNGestureHandler.xcodeproj */,
971971
);
972972
name = Libraries;
973973
sourceTree = "<group>";
@@ -1092,7 +1092,7 @@
10921092
isa = PBXProject;
10931093
attributes = {
10941094
LastSwiftUpdateCheck = 0810;
1095-
LastUpgradeCheck = 0910;
1095+
LastUpgradeCheck = 1010;
10961096
ORGANIZATIONNAME = Facebook;
10971097
TargetAttributes = {
10981098
00D33BDE1DDA58A8001E830E = {
@@ -1848,6 +1848,7 @@
18481848
HEADER_SEARCH_PATHS = (
18491849
"$(inherited)",
18501850
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1851+
"$(SRCROOT)/../node_modules/bugsnag-react-native/**",
18511852
);
18521853
INFOPLIST_FILE = AllAboutOlaf/Info.plist;
18531854
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1881,6 +1882,7 @@
18811882
HEADER_SEARCH_PATHS = (
18821883
"$(inherited)",
18831884
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1885+
"$(SRCROOT)/../node_modules/bugsnag-react-native/**",
18841886
);
18851887
INFOPLIST_FILE = AllAboutOlaf/Info.plist;
18861888
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1911,12 +1913,14 @@
19111913
CLANG_WARN_BOOL_CONVERSION = YES;
19121914
CLANG_WARN_COMMA = YES;
19131915
CLANG_WARN_CONSTANT_CONVERSION = YES;
1916+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
19141917
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
19151918
CLANG_WARN_EMPTY_BODY = YES;
19161919
CLANG_WARN_ENUM_CONVERSION = YES;
19171920
CLANG_WARN_INFINITE_RECURSION = YES;
19181921
CLANG_WARN_INT_CONVERSION = YES;
19191922
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1923+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
19201924
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
19211925
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
19221926
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1968,12 +1972,14 @@
19681972
CLANG_WARN_BOOL_CONVERSION = YES;
19691973
CLANG_WARN_COMMA = YES;
19701974
CLANG_WARN_CONSTANT_CONVERSION = YES;
1975+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
19711976
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
19721977
CLANG_WARN_EMPTY_BODY = YES;
19731978
CLANG_WARN_ENUM_CONVERSION = YES;
19741979
CLANG_WARN_INFINITE_RECURSION = YES;
19751980
CLANG_WARN_INT_CONVERSION = YES;
19761981
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1982+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
19771983
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
19781984
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
19791985
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

ios/AllAboutOlaf.xcodeproj/xcshareddata/xcschemes/AllAboutOlaf.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -54,7 +54,6 @@
5454
buildConfiguration = "Debug"
5555
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5656
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
57-
language = ""
5857
shouldUseLaunchSchemeArgsEnv = "YES">
5958
<Testables>
6059
<TestableReference
@@ -94,7 +93,6 @@
9493
buildConfiguration = "Debug"
9594
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
9695
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
97-
language = ""
9896
launchStyle = "0"
9997
useCustomWorkingDirectory = "NO"
10098
ignoresPersistentStateOnLaunch = "NO"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
"configurations": {
4949
"ios.sim.debug": {
5050
"binaryPath": "ios/build/Build/Products/Debug-iphonesimulator/AllAboutOlaf.app",
51-
"build": "xcodebuild -project ios/AllAboutOlaf.xcodeproj -scheme AllAboutOlaf -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build",
51+
"build": "xcodebuild -project ios/AllAboutOlaf.xcodeproj -scheme AllAboutOlaf -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.1' -derivedDataPath ios/build build",
5252
"type": "ios.simulator",
5353
"name": "iPhone 7"
5454
},
5555
"ios.sim.release": {
5656
"binaryPath": "ios/build/Build/Products/Release-iphonesimulator/AllAboutOlaf.app",
57-
"build": "xcodebuild -project ios/AllAboutOlaf.xcodeproj -scheme AllAboutOlaf -configuration Release -sdk iphonesimulator -derivedDataPath ios/build",
57+
"build": "xcodebuild -project ios/AllAboutOlaf.xcodeproj -scheme AllAboutOlaf -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7,OS=12.1' -derivedDataPath ios/build build",
5858
"type": "ios.simulator",
5959
"name": "iPhone 7"
6060
}

0 commit comments

Comments
 (0)