Skip to content

Rename 'ParseOSX.framework' to 'Parse.framework' for OS X. #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Configurations/Parse-OSX.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "Shared/Platform/OSX.xcconfig"
#include "Shared/Product/Framework.xcconfig"

PRODUCT_NAME = ParseOSX
PRODUCT_NAME = Parse

MACH_O_TYPE = mh_dylib
DEFINES_MODULE = YES
Expand Down
7 changes: 3 additions & 4 deletions Parse-OSX.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ Pod::Spec.new do |s|
s.osx.deployment_target = '10.9'
s.requires_arc = true

s.header_dir = 'ParseOSX'
s.module_name = 'ParseOSX'
s.header_dir = 'Parse'
s.module_name = 'Parse'

s.source_files = 'Parse/*.{h,m}',
'Parse/OSX.{h,m}',
'Parse/Internal/**/*.{h,m}'
s.public_header_files = 'Parse/*.h', 'Parse/OSX/*.h'
s.public_header_files = 'Parse/*.h'
s.resources = 'Parse/Resources/en.lproj'
s.exclude_files = 'Parse/PFNetworkActivityIndicatorManager.{h,m}',
'Parse/PFProduct.{h,m}',
Expand Down
48 changes: 31 additions & 17 deletions Parse.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
81BF4ABD1B0BF64B00A3D75B /* PFCurrentConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BF4ABA1B0BF64B00A3D75B /* PFCurrentConfigController.h */; };
81BF4ABE1B0BF64B00A3D75B /* PFCurrentConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4ABB1B0BF64B00A3D75B /* PFCurrentConfigController.m */; };
81BF4ABF1B0BF64B00A3D75B /* PFCurrentConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4ABB1B0BF64B00A3D75B /* PFCurrentConfigController.m */; };
81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* ParseOSX.framework */; };
81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; };
81C09F8D1AF9816D0043B49C /* Bolts.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8103FA44198FC267000BAE3F /* Bolts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
81C1EE491AE1EF960031C438 /* PFWeakValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C1EE471AE1EF960031C438 /* PFWeakValue.h */; };
81C1EE4A1AE1EF960031C438 /* PFWeakValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C1EE481AE1EF960031C438 /* PFWeakValue.m */; };
Expand Down Expand Up @@ -754,7 +754,6 @@
81EEE1B21B446D600087AC4D /* PFCurrentUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */; };
81EEE1B31B446D600087AC4D /* PFCurrentUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */; };
81F0E88E19E6F7D600812A88 /* Parse.h in Headers */ = {isa = PBXBuildFile; fileRef = 09EEA12D1434FB1F00E3A3FA /* Parse.h */; settings = {ATTRIBUTES = (Public, ); }; };
81F0E88F19E6F7DB00812A88 /* ParseOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = 971AC55C1716405A00A4EB71 /* ParseOSX.h */; settings = {ATTRIBUTES = (Public, ); }; };
81F0E89019E6F83E00812A88 /* PFACL.h in Headers */ = {isa = PBXBuildFile; fileRef = 64C47802147336C70092082F /* PFACL.h */; settings = {ATTRIBUTES = (Public, ); }; };
81F0E89119E6F83E00812A88 /* PFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 9739513816B9D28E0010B884 /* PFAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
81F0E89219E6F83E00812A88 /* PFAnonymousUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 638CBBB415191435004F54E4 /* PFAnonymousUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -919,6 +918,20 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
811167461B8402DA003CB026 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 09D33641139C54930098E916 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 97010FAB1630B18F00AB761E;
remoteInfo = "Parse-OSX";
};
8111674B1B8402DF003CB026 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 09D33641139C54930098E916 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
remoteInfo = "Parse-iOS";
};
81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 09D33641139C54930098E916 /* Project object */;
Expand Down Expand Up @@ -1467,9 +1480,8 @@
91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = "<group>"; };
91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = "<group>"; };
91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = "<group>"; };
97010FAC1630B18F00AB761E /* ParseOSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseOSX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
970110191630B1FE00AB761E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
971AC55C1716405A00A4EB71 /* ParseOSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseOSX.h; sourceTree = "<group>"; };
9739513816B9D28E0010B884 /* PFAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFAnalytics.h; sourceTree = "<group>"; };
9739513916B9D28E0010B884 /* PFAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFAnalytics.m; sourceTree = "<group>"; };
97A3EA0C161FB6A9007A96B2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -1560,7 +1572,7 @@
files = (
81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */,
F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */,
81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */,
81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */,
815868E21AF9818D009A5751 /* Bolts.framework in Frameworks */,
F5B0B3161B44A22300F3EBC4 /* SystemConfiguration.framework in Frameworks */,
);
Expand Down Expand Up @@ -1594,7 +1606,6 @@
children = (
09809FAE1434F98C00EC3E74 /* Internal */,
09809FB81434F98C00EC3E74 /* Resources */,
97DE04271631E686007154E8 /* OSX */,
09EEA12D1434FB1F00E3A3FA /* Parse.h */,
09EEA12E1434FB1F00E3A3FA /* Parse.m */,
64C47802147336C70092082F /* PFACL.h */,
Expand Down Expand Up @@ -1762,7 +1773,7 @@
09D3364B139C54940098E916 /* Products */ = {
isa = PBXGroup;
children = (
97010FAC1630B18F00AB761E /* ParseOSX.framework */,
97010FAC1630B18F00AB761E /* Parse.framework */,
81C3821C19CCA89E0066284A /* Parse.framework */,
816F449B1A8E8933009CDB32 /* ParseUnitTests-iOS.xctest */,
81C09F861AF97A490043B49C /* ParseUnitTests-OSX.xctest */,
Expand Down Expand Up @@ -2940,14 +2951,6 @@
path = CurrentUserController;
sourceTree = "<group>";
};
97DE04271631E686007154E8 /* OSX */ = {
isa = PBXGroup;
children = (
971AC55C1716405A00A4EB71 /* ParseOSX.h */,
);
path = OSX;
sourceTree = "<group>";
};
F50C66301B33A6CE001941A6 /* Utilites */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3380,7 +3383,6 @@
81D0EE9A19B0A2060000AE75 /* PFKeychainStore.h in Headers */,
81BF4AB71B0BF3E500A3D75B /* PFConfigController.h in Headers */,
F515355A1B57573700C49F56 /* PFDefaultACLController.h in Headers */,
81F0E88F19E6F7DB00812A88 /* ParseOSX.h in Headers */,
8119C9981A76E28F0085B516 /* PFNetworkCommand.h in Headers */,
8166FCDE1B503914003841A2 /* PFAnonymousAuthenticationProvider.h in Headers */,
81CD665B1B4DA5BA0042FC0B /* PFInstallationController.h in Headers */,
Expand Down Expand Up @@ -3537,6 +3539,7 @@
buildRules = (
);
dependencies = (
8111674C1B8402DF003CB026 /* PBXTargetDependency */,
81AB68C21B7E7EEA0053210E /* PBXTargetDependency */,
);
name = "ParseUnitTests-iOS";
Expand All @@ -3556,6 +3559,7 @@
buildRules = (
);
dependencies = (
811167471B8402DA003CB026 /* PBXTargetDependency */,
81AB68C81B7E7F2A0053210E /* PBXTargetDependency */,
);
name = "ParseUnitTests-OSX";
Expand Down Expand Up @@ -3600,7 +3604,7 @@
);
name = "Parse-OSX";
productName = ParseMac;
productReference = 97010FAC1630B18F00AB761E /* ParseOSX.framework */;
productReference = 97010FAC1630B18F00AB761E /* Parse.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -4287,6 +4291,16 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
811167471B8402DA003CB026 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 97010FAB1630B18F00AB761E /* Parse-OSX */;
targetProxy = 811167461B8402DA003CB026 /* PBXContainerItemProxy */;
};
8111674C1B8402DF003CB026 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 81C3821B19CCA89E0066284A /* Parse-iOS */;
targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */;
};
81493A9A1A0D3CE3008D5504 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
Expand Down
18 changes: 9 additions & 9 deletions Parse.xcodeproj/xcshareddata/xcschemes/Parse-OSX.xcscheme
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
version = "1.3">
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
Expand All @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
BuildableName = "ParseOSX.framework"
BuildableName = "Parse.framework"
BlueprintName = "Parse-OSX"
ReferencedContainer = "container:Parse.xcodeproj">
</BuildableReference>
Expand All @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Test"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Test">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -57,7 +57,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
BuildableName = "ParseOSX.framework"
BuildableName = "Parse.framework"
BlueprintName = "Parse-OSX"
ReferencedContainer = "container:Parse.xcodeproj">
</BuildableReference>
Expand All @@ -66,11 +66,11 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
Expand All @@ -79,7 +79,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
BuildableName = "ParseOSX.framework"
BuildableName = "Parse.framework"
BlueprintName = "Parse-OSX"
ReferencedContainer = "container:Parse.xcodeproj">
</BuildableReference>
Expand All @@ -88,16 +88,16 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97010FAB1630B18F00AB761E"
BuildableName = "ParseOSX.framework"
BuildableName = "Parse.framework"
BlueprintName = "Parse-OSX"
ReferencedContainer = "container:Parse.xcodeproj">
</BuildableReference>
Expand Down
6 changes: 1 addition & 5 deletions Parse/Internal/Analytics/PFAnalytics_Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#if TARGET_OS_IPHONE
# import <Parse/PFAnalytics.h>
#else
# import <ParseOSX/PFAnalytics.h>
#endif
#import <Parse/PFAnalytics.h>

