Skip to content

Commit

Permalink
Merge branch 'release/0.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhanesand
hhanesand committed May 9, 2015
2 parents f23de22 + 9955e2e commit bec2f3a
Show file tree
Hide file tree
Showing 7 changed files with 231 additions and 234 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ DerivedData
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
Carthage/Build
174 changes: 10 additions & 164 deletions AlamofireOAuth1.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,10 @@

/* Begin PBXBuildFile section */
F2C74DC31AF2FA5B0025D6A7 /* CommonCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = F2C74DC21AF2FA5B0025D6A7 /* CommonCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; };
F2C74DD91AF2FB0D0025D6A7 /* iphoneos.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = F2C74DD81AF2FB0D0025D6A7 /* iphoneos.modulemap */; };
F2C74DDB1AF2FB4E0025D6A7 /* iphonesimulator.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = F2C74DDA1AF2FB4E0025D6A7 /* iphonesimulator.modulemap */; };
F2C74DDD1AF2FB720025D6A7 /* macosx.modulemap in Sources */ = {isa = PBXBuildFile; fileRef = F2C74DDC1AF2FB720025D6A7 /* macosx.modulemap */; };
F2EAEF891AEF30580054F9A9 /* AlamofireOAuth1.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EAEF881AEF30580054F9A9 /* AlamofireOAuth1.h */; settings = {ATTRIBUTES = (Public, ); }; };
F2EAEFA01AEF32FD0054F9A9 /* OAuth1.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2EAEF9F1AEF32FD0054F9A9 /* OAuth1.swift */; };
F2EAEFAD1AF03F870054F9A9 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEFA11AEF342F0054F9A9 /* Alamofire.framework */; };
F2EAEFD11AF06D590054F9A9 /* AlamofireOAuth1Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2EAEFD01AF06D590054F9A9 /* AlamofireOAuth1Tests.swift */; };
F2EAEFD21AF06D590054F9A9 /* AlamofireOAuth1.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEF831AEF30580054F9A9 /* AlamofireOAuth1.framework */; };
F2EAEFD81AF06D720054F9A9 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEFB01AF062C70054F9A9 /* Nimble.framework */; };
F2EAEFD91AF06D720054F9A9 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEFA71AF03BC00054F9A9 /* Quick.framework */; };
F2EAEFDA1AF06D720054F9A9 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEFA11AEF342F0054F9A9 /* Alamofire.framework */; };
F2EAEFDC1AF06F160054F9A9 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEFB01AF062C70054F9A9 /* Nimble.framework */; };
F2EAEFDD1AF06F190054F9A9 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2EAEFA71AF03BC00054F9A9 /* Quick.framework */; };
F2EAEFE51AF0710E0054F9A9 /* Nimble.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2EAEFB01AF062C70054F9A9 /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F2EAEFE61AF0710E0054F9A9 /* Quick.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2EAEFA71AF03BC00054F9A9 /* Quick.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F2EAEFE71AF0710E0054F9A9 /* Alamofire.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2EAEFA11AEF342F0054F9A9 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F2F7ACE31AF832D90019E009 /* CommonCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2C74DBE1AF2FA5B0025D6A7 /* CommonCrypto.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -34,30 +22,8 @@
remoteGlobalIDString = F2C74DBD1AF2FA5B0025D6A7;
remoteInfo = CommonCrypto;
};
F2EAEFD31AF06D590054F9A9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F2EAEF7A1AEF30580054F9A9 /* Project object */;
proxyType = 1;
remoteGlobalIDString = F2EAEF821AEF30580054F9A9;
remoteInfo = AlamofireOAuth1;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
F2EAEFE41AF071060054F9A9 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
F2EAEFE51AF0710E0054F9A9 /* Nimble.framework in CopyFiles */,
F2EAEFE61AF0710E0054F9A9 /* Quick.framework in CopyFiles */,
F2EAEFE71AF0710E0054F9A9 /* Alamofire.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
F2C74DB61AF2F95B0025D6A7 /* libcommonCrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcommonCrypto.dylib; path = usr/lib/system/libcommonCrypto.dylib; sourceTree = SDKROOT; };
F2C74DBE1AF2FA5B0025D6A7 /* CommonCrypto.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CommonCrypto.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -74,9 +40,6 @@
F2EAEFA11AEF342F0054F9A9 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
F2EAEFA71AF03BC00054F9A9 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = "<group>"; };
F2EAEFB01AF062C70054F9A9 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
F2EAEFCC1AF06D590054F9A9 /* AlamofireOAuth1Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AlamofireOAuth1Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F2EAEFCF1AF06D590054F9A9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F2EAEFD01AF06D590054F9A9 /* AlamofireOAuth1Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireOAuth1Tests.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -91,20 +54,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F2F7ACE31AF832D90019E009 /* CommonCrypto.framework in Frameworks */,
F2EAEFAD1AF03F870054F9A9 /* Alamofire.framework in Frameworks */,
F2EAEFDC1AF06F160054F9A9 /* Nimble.framework in Frameworks */,
F2EAEFDD1AF06F190054F9A9 /* Quick.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
F2EAEFC91AF06D590054F9A9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F2EAEFD21AF06D590054F9A9 /* AlamofireOAuth1.framework in Frameworks */,
F2EAEFD81AF06D720054F9A9 /* Nimble.framework in Frameworks */,
F2EAEFD91AF06D720054F9A9 /* Quick.framework in Frameworks */,
F2EAEFDA1AF06D720054F9A9 /* Alamofire.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -128,7 +79,6 @@
isa = PBXGroup;
children = (
F2EAEF851AEF30580054F9A9 /* AlamofireOAuth1 */,
F2EAEFCD1AF06D590054F9A9 /* AlamofireOAuth1Tests */,
F2C74DBF1AF2FA5B0025D6A7 /* CommonCrypto */,
F2EAEFA41AEF34AF0054F9A9 /* Frameworks */,
F2EAEF841AEF30580054F9A9 /* Products */,
Expand All @@ -139,7 +89,6 @@
isa = PBXGroup;
children = (
F2EAEF831AEF30580054F9A9 /* AlamofireOAuth1.framework */,
F2EAEFCC1AF06D590054F9A9 /* AlamofireOAuth1Tests.xctest */,
F2C74DBE1AF2FA5B0025D6A7 /* CommonCrypto.framework */,
);
name = Products;
Expand Down Expand Up @@ -174,23 +123,6 @@
name = Frameworks;
sourceTree = "<group>";
};
F2EAEFCD1AF06D590054F9A9 /* AlamofireOAuth1Tests */ = {
isa = PBXGroup;
children = (
F2EAEFD01AF06D590054F9A9 /* AlamofireOAuth1Tests.swift */,
F2EAEFCE1AF06D590054F9A9 /* Supporting Files */,
);
path = AlamofireOAuth1Tests;
sourceTree = "<group>";
};
F2EAEFCE1AF06D590054F9A9 /* Supporting Files */ = {
isa = PBXGroup;
children = (
F2EAEFCF1AF06D590054F9A9 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -239,7 +171,7 @@
F2EAEF7F1AEF30580054F9A9 /* Frameworks */,
F2EAEF801AEF30580054F9A9 /* Headers */,
F2EAEF811AEF30580054F9A9 /* Resources */,
F2EAEFA31AEF34400054F9A9 /* ShellScript */,
F23146A81AF8527600527B32 /* ShellScript */,
);
buildRules = (
);
Expand All @@ -251,25 +183,6 @@
productReference = F2EAEF831AEF30580054F9A9 /* AlamofireOAuth1.framework */;
productType = "com.apple.product-type.framework";
};
F2EAEFCB1AF06D590054F9A9 /* AlamofireOAuth1Tests */ = {
isa = PBXNativeTarget;
buildConfigurationList = F2EAEFD51AF06D590054F9A9 /* Build configuration list for PBXNativeTarget "AlamofireOAuth1Tests" */;
buildPhases = (
F2EAEFC81AF06D590054F9A9 /* Sources */,
F2EAEFC91AF06D590054F9A9 /* Frameworks */,
F2EAEFCA1AF06D590054F9A9 /* Resources */,
F2EAEFE41AF071060054F9A9 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
F2EAEFD41AF06D590054F9A9 /* PBXTargetDependency */,
);
name = AlamofireOAuth1Tests;
productName = AlamofireOAuth1Tests;
productReference = F2EAEFCC1AF06D590054F9A9 /* AlamofireOAuth1Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -285,9 +198,6 @@
F2EAEF821AEF30580054F9A9 = {
CreatedOnToolsVersion = 6.3.1;
};
F2EAEFCB1AF06D590054F9A9 = {
CreatedOnToolsVersion = 6.3.1;
};
};
};
buildConfigurationList = F2EAEF7D1AEF30580054F9A9 /* Build configuration list for PBXProject "AlamofireOAuth1" */;
Expand All @@ -303,7 +213,6 @@
projectRoot = "";
targets = (
F2EAEF821AEF30580054F9A9 /* AlamofireOAuth1 */,
F2EAEFCB1AF06D590054F9A9 /* AlamofireOAuth1Tests */,
F2C74DBD1AF2FA5B0025D6A7 /* CommonCrypto */,
);
};
Expand All @@ -324,17 +233,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
F2EAEFCA1AF06D590054F9A9 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
F2EAEFA31AEF34400054F9A9 /* ShellScript */ = {
F23146A81AF8527600527B32 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -355,9 +257,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F2C74DDB1AF2FB4E0025D6A7 /* iphonesimulator.modulemap in Sources */,
F2C74DD91AF2FB0D0025D6A7 /* iphoneos.modulemap in Sources */,
F2C74DDD1AF2FB720025D6A7 /* macosx.modulemap in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -369,14 +268,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
F2EAEFC81AF06D590054F9A9 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F2EAEFD11AF06D590054F9A9 /* AlamofireOAuth1Tests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -385,11 +276,6 @@
target = F2C74DBD1AF2FA5B0025D6A7 /* CommonCrypto */;
targetProxy = F2C74DDE1AF2FBB50025D6A7 /* PBXContainerItemProxy */;
};
F2EAEFD41AF06D590054F9A9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F2EAEF821AEF30580054F9A9 /* AlamofireOAuth1 */;
targetProxy = F2EAEFD31AF06D590054F9A9 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -435,7 +321,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down Expand Up @@ -470,7 +356,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -486,7 +372,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down Expand Up @@ -528,6 +414,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -553,6 +440,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -573,40 +461,6 @@
};
name = Release;
};
F2EAEFD61AF06D590054F9A9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = AlamofireOAuth1Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
F2EAEFD71AF06D590054F9A9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = AlamofireOAuth1Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -617,6 +471,7 @@
F2C74DD31AF2FA5C0025D6A7 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F2EAEF7D1AEF30580054F9A9 /* Build configuration list for PBXProject "AlamofireOAuth1" */ = {
isa = XCConfigurationList;
Expand All @@ -636,15 +491,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F2EAEFD51AF06D590054F9A9 /* Build configuration list for PBXNativeTarget "AlamofireOAuth1Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F2EAEFD61AF06D590054F9A9 /* Debug */,
F2EAEFD71AF06D590054F9A9 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = F2EAEF7A1AEF30580054F9A9 /* Project object */;
Expand Down
Loading

0 comments on commit bec2f3a

Please sign in to comment.