Skip to content

Commit 7980fa3

Browse files
author
Clément DEUST
committed
Fixing shared schemes
1 parent 1b247a7 commit 7980fa3

22 files changed

+491
-16
lines changed

‎Bolts.xcodeproj/project.pbxproj

+107-2
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@
969969
8E9C3CE117DE9DE000427E62 /* Project object */ = {
970970
isa = PBXProject;
971971
attributes = {
972-
LastUpgradeCheck = 0820;
972+
LastUpgradeCheck = 1020;
973973
ORGANIZATIONNAME = "Parse Inc.";
974974
TargetAttributes = {
975975
8E8C8F1817F241DA00E3F1C7 = {
@@ -979,10 +979,11 @@
979979
};
980980
buildConfigurationList = 8E9C3CE417DE9DE000427E62 /* Build configuration list for PBXProject "Bolts" */;
981981
compatibilityVersion = "Xcode 3.2";
982-
developmentRegion = English;
982+
developmentRegion = en;
983983
hasScannedForEncodings = 0;
984984
knownRegions = (
985985
en,
986+
Base,
986987
);
987988
mainGroup = 8E9C3CE017DE9DE000427E62;
988989
productRefGroup = 8E9C3CEA17DE9DE000427E62 /* Products */;
@@ -1251,13 +1252,17 @@
12511252
isa = XCBuildConfiguration;
12521253
baseConfigurationReference = 81D646E31D2CA0E000690609 /* Bolts-iOS-Dynamic.xcconfig */;
12531254
buildSettings = {
1255+
CLANG_ENABLE_OBJC_WEAK = YES;
1256+
SDKROOT = iphoneos;
12541257
};
12551258
name = Debug;
12561259
};
12571260
1D5D7DD21BE3CE8200FD67C7 /* Release */ = {
12581261
isa = XCBuildConfiguration;
12591262
baseConfigurationReference = 81D646E31D2CA0E000690609 /* Bolts-iOS-Dynamic.xcconfig */;
12601263
buildSettings = {
1264+
CLANG_ENABLE_OBJC_WEAK = YES;
1265+
SDKROOT = iphoneos;
12611266
};
12621267
name = Release;
12631268
};
@@ -1267,6 +1272,7 @@
12671272
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
12681273
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
12691274
CLANG_ENABLE_MODULES = YES;
1275+
CLANG_ENABLE_OBJC_WEAK = YES;
12701276
CLANG_WARN_BOOL_CONVERSION = YES;
12711277
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
12721278
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -1295,6 +1301,7 @@
12951301
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
12961302
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
12971303
CLANG_ENABLE_MODULES = YES;
1304+
CLANG_ENABLE_OBJC_WEAK = YES;
12981305
CLANG_WARN_BOOL_CONVERSION = YES;
12991306
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13001307
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -1318,139 +1325,237 @@
13181325
isa = XCBuildConfiguration;
13191326
baseConfigurationReference = 81D646E91D2CA0E000690609 /* Bolts-watchOS.xcconfig */;
13201327
buildSettings = {
1328+
CLANG_ENABLE_OBJC_WEAK = YES;
1329+
SDKROOT = watchos;
13211330
};
13221331
name = Debug;
13231332
};
13241333
8178F99B1BB0F87700AD289D /* Release */ = {
13251334
isa = XCBuildConfiguration;
13261335
baseConfigurationReference = 81D646E91D2CA0E000690609 /* Bolts-watchOS.xcconfig */;
13271336
buildSettings = {
1337+
CLANG_ENABLE_OBJC_WEAK = YES;
1338+
SDKROOT = watchos;
13281339
};
13291340
name = Release;
13301341
};
13311342
819573EF1C2B8ECB00BFCA39 /* Debug */ = {
13321343
isa = XCBuildConfiguration;
13331344
baseConfigurationReference = 81D646E81D2CA0E000690609 /* Bolts-watchOS-Dynamic.xcconfig */;
13341345
buildSettings = {
1346+
CLANG_ENABLE_OBJC_WEAK = YES;
1347+
SDKROOT = watchos;
13351348
};
13361349
name = Debug;
13371350
};
13381351
819573F01C2B8ECB00BFCA39 /* Release */ = {
13391352
isa = XCBuildConfiguration;
13401353
baseConfigurationReference = 81D646E81D2CA0E000690609 /* Bolts-watchOS-Dynamic.xcconfig */;
13411354
buildSettings = {
1355+
CLANG_ENABLE_OBJC_WEAK = YES;
1356+
SDKROOT = watchos;
13421357
};
13431358
name = Release;
13441359
};
13451360
81E94D681C2B8BF200A6291E /* Debug */ = {
13461361
isa = XCBuildConfiguration;
13471362
baseConfigurationReference = 81D646E61D2CA0E000690609 /* Bolts-tvOS-Dynamic.xcconfig */;
13481363
buildSettings = {
1364+
CLANG_ENABLE_OBJC_WEAK = YES;
1365+
SDKROOT = appletvos;
13491366
};
13501367
name = Debug;
13511368
};
13521369
81E94D691C2B8BF200A6291E /* Release */ = {
13531370
isa = XCBuildConfiguration;
13541371
baseConfigurationReference = 81D646E61D2CA0E000690609 /* Bolts-tvOS-Dynamic.xcconfig */;
13551372
buildSettings = {
1373+
CLANG_ENABLE_OBJC_WEAK = YES;
1374+
SDKROOT = appletvos;
13561375
};
13571376
name = Release;
13581377
};
13591378
81ED94271BE147CF00795F05 /* Debug */ = {
13601379
isa = XCBuildConfiguration;
13611380
baseConfigurationReference = 81D646E41D2CA0E000690609 /* Bolts-iOS.xcconfig */;
13621381
buildSettings = {
1382+
CLANG_ENABLE_OBJC_WEAK = YES;
1383+
SDKROOT = iphoneos;
1384+
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
13631385
};
13641386
name = Debug;
13651387
};
13661388
81ED94281BE147CF00795F05 /* Release */ = {
13671389
isa = XCBuildConfiguration;
13681390
baseConfigurationReference = 81D646E41D2CA0E000690609 /* Bolts-iOS.xcconfig */;
13691391
buildSettings = {
1392+
CLANG_ENABLE_OBJC_WEAK = YES;
1393+
SDKROOT = iphoneos;
1394+
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
13701395
};
13711396
name = Release;
13721397
};
13731398
8E8C8EF917F23D1D00E3F1C7 /* Debug */ = {
13741399
isa = XCBuildConfiguration;
13751400
baseConfigurationReference = 81D646EA1D2CA0E000690609 /* BoltsTests-iOS.xcconfig */;
13761401
buildSettings = {
1402+
CLANG_ENABLE_OBJC_WEAK = YES;
1403+
SDKROOT = iphoneos;
13771404
};
13781405
name = Debug;
13791406
};
13801407
8E8C8EFA17F23D1D00E3F1C7 /* Release */ = {
13811408
isa = XCBuildConfiguration;
13821409
baseConfigurationReference = 81D646EA1D2CA0E000690609 /* BoltsTests-iOS.xcconfig */;
13831410
buildSettings = {
1411+
CLANG_ENABLE_OBJC_WEAK = YES;
1412+
SDKROOT = iphoneos;
13841413
};
13851414
name = Release;
13861415
};
13871416
8E8C8F2717F241DA00E3F1C7 /* Debug */ = {
13881417
isa = XCBuildConfiguration;
13891418
baseConfigurationReference = 81D646EB1D2CA0E000690609 /* BoltsTests-OSX.xcconfig */;
13901419
buildSettings = {
1420+
CLANG_ENABLE_OBJC_WEAK = YES;
1421+
SDKROOT = macosx;
13911422
};
13921423
name = Debug;
13931424
};
13941425
8E8C8F2817F241DA00E3F1C7 /* Release */ = {
13951426
isa = XCBuildConfiguration;
13961427
baseConfigurationReference = 81D646EB1D2CA0E000690609 /* BoltsTests-OSX.xcconfig */;
13971428
buildSettings = {
1429+
CLANG_ENABLE_OBJC_WEAK = YES;
1430+
SDKROOT = macosx;
13981431
};
13991432
name = Release;
14001433
};
14011434
8E9C3D0C17DE9DE000427E62 /* Debug */ = {
14021435
isa = XCBuildConfiguration;
14031436
baseConfigurationReference = 81D646FA1D2CA0E000690609 /* Debug.xcconfig */;
14041437
buildSettings = {
1438+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
1439+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
1440+
CLANG_WARN_BOOL_CONVERSION = YES;
1441+
CLANG_WARN_COMMA = YES;
1442+
CLANG_WARN_CONSTANT_CONVERSION = YES;
1443+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
1444+
CLANG_WARN_EMPTY_BODY = YES;
1445+
CLANG_WARN_ENUM_CONVERSION = YES;
1446+
CLANG_WARN_INFINITE_RECURSION = YES;
1447+
CLANG_WARN_INT_CONVERSION = YES;
1448+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1449+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1450+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1451+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1452+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1453+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1454+
CLANG_WARN_UNREACHABLE_CODE = YES;
1455+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1456+
ENABLE_STRICT_OBJC_MSGSEND = YES;
1457+
ENABLE_TESTABILITY = YES;
1458+
GCC_NO_COMMON_BLOCKS = YES;
1459+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1460+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
1461+
GCC_WARN_UNDECLARED_SELECTOR = YES;
1462+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
1463+
GCC_WARN_UNUSED_FUNCTION = YES;
1464+
GCC_WARN_UNUSED_VARIABLE = YES;
1465+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1466+
MACOSX_DEPLOYMENT_TARGET = 10.8;
1467+
ONLY_ACTIVE_ARCH = YES;
1468+
SDKROOT = iphoneos;
14051469
};
14061470
name = Debug;
14071471
};
14081472
8E9C3D0D17DE9DE000427E62 /* Release */ = {
14091473
isa = XCBuildConfiguration;
14101474
baseConfigurationReference = 81D646FB1D2CA0E000690609 /* Release.xcconfig */;
14111475
buildSettings = {
1476+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
1477+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
1478+
CLANG_WARN_BOOL_CONVERSION = YES;
1479+
CLANG_WARN_COMMA = YES;
1480+
CLANG_WARN_CONSTANT_CONVERSION = YES;
1481+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
1482+
CLANG_WARN_EMPTY_BODY = YES;
1483+
CLANG_WARN_ENUM_CONVERSION = YES;
1484+
CLANG_WARN_INFINITE_RECURSION = YES;
1485+
CLANG_WARN_INT_CONVERSION = YES;
1486+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1487+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1488+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1489+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1490+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1491+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1492+
CLANG_WARN_UNREACHABLE_CODE = YES;
1493+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1494+
ENABLE_STRICT_OBJC_MSGSEND = YES;
1495+
GCC_NO_COMMON_BLOCKS = YES;
1496+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1497+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
1498+
GCC_WARN_UNDECLARED_SELECTOR = YES;
1499+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
1500+
GCC_WARN_UNUSED_FUNCTION = YES;
1501+
GCC_WARN_UNUSED_VARIABLE = YES;
1502+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1503+
MACOSX_DEPLOYMENT_TARGET = 10.8;
1504+
SDKROOT = iphoneos;
14121505
};
14131506
name = Release;
14141507
};
14151508
8EDDA63317E17DDC00655F8A /* Debug */ = {
14161509
isa = XCBuildConfiguration;
14171510
baseConfigurationReference = 81D646E51D2CA0E000690609 /* Bolts-macOS.xcconfig */;
14181511
buildSettings = {
1512+
CLANG_ENABLE_OBJC_WEAK = YES;
1513+
SDKROOT = macosx;
14191514
};
14201515
name = Debug;
14211516
};
14221517
8EDDA63417E17DDC00655F8A /* Release */ = {
14231518
isa = XCBuildConfiguration;
14241519
baseConfigurationReference = 81D646E51D2CA0E000690609 /* Bolts-macOS.xcconfig */;
14251520
buildSettings = {
1521+
CLANG_ENABLE_OBJC_WEAK = YES;
1522+
SDKROOT = macosx;
14261523
};
14271524
name = Release;
14281525
};
14291526
F5AFCA001BA752750076E927 /* Debug */ = {
14301527
isa = XCBuildConfiguration;
14311528
baseConfigurationReference = 81D646E71D2CA0E000690609 /* Bolts-tvOS.xcconfig */;
14321529
buildSettings = {
1530+
CLANG_ENABLE_OBJC_WEAK = YES;
1531+
SDKROOT = appletvos;
14331532
};
14341533
name = Debug;
14351534
};
14361535
F5AFCA011BA752750076E927 /* Release */ = {
14371536
isa = XCBuildConfiguration;
14381537
baseConfigurationReference = 81D646E71D2CA0E000690609 /* Bolts-tvOS.xcconfig */;
14391538
buildSettings = {
1539+
CLANG_ENABLE_OBJC_WEAK = YES;
1540+
SDKROOT = appletvos;
14401541
};
14411542
name = Release;
14421543
};
14431544
F5AFCA111BA752770076E927 /* Debug */ = {
14441545
isa = XCBuildConfiguration;
14451546
baseConfigurationReference = 81D646EC1D2CA0E000690609 /* BoltsTests-tvOS.xcconfig */;
14461547
buildSettings = {
1548+
CLANG_ENABLE_OBJC_WEAK = YES;
1549+
SDKROOT = appletvos;
14471550
};
14481551
name = Debug;
14491552
};
14501553
F5AFCA121BA752770076E927 /* Release */ = {
14511554
isa = XCBuildConfiguration;
14521555
baseConfigurationReference = 81D646EC1D2CA0E000690609 /* BoltsTests-tvOS.xcconfig */;
14531556
buildSettings = {
1557+
CLANG_ENABLE_OBJC_WEAK = YES;
1558+
SDKROOT = appletvos;
14541559
};
14551560
name = Release;
14561561
};

‎Bolts.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS-Dynamic.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS.xcscheme

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,8 +40,8 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES"
44-
codeCoverageEnabled = "YES">
43+
codeCoverageEnabled = "YES"
44+
shouldUseLaunchSchemeArgsEnv = "YES">
4545
<Testables>
4646
<TestableReference
4747
skipped = "NO">

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-macOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS-Dynamic.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,8 +40,8 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES"
44-
codeCoverageEnabled = "YES">
43+
codeCoverageEnabled = "YES"
44+
shouldUseLaunchSchemeArgsEnv = "YES">
4545
<Testables>
4646
<TestableReference
4747
skipped = "NO">

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-watchOS-Dynamic.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-watchOS.xcscheme

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
</Testables>
3333
<MacroExpansion>

‎Configurations/Shared

-1
This file was deleted.

0 commit comments

Comments
 (0)