Skip to content

Commit 1b62276

Browse files
nlutsenkonlutsenko
committed
Rename ParseOSX.framework to Parse.framework
1 parent 718fb97 commit 1b62276

File tree

61 files changed

+121
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+121
-303
lines changed

‎Configurations/Parse-OSX.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "Shared/Platform/OSX.xcconfig"
1111
#include "Shared/Product/Framework.xcconfig"
1212

13-
PRODUCT_NAME = ParseOSX
13+
PRODUCT_NAME = Parse
1414

1515
MACH_O_TYPE = mh_dylib
1616
DEFINES_MODULE = YES

‎Parse-OSX.podspec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ Pod::Spec.new do |s|
1313
s.osx.deployment_target = '10.9'
1414
s.requires_arc = true
1515

16-
s.header_dir = 'ParseOSX'
17-
s.module_name = 'ParseOSX'
16+
s.header_dir = 'Parse'
17+
s.module_name = 'Parse'
1818

1919
s.source_files = 'Parse/*.{h,m}',
20-
'Parse/OSX.{h,m}',
2120
'Parse/Internal/**/*.{h,m}'
22-
s.public_header_files = 'Parse/*.h', 'Parse/OSX/*.h'
21+
s.public_header_files = 'Parse/*.h'
2322
s.resources = 'Parse/Resources/en.lproj'
2423
s.exclude_files = 'Parse/PFNetworkActivityIndicatorManager.{h,m}',
2524
'Parse/PFProduct.{h,m}',

‎Parse.xcodeproj/project.pbxproj

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@
599599
81BF4ABD1B0BF64B00A3D75B /* PFCurrentConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BF4ABA1B0BF64B00A3D75B /* PFCurrentConfigController.h */; };
600600
81BF4ABE1B0BF64B00A3D75B /* PFCurrentConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4ABB1B0BF64B00A3D75B /* PFCurrentConfigController.m */; };
601601
81BF4ABF1B0BF64B00A3D75B /* PFCurrentConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4ABB1B0BF64B00A3D75B /* PFCurrentConfigController.m */; };
602-
81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* ParseOSX.framework */; };
602+
81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; };
603603
81C09F8D1AF9816D0043B49C /* Bolts.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8103FA44198FC267000BAE3F /* Bolts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
604604
81C1EE491AE1EF960031C438 /* PFWeakValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C1EE471AE1EF960031C438 /* PFWeakValue.h */; };
605605
81C1EE4A1AE1EF960031C438 /* PFWeakValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C1EE481AE1EF960031C438 /* PFWeakValue.m */; };
@@ -754,7 +754,6 @@
754754
81EEE1B21B446D600087AC4D /* PFCurrentUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */; };
755755
81EEE1B31B446D600087AC4D /* PFCurrentUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */; };
756756
81F0E88E19E6F7D600812A88 /* Parse.h in Headers */ = {isa = PBXBuildFile; fileRef = 09EEA12D1434FB1F00E3A3FA /* Parse.h */; settings = {ATTRIBUTES = (Public, ); }; };
757-
81F0E88F19E6F7DB00812A88 /* ParseOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = 971AC55C1716405A00A4EB71 /* ParseOSX.h */; settings = {ATTRIBUTES = (Public, ); }; };
758757
81F0E89019E6F83E00812A88 /* PFACL.h in Headers */ = {isa = PBXBuildFile; fileRef = 64C47802147336C70092082F /* PFACL.h */; settings = {ATTRIBUTES = (Public, ); }; };
759758
81F0E89119E6F83E00812A88 /* PFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 9739513816B9D28E0010B884 /* PFAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
760759
81F0E89219E6F83E00812A88 /* PFAnonymousUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 638CBBB415191435004F54E4 /* PFAnonymousUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -919,6 +918,20 @@
919918
/* End PBXBuildFile section */
920919

