Skip to content

Commit 31c8143

Browse files
nlutsenkonlutsenko
committed
Merge pull request #417 from ParsePlatform/nlutsenko.bolts
Unify Bolts targets names, add Bolts-watchOS target.
2 parents c79543c + 4a15bbc commit 31c8143

File tree

8 files changed

+85
-89
lines changed

8 files changed

+85
-89
lines changed

‎Configurations/BoltsSDK-OSX.xcconfig renamed to ‎Configurations/Bolts-OSX.xcconfig

File renamed without changes.

‎Configurations/BoltsSDK-iOS.xcconfig renamed to ‎Configurations/Bolts-iOS.xcconfig

File renamed without changes.

‎Configurations/Bolts-watchOS.xcconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// Copyright (c) 2015-present, Parse, LLC.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
SDKROOT = watchos

‎Parse.xcodeproj/project.pbxproj

Lines changed: 75 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,13 +1234,6 @@
12341234
/* End PBXBuildFile section */
12351235

12361236
/* Begin PBXContainerItemProxy section */
1237-
810155071BB3832700D7C7BD /* PBXContainerItemProxy */ = {
1238-
isa = PBXContainerItemProxy;
1239-
containerPortal = 09D33641139C54930098E916 /* Project object */;
1240-
proxyType = 1;
1241-
remoteGlobalIDString = F569F07A1B14DB1E00296F73;
1242-
remoteInfo = "BoltsSDK-iOS";
1243-
};
12441237
811167461B8402DA003CB026 /* PBXContainerItemProxy */ = {
12451238
isa = PBXContainerItemProxy;
12461239
containerPortal = 09D33641139C54930098E916 /* Project object */;
@@ -1255,6 +1248,13 @@
12551248
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
12561249
remoteInfo = "Parse-iOS";
12571250
};
1251+
812F31FE1BCF414D00FCBCD4 /* PBXContainerItemProxy */ = {
1252+
isa = PBXContainerItemProxy;
1253+
containerPortal = 09D33641139C54930098E916 /* Project object */;
1254+
proxyType = 1;
1255+
remoteGlobalIDString = 812F31F71BCF40AA00FCBCD4;
1256+
remoteInfo = "Bolts-watchOS";
1257+
};
12581258
81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */ = {
12591259
isa = PBXContainerItemProxy;
12601260
containerPortal = 09D33641139C54930098E916 /* Project object */;
@@ -1454,6 +1454,9 @@
14541454
812B62FF1B5F30D3009CEAA9 /* PFObjectFileCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFObjectFileCoder.m; sourceTree = "<group>"; };
14551455
812B7AB61AF2FA4800D15FF5 /* PFQueryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFQueryController.h; sourceTree = "<group>"; };
14561456
812B7AB71AF2FA4800D15FF5 /* PFQueryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFQueryController.m; sourceTree = "<group>"; };
1457+
812F31FB1BCF40DC00FCBCD4 /* Bolts-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-iOS.xcconfig"; sourceTree = "<group>"; };
1458+
812F31FC1BCF40DC00FCBCD4 /* Bolts-OSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-OSX.xcconfig"; sourceTree = "<group>"; };
1459+
812F31FD1BCF40DC00FCBCD4 /* Bolts-watchOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-watchOS.xcconfig"; sourceTree = "<group>"; };
14571460
812FC61E1B0FF9FA0043C07F /* PFPurchaseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPurchaseController.h; sourceTree = "<group>"; };
14581461
812FC61F1B0FF9FA0043C07F /* PFPurchaseController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPurchaseController.m; sourceTree = "<group>"; };
14591462
81308B6B1B5781F500FFFF44 /* PFTestSwizzledMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTestSwizzledMethod.h; sourceTree = "<group>"; };
@@ -1827,8 +1830,6 @@
18271830
F51D06361B793A110044539E /* PFSQLiteDatabase_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFSQLiteDatabase_Private.h; sourceTree = "<group>"; };
18281831
F5556A141B66F36000410837 /* URLSessionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLSessionTests.m; sourceTree = "<group>"; };
18291832
F5556A171B66F47900410837 /* PFURLSession_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFURLSession_Private.h; sourceTree = "<group>"; };
1830-
F55ABB511B4F39DA00A0ECD5 /* BoltsSDK-iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "BoltsSDK-iOS.xcconfig"; sourceTree = "<group>"; };
1831-
F55ABB521B4F39DA00A0ECD5 /* BoltsSDK-OSX.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "BoltsSDK-OSX.xcconfig"; sourceTree = "<group>"; };
18321833
F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Parse-iOS.xcconfig"; sourceTree = "<group>"; };
18331834
F55ABB541B4F39DA00A0ECD5 /* Parse-OSX.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Parse-OSX.xcconfig"; sourceTree = "<group>"; };
18341835
F55ABB591B4F39DA00A0ECD5 /* ParseUnitTests-iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ParseUnitTests-iOS.xcconfig"; sourceTree = "<group>"; };
@@ -3333,8 +3334,9 @@
33333334
810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */,
33343335
F55ABB591B4F39DA00A0ECD5 /* ParseUnitTests-iOS.xcconfig */,
33353336
F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-OSX.xcconfig */,
3336-
F55ABB511B4F39DA00A0ECD5 /* BoltsSDK-iOS.xcconfig */,
3337-
F55ABB521B4F39DA00A0ECD5 /* BoltsSDK-OSX.xcconfig */,
3337+
812F31FB1BCF40DC00FCBCD4 /* Bolts-iOS.xcconfig */,
3338+
812F31FC1BCF40DC00FCBCD4 /* Bolts-OSX.xcconfig */,
3339+
812F31FD1BCF40DC00FCBCD4 /* Bolts-watchOS.xcconfig */,
33383340
F55ABB5B1B4F39DA00A0ECD5 /* Shared */,
33393341
);
33403342
path = Configurations;
@@ -4025,31 +4027,45 @@
40254027
/* End PBXHeadersBuildPhase section */
40264028

