Skip to content

Commit

Permalink
Merge pull request #104 from Present-Inc/master
Browse files Browse the repository at this point in the history
Carthage Support
  • Loading branch information
LukeTangPL committed Dec 11, 2014
2 parents b05c10b + aa9cc39 commit 58fbd6d
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ DerivedData

#CocoaPods
Pods
*.xcscheme
33 changes: 32 additions & 1 deletion Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
7C5E10861A2E1CBA00333E8B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4EC1C1C91A0C1A2D0026ED0B;
remoteInfo = SwiftyJSONOSX;
};
7C5E10881A2E1CBA00333E8B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4EC1C1D31A0C1A2D0026ED0B;
remoteInfo = SwiftyJSONOSXTests;
};
A82A1C4C19D94E86009A653D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A82A1C4719D94E86009A653D /* SwiftyJSON.xcodeproj */;
Expand Down Expand Up @@ -123,6 +137,8 @@
children = (
A82A1C4D19D94E86009A653D /* SwiftyJSON.framework */,
A82A1C4F19D94E86009A653D /* SwiftyJSONTests.xctest */,
7C5E10871A2E1CBA00333E8B /* SwiftyJSON.framework */,
7C5E10891A2E1CBA00333E8B /* SwiftyJSONOSXTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -188,6 +204,20 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
7C5E10871A2E1CBA00333E8B /* SwiftyJSON.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SwiftyJSON.framework;
remoteRef = 7C5E10861A2E1CBA00333E8B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
7C5E10891A2E1CBA00333E8B /* SwiftyJSONOSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = SwiftyJSONOSXTests.xctest;
remoteRef = 7C5E10881A2E1CBA00333E8B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A82A1C4D19D94E86009A653D /* SwiftyJSON.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down Expand Up @@ -319,7 +349,7 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
Expand Down Expand Up @@ -355,6 +385,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
10 changes: 8 additions & 2 deletions SwiftyJSON.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -464,7 +465,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
METAL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -493,6 +494,7 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -504,7 +506,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
METAL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand All @@ -518,12 +520,14 @@
2E4FEFF219575BE100351305 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -533,12 +537,14 @@
2E4FEFF319575BE100351305 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down
110 changes: 110 additions & 0 deletions SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2E4FEFDA19575BE100351305"
BuildableName = "SwiftyJSON.framework"
BlueprintName = "SwiftyJSON"
ReferencedContainer = "container:SwiftyJSON.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2E4FEFE519575BE100351305"
BuildableName = "SwiftyJSONTests.xctest"
BlueprintName = "SwiftyJSONTests"
ReferencedContainer = "container:SwiftyJSON.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2E4FEFE519575BE100351305"
BuildableName = "SwiftyJSONTests.xctest"
BlueprintName = "SwiftyJSONTests"
ReferencedContainer = "container:SwiftyJSON.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2E4FEFDA19575BE100351305"
BuildableName = "SwiftyJSON.framework"
BlueprintName = "SwiftyJSON"
ReferencedContainer = "container:SwiftyJSON.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2E4FEFDA19575BE100351305"
BuildableName = "SwiftyJSON.framework"
BlueprintName = "SwiftyJSON"
ReferencedContainer = "container:SwiftyJSON.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2E4FEFDA19575BE100351305"
BuildableName = "SwiftyJSON.framework"
BlueprintName = "SwiftyJSON"
ReferencedContainer = "container:SwiftyJSON.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

0 comments on commit 58fbd6d

Please sign in to comment.