921920
/* Begin PBXContainerItemProxy section */
921+
811167461B8402DA003CB026 /* PBXContainerItemProxy */ = {
922+
isa = PBXContainerItemProxy;
923+
containerPortal = 09D33641139C54930098E916 /* Project object */;
924+
proxyType = 1;
925+
remoteGlobalIDString = 97010FAB1630B18F00AB761E;
926+
remoteInfo = "Parse-OSX";
927+
};
928+
8111674B1B8402DF003CB026 /* PBXContainerItemProxy */ = {
929+
isa = PBXContainerItemProxy;
930+
containerPortal = 09D33641139C54930098E916 /* Project object */;
931+
proxyType = 1;
932+
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
933+
remoteInfo = "Parse-iOS";
934+
};
922935
81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */ = {
923936
isa = PBXContainerItemProxy;
924937
containerPortal = 09D33641139C54930098E916 /* Project object */;
@@ -1467,9 +1480,8 @@
14671480
91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = "<group>"; };
14681481
91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = "<group>"; };
14691482
91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = "<group>"; };
1470-
97010FAC1630B18F00AB761E /* ParseOSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseOSX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1483+
97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
14711484
970110191630B1FE00AB761E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
1472-
971AC55C1716405A00A4EB71 /* ParseOSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseOSX.h; sourceTree = "<group>"; };
14731485
9739513816B9D28E0010B884 /* PFAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFAnalytics.h; sourceTree = "<group>"; };
14741486
9739513916B9D28E0010B884 /* PFAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFAnalytics.m; sourceTree = "<group>"; };
14751487
97A3EA0C161FB6A9007A96B2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -1560,7 +1572,7 @@
15601572
files = (
15611573
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */,
15621574
F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */,
1563-
81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */,
1575+
81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */,
15641576
815868E21AF9818D009A5751 /* Bolts.framework in Frameworks */,
15651577
F5B0B3161B44A22300F3EBC4 /* SystemConfiguration.framework in Frameworks */,
15661578
);
@@ -1594,7 +1606,6 @@
15941606
children = (
15951607
09809FAE1434F98C00EC3E74 /* Internal */,
15961608
09809FB81434F98C00EC3E74 /* Resources */,
1597-
97DE04271631E686007154E8 /* OSX */,
15981609
09EEA12D1434FB1F00E3A3FA /* Parse.h */,
15991610
09EEA12E1434FB1F00E3A3FA /* Parse.m */,
16001611
64C47802147336C70092082F /* PFACL.h */,
@@ -1762,7 +1773,7 @@
17621773
09D3364B139C54940098E916 /* Products */ = {
17631774
isa = PBXGroup;
17641775
children = (
1765-
97010FAC1630B18F00AB761E /* ParseOSX.framework */,
1776+
97010FAC1630B18F00AB761E /* Parse.framework */,
17661777
81C3821C19CCA89E0066284A /* Parse.framework */,
17671778
816F449B1A8E8933009CDB32 /* ParseUnitTests-iOS.xctest */,
17681779
81C09F861AF97A490043B49C /* ParseUnitTests-OSX.xctest */,
@@ -2940,14 +2951,6 @@
29402951
path = CurrentUserController;
29412952
sourceTree = "<group>";
29422953
};
2943-
97DE04271631E686007154E8 /* OSX */ = {
2944-
isa = PBXGroup;
2945-
children = (
2946-
971AC55C1716405A00A4EB71 /* ParseOSX.h */,
2947-
);
2948-
path = OSX;
2949-
sourceTree = "<group>";
2950-
};
29512954
F50C66301B33A6CE001941A6 /* Utilites */ = {
29522955
isa = PBXGroup;
29532956
children = (
@@ -3380,7 +3383,6 @@
33803383
81D0EE9A19B0A2060000AE75 /* PFKeychainStore.h in Headers */,
33813384
81BF4AB71B0BF3E500A3D75B /* PFConfigController.h in Headers */,
33823385
F515355A1B57573700C49F56 /* PFDefaultACLController.h in Headers */,
3383-
81F0E88F19E6F7DB00812A88 /* ParseOSX.h in Headers */,
33843386
8119C9981A76E28F0085B516 /* PFNetworkCommand.h in Headers */,
33853387
8166FCDE1B503914003841A2 /* PFAnonymousAuthenticationProvider.h in Headers */,
33863388
81CD665B1B4DA5BA0042FC0B /* PFInstallationController.h in Headers */,
@@ -3537,6 +3539,7 @@
35373539
buildRules = (
35383540
);
35393541
dependencies = (
3542+
8111674C1B8402DF003CB026 /* PBXTargetDependency */,
35403543
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */,
35413544
);
35423545
name = "ParseUnitTests-iOS";
@@ -3556,6 +3559,7 @@
35563559
buildRules = (
35573560
);
35583561
dependencies = (
3562+
811167471B8402DA003CB026 /* PBXTargetDependency */,
35593563
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */,
35603564
);
35613565
name = "ParseUnitTests-OSX";
@@ -3600,7 +3604,7 @@
36003604
);
36013605
name = "Parse-OSX";
36023606
productName = ParseMac;
3603-
productReference = 97010FAC1630B18F00AB761E /* ParseOSX.framework */;
3607+
productReference = 97010FAC1630B18F00AB761E /* Parse.framework */;
36043608
productType = "com.apple.product-type.framework";
36053609
};
36063610
/* End PBXNativeTarget section */
@@ -4287,6 +4291,16 @@
42874291
/* End PBXSourcesBuildPhase section */
42884292

42894293
/* Begin PBXTargetDependency section */
4294+
811167471B8402DA003CB026 /* PBXTargetDependency */ = {
4295+
isa = PBXTargetDependency;
4296+
target = 97010FAB1630B18F00AB761E /* Parse-OSX */;
4297+
targetProxy = 811167461B8402DA003CB026 /* PBXContainerItemProxy */;
4298+
};
4299+
8111674C1B8402DF003CB026 /* PBXTargetDependency */ = {
4300+
isa = PBXTargetDependency;
4301+
target = 81C3821B19CCA89E0066284A /* Parse-iOS */;
4302+
targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */;
4303+
};
42904304
81493A9A1A0D3CE3008D5504 /* PBXTargetDependency */ = {
42914305
isa = PBXTargetDependency;
42924306
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;

‎Parse.xcodeproj/xcshareddata/xcschemes/Parse-OSX.xcscheme

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0700"
4-
version = "1.3">
4+
version = "1.8">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
18-
BuildableName = "ParseOSX.framework"
18+
BuildableName = "Parse.framework"
1919
BlueprintName = "Parse-OSX"
2020
ReferencedContainer = "container:Parse.xcodeproj">
2121
</BuildableReference>
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40-
buildConfiguration = "Test"
4140
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4241
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES">
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
buildConfiguration = "Test">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -57,7 +57,7 @@
5757
<BuildableReference
5858
BuildableIdentifier = "primary"
5959
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
60-
BuildableName = "ParseOSX.framework"
60+
BuildableName = "Parse.framework"
6161
BlueprintName = "Parse-OSX"
6262
ReferencedContainer = "container:Parse.xcodeproj">
6363
</BuildableReference>
@@ -66,11 +66,11 @@
6666
</AdditionalOptions>
6767
</TestAction>
6868
<LaunchAction
69-
buildConfiguration = "Debug"
7069
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7170
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7271
launchStyle = "0"
7372
useCustomWorkingDirectory = "NO"
73+
buildConfiguration = "Debug"
7474
ignoresPersistentStateOnLaunch = "NO"
7575
debugDocumentVersioning = "YES"
7676
debugServiceExtension = "internal"
@@ -79,7 +79,7 @@
7979
<BuildableReference
8080
BuildableIdentifier = "primary"
8181
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
82-
BuildableName = "ParseOSX.framework"
82+
BuildableName = "Parse.framework"
8383
BlueprintName = "Parse-OSX"
8484
ReferencedContainer = "container:Parse.xcodeproj">
8585
</BuildableReference>
@@ -88,16 +88,16 @@
8888
</AdditionalOptions>
8989
</LaunchAction>
9090
<ProfileAction
91-
buildConfiguration = "Release"
9291
shouldUseLaunchSchemeArgsEnv = "YES"
9392
savedToolIdentifier = ""
9493
useCustomWorkingDirectory = "NO"
94+
buildConfiguration = "Release"
9595
debugDocumentVersioning = "YES">
9696
<MacroExpansion>
9797
<BuildableReference
9898
BuildableIdentifier = "primary"
9999
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
100-
BuildableName = "ParseOSX.framework"
100+
BuildableName = "Parse.framework"
101101
BlueprintName = "Parse-OSX"
102102
ReferencedContainer = "container:Parse.xcodeproj">
103103
</BuildableReference>

‎Parse/Internal/Analytics/PFAnalytics_Private.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
* of patent rights can be found in the PATENTS file in the same directory.
88
*/
99

10-
#if TARGET_OS_IPHONE
11-
# import <Parse/PFAnalytics.h>
12-
#else
13-
# import <ParseOSX/PFAnalytics.h>
14-
#endif
10+
#import <Parse/PFAnalytics.h>
1511

1612
/*!
1713
Predefined events - AppOpened, CrashReport

‎Parse/Internal/BFTask+Private.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
#import <Bolts/BFExecutor.h>
1313
#import <Bolts/BFTaskCompletionSource.h>
1414

15-
#if TARGET_OS_IPHONE
16-
#import <Parse/PFLogging.h>
17-
#else
18-
#import <ParseOSX/PFLogging.h>
19-
#endif
15+
#import "PFLogging.h"
2016

2117
@implementation BFExecutor (Background)
2218

‎Parse/Internal/Commands/CommandRunner/PFCommandRunning.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99

1010
#import <Foundation/Foundation.h>
1111

12-
#import "PFDataProvider.h"
13-
#if TARGET_OS_IPHONE
1412
#import <Parse/PFConstants.h>
15-
#else
16-
#import <ParseOSX/PFConstants.h>
17-
#endif
13+
14+
#import "PFDataProvider.h"
1815

1916
@class BFCancellationToken;
2017
@class BFTask;

‎Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
#import <Foundation/Foundation.h>
1111

12-
#if TARGET_OS_IPHONE
1312
#import <Parse/PFConstants.h>
14-
#else
15-
#import <ParseOSX/PFConstants.h>
16-
#endif
1713

1814
@class BFCancellationToken;
1915
@class BFTask;

‎Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionFileDownloadTaskDelegate.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
#import "PFURLSessionDataTaskDelegate.h"
1111

12-
#if TARGET_OS_IPHONE
1312
#import <Parse/PFConstants.h>
14-
#else
15-
#import <ParseOSX/PFConstants.h>
16-
#endif
1713

1814
NS_ASSUME_NONNULL_BEGIN
1915

‎Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionUploadTaskDelegate.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99

1010
#import <Foundation/Foundation.h>
1111

12-
#import "PFURLSessionJSONDataTaskDelegate.h"
13-
14-
#if TARGET_OS_IPHONE
1512
#import <Parse/PFConstants.h>
16-
#else
17-
#import <ParseOSX/PFConstants.h>
18-
#endif
13+
14+
#import "PFURLSessionJSONDataTaskDelegate.h"
1915

2016
NS_ASSUME_NONNULL_BEGIN
2117

0 commit comments

Comments
 (0)