/*!
Predefined events - AppOpened, CrashReport
Expand Down
6 changes: 1 addition & 5 deletions Parse/Internal/BFTask+Private.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@
#import <Bolts/BFExecutor.h>
#import <Bolts/BFTaskCompletionSource.h>

#if TARGET_OS_IPHONE
#import <Parse/PFLogging.h>
#else
#import <ParseOSX/PFLogging.h>
#endif
#import "PFLogging.h"

@implementation BFExecutor (Background)

Expand Down
7 changes: 2 additions & 5 deletions Parse/Internal/Commands/CommandRunner/PFCommandRunning.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@

#import <Foundation/Foundation.h>

#import "PFDataProvider.h"
#if TARGET_OS_IPHONE
#import <Parse/PFConstants.h>
#else
#import <ParseOSX/PFConstants.h>
#endif

#import "PFDataProvider.h"

@class BFCancellationToken;
@class BFTask;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE
#import <Parse/PFConstants.h>
#else
#import <ParseOSX/PFConstants.h>
#endif

@class BFCancellationToken;
@class BFTask;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#import "PFURLSessionDataTaskDelegate.h"

#if TARGET_OS_IPHONE
#import <Parse/PFConstants.h>
#else
#import <ParseOSX/PFConstants.h>
#endif

NS_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,9 @@

#import <Foundation/Foundation.h>

#import "PFURLSessionJSONDataTaskDelegate.h"

#if TARGET_OS_IPHONE
#import <Parse/PFConstants.h>
#else
#import <ParseOSX/PFConstants.h>
#endif

#import "PFURLSessionJSONDataTaskDelegate.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 0 additions & 4 deletions Parse/Internal/Config/PFConfig_Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE
#import <Parse/PFConfig.h>
#else
#import <ParseOSX/PFConfig.h>
#endif

NSString *const PFConfigParametersRESTKey;

Expand Down
4 changes: 0 additions & 4 deletions Parse/Internal/File/Controller/PFFileController.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE
#import <Parse/PFConstants.h>
#else
#import <ParseOSX/PFConstants.h>
#endif

#import "PFDataProvider.h"

Expand Down
5 changes: 0 additions & 5 deletions Parse/Internal/File/PFFile_Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE
#import <Parse/PFConstants.h>
#import <Parse/PFFile.h>
#else
#import <ParseOSX/PFConstants.h>
#import <ParseOSX/PFFile.h>
#endif

#import "PFFileState.h"

Expand Down
4 changes: 0 additions & 4 deletions Parse/Internal/Installation/PFInstallationPrivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE
#import <Parse/PFInstallation.h>
#else
#import <ParseOSX/PFInstallation.h>
#endif

@interface PFInstallation (Private)

Expand Down
4 changes: 0 additions & 4 deletions Parse/Internal/KeyValueCache/PFKeyValueCache.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

#import "PFKeyValueCache_Private.h"

#import <Parse_Private.h>

#import <Foundation/Foundation.h>

#import "BFTask+Private.h"
#import "PFAssert.h"
#import "PFConstants.h"
Expand Down
Loading