40274029
/* Begin PBXLegacyTarget section */
4028-
81493A931A0D3492008D5504 /* BoltsSDK-OSX */ = {
4030+
812F31F71BCF40AA00FCBCD4 /* Bolts-watchOS */ = {
4031+
isa = PBXLegacyTarget;
4032+
buildArgumentsString = "$(SRCROOT)/Vendor/Bolts-ObjC/ \\\n\"Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos\"";
4033+
buildConfigurationList = 812F31F81BCF40AA00FCBCD4 /* Build configuration list for PBXLegacyTarget "Bolts-watchOS" */;
4034+
buildPhases = (
4035+
);
4036+
buildToolPath = "$(SRCROOT)/Scripts/build_third_party.rb";
4037+
buildWorkingDirectory = "$(SRCROOT)";
4038+
dependencies = (
4039+
);
4040+
name = "Bolts-watchOS";
4041+
passBuildSettingsInEnvironment = 0;
4042+
productName = BoltsSDK;
4043+
};
4044+
81493A931A0D3492008D5504 /* Bolts-OSX */ = {
40294045
isa = PBXLegacyTarget;
40304046
buildArgumentsString = "$(SRCROOT)/Vendor/Bolts-ObjC/ \\\n\"Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos\"";
4031-
buildConfigurationList = 81493A941A0D3493008D5504 /* Build configuration list for PBXLegacyTarget "BoltsSDK-OSX" */;
4047+
buildConfigurationList = 81493A941A0D3493008D5504 /* Build configuration list for PBXLegacyTarget "Bolts-OSX" */;
40324048
buildPhases = (
40334049
);
40344050
buildToolPath = "$(SRCROOT)/Scripts/build_third_party.rb";
40354051
buildWorkingDirectory = "$(SRCROOT)";
40364052
dependencies = (
40374053
);
4038-
name = "BoltsSDK-OSX";
4054+
name = "Bolts-OSX";
40394055
passBuildSettingsInEnvironment = 0;
40404056
productName = BoltsSDK;
40414057
};
4042-
F569F07A1B14DB1E00296F73 /* BoltsSDK-iOS */ = {
4058+
F569F07A1B14DB1E00296F73 /* Bolts-iOS */ = {
40434059
isa = PBXLegacyTarget;
40444060
buildArgumentsString = "$(SRCROOT)/Vendor/Bolts-ObjC/ \\\n\"Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos\"";
4045-
buildConfigurationList = F569F07B1B14DB1E00296F73 /* Build configuration list for PBXLegacyTarget "BoltsSDK-iOS" */;
4061+
buildConfigurationList = F569F07B1B14DB1E00296F73 /* Build configuration list for PBXLegacyTarget "Bolts-iOS" */;
40464062
buildPhases = (
40474063
);
40484064
buildToolPath = "$(SRCROOT)/Scripts/build_third_party.rb";
40494065
buildWorkingDirectory = "$(SRCROOT)";
40504066
dependencies = (
40514067
);
4052-
name = "BoltsSDK-iOS";
4068+
name = "Bolts-iOS";
40534069
passBuildSettingsInEnvironment = 0;
40544070
productName = BoltsSDK;
40554071
};
@@ -4069,7 +4085,7 @@
40694085
buildRules = (
40704086
);
40714087
dependencies = (
4072-
810155061BB3832700D7C7BD /* PBXTargetDependency */,
4088+
812F31FF1BCF414D00FCBCD4 /* PBXTargetDependency */,
40734089
);
40744090
name = "Parse-watchOS";
40754091
productName = "Parse-iOS";
@@ -4197,8 +4213,9 @@
41974213
97010FAB1630B18F00AB761E /* Parse-OSX */,
41984214
81C09F501AF97A490043B49C /* ParseUnitTests-OSX */,
41994215
810155051BB3832700D7C7BD /* Parse-watchOS */,
4200-
F569F07A1B14DB1E00296F73 /* BoltsSDK-iOS */,
4201-
81493A931A0D3492008D5504 /* BoltsSDK-OSX */,
4216+
F569F07A1B14DB1E00296F73 /* Bolts-iOS */,
4217+
81493A931A0D3492008D5504 /* Bolts-OSX */,
4218+
812F31F71BCF40AA00FCBCD4 /* Bolts-watchOS */,
42024219
);
42034220
};
42044221
/* End PBXProject section */
@@ -5007,11 +5024,6 @@
50075024
/* End PBXSourcesBuildPhase section */
50085025

50095026
/* Begin PBXTargetDependency section */
5010-
810155061BB3832700D7C7BD /* PBXTargetDependency */ = {
5011-
isa = PBXTargetDependency;
5012-
target = F569F07A1B14DB1E00296F73 /* BoltsSDK-iOS */;
5013-
targetProxy = 810155071BB3832700D7C7BD /* PBXContainerItemProxy */;
5014-
};
50155027
811167471B8402DA003CB026 /* PBXTargetDependency */ = {
50165028
isa = PBXTargetDependency;
50175029
target = 97010FAB1630B18F00AB761E /* Parse-OSX */;
@@ -5022,9 +5034,14 @@
50225034
target = 81C3821B19CCA89E0066284A /* Parse-iOS */;
50235035
targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */;
50245036
};
5037+
812F31FF1BCF414D00FCBCD4 /* PBXTargetDependency */ = {
5038+
isa = PBXTargetDependency;
5039+
target = 812F31F71BCF40AA00FCBCD4 /* Bolts-watchOS */;
5040+
targetProxy = 812F31FE1BCF414D00FCBCD4 /* PBXContainerItemProxy */;
5041+
};
50255042
81493A9A1A0D3CE3008D5504 /* PBXTargetDependency */ = {
50265043
isa = PBXTargetDependency;
5027-
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
5044+
target = 81493A931A0D3492008D5504 /* Bolts-OSX */;
50285045
targetProxy = 81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */;
50295046
};
50305047
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */ = {
@@ -5034,7 +5051,7 @@
50345051
};
50355052
F569F07F1B14DB3C00296F73 /* PBXTargetDependency */ = {
50365053
isa = PBXTargetDependency;
5037-
target = F569F07A1B14DB1E00296F73 /* BoltsSDK-iOS */;
5054+
target = F569F07A1B14DB1E00296F73 /* Bolts-iOS */;
50385055
targetProxy = F569F07E1B14DB3C00296F73 /* PBXContainerItemProxy */;
50395056
};
50405057
/* End PBXTargetDependency section */
@@ -5079,16 +5096,32 @@
50795096
};
50805097
name = Release;
50815098
};
5099+
812F31F91BCF40AA00FCBCD4 /* Debug */ = {
5100+
isa = XCBuildConfiguration;
5101+
baseConfigurationReference = 812F31FD1BCF40DC00FCBCD4 /* Bolts-watchOS.xcconfig */;
5102+
buildSettings = {
5103+
PRODUCT_NAME = "$(TARGET_NAME)";
5104+
};
5105+
name = Debug;
5106+
};
5107+
812F31FA1BCF40AA00FCBCD4 /* Release */ = {
5108+
isa = XCBuildConfiguration;
5109+
baseConfigurationReference = 812F31FD1BCF40DC00FCBCD4 /* Bolts-watchOS.xcconfig */;
5110+
buildSettings = {
5111+
PRODUCT_NAME = "$(TARGET_NAME)";
5112+
};
5113+
name = Release;
5114+
};
50825115
81493A951A0D3493008D5504 /* Debug */ = {
50835116
isa = XCBuildConfiguration;
5084-
baseConfigurationReference = F55ABB521B4F39DA00A0ECD5 /* BoltsSDK-OSX.xcconfig */;
5117+
baseConfigurationReference = 812F31FC1BCF40DC00FCBCD4 /* Bolts-OSX.xcconfig */;
50855118
buildSettings = {
50865119
};
50875120
name = Debug;
50885121
};
50895122
81493A961A0D3493008D5504 /* Release */ = {
50905123
isa = XCBuildConfiguration;
5091-
baseConfigurationReference = F55ABB521B4F39DA00A0ECD5 /* BoltsSDK-OSX.xcconfig */;
5124+
baseConfigurationReference = 812F31FC1BCF40DC00FCBCD4 /* Bolts-OSX.xcconfig */;
50925125
buildSettings = {
50935126
};
50945127
name = Release;
@@ -5151,14 +5184,14 @@
51515184
};
51525185
F569F07C1B14DB1E00296F73 /* Debug */ = {
51535186
isa = XCBuildConfiguration;
5154-
baseConfigurationReference = F55ABB511B4F39DA00A0ECD5 /* BoltsSDK-iOS.xcconfig */;
5187+
baseConfigurationReference = 812F31FB1BCF40DC00FCBCD4 /* Bolts-iOS.xcconfig */;
51555188
buildSettings = {
51565189
};
51575190
name = Debug;
51585191
};
51595192
F569F07D1B14DB1E00296F73 /* Release */ = {
51605193
isa = XCBuildConfiguration;
5161-
baseConfigurationReference = F55ABB511B4F39DA00A0ECD5 /* BoltsSDK-iOS.xcconfig */;
5194+
baseConfigurationReference = 812F31FB1BCF40DC00FCBCD4 /* Bolts-iOS.xcconfig */;
51625195
buildSettings = {
51635196
};
51645197
name = Release;
@@ -5184,7 +5217,16 @@
51845217
defaultConfigurationIsVisible = 0;
51855218
defaultConfigurationName = Release;
51865219
};
5187-
81493A941A0D3493008D5504 /* Build configuration list for PBXLegacyTarget "BoltsSDK-OSX" */ = {
5220+
812F31F81BCF40AA00FCBCD4 /* Build configuration list for PBXLegacyTarget "Bolts-watchOS" */ = {
5221+
isa = XCConfigurationList;
5222+
buildConfigurations = (
5223+
812F31F91BCF40AA00FCBCD4 /* Debug */,
5224+
812F31FA1BCF40AA00FCBCD4 /* Release */,
5225+
);
5226+
defaultConfigurationIsVisible = 0;
5227+
defaultConfigurationName = Release;
5228+
};
5229+
81493A941A0D3493008D5504 /* Build configuration list for PBXLegacyTarget "Bolts-OSX" */ = {
51885230
isa = XCConfigurationList;
51895231
buildConfigurations = (
51905232
81493A951A0D3493008D5504 /* Debug */,
@@ -5229,7 +5271,7 @@
52295271
defaultConfigurationIsVisible = 0;
52305272
defaultConfigurationName = Release;
52315273
};
5232-
F569F07B1B14DB1E00296F73 /* Build configuration list for PBXLegacyTarget "BoltsSDK-iOS" */ = {
5274+
F569F07B1B14DB1E00296F73 /* Build configuration list for PBXLegacyTarget "Bolts-iOS" */ = {
52335275
isa = XCConfigurationList;
52345276
buildConfigurations = (
52355277
F569F07C1B14DB1E00296F73 /* Debug */,

‎ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject-Swift.xcscheme

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:../../../Parse.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
27-
buildForArchiving = "YES"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "81493A931A0D3492008D5504"
32-
BuildableName = "BoltsSDK-OSX"
33-
BlueprintName = "BoltsSDK-OSX"
34-
ReferencedContainer = "container:../../../Parse.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
<BuildActionEntry
3824
buildForTesting = "YES"
3925
buildForRunning = "YES"

‎ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject.xcscheme

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:../../../Parse.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
27-
buildForArchiving = "YES"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "81493A931A0D3492008D5504"
32-
BuildableName = "BoltsSDK-OSX"
33-
BlueprintName = "BoltsSDK-OSX"
34-
ReferencedContainer = "container:../../../Parse.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
<BuildActionEntry
3824
buildForTesting = "YES"
3925
buildForRunning = "YES"

‎ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseStarterProject-Swift.xcscheme

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:../../../Parse.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
27-
buildForArchiving = "YES"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "F569F07A1B14DB1E00296F73"
32-
BuildableName = "BoltsSDK-iOS"
33-
BlueprintName = "BoltsSDK-iOS"
34-
ReferencedContainer = "container:../../../Parse.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
<BuildActionEntry
3824
buildForTesting = "YES"
3925
buildForRunning = "YES"

‎ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/xcshareddata/xcschemes/ParseStarterProject.xcscheme

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:../../../Parse.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
27-
buildForArchiving = "YES"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "F569F07A1B14DB1E00296F73"
32-
BuildableName = "BoltsSDK-iOS"
33-
BlueprintName = "BoltsSDK-iOS"
34-
ReferencedContainer = "container:../../../Parse.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
<BuildActionEntry
3824
buildForTesting = "YES"
3925
buildForRunning = "YES"

0 commit comments

Comments
 (0)