diff --git a/.gitignore b/.gitignore index 8473f2da..2626c7be 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,3 @@ contents.xcworkspacedata .DS_Store .Macaw.podspec.swp .Package.swift.swp -Carthage/ diff --git a/.travis.yml b/.travis.yml index d83ce442..6b249ea5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,5 @@ language: objective-c -osx_image: xcode8.2 +osx_image: xcode8.1 -branches: - only: - - master -before_script: - - brew update - - brew outdated carthage || brew upgrade carthage - - carthage update --platform iOS script: - set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.0' | xcpretty; + set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty; diff --git a/.travis.yml.orig b/.travis.yml.orig new file mode 100644 index 00000000..6723e7ac --- /dev/null +++ b/.travis.yml.orig @@ -0,0 +1,16 @@ +language: objective-c +osx_image: xcode8.2 + +branches: + only: + - master +before_script: + - brew update + - brew outdated carthage || brew upgrade carthage + - carthage update --platform iOS +script: +<<<<<<< HEAD + set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.0' | xcpretty; +======= + set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty; +>>>>>>> parent of d8eb2d2... Macaw project update to utilise carthage dependencies diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 71083f4a..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1 +0,0 @@ -github "drmohundro/SWXMLHash" "3.0.3" diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Headers/SWXMLHash-Swift.h b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Headers/SWXMLHash-Swift.h new file mode 100644 index 00000000..f575c051 --- /dev/null +++ b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Headers/SWXMLHash-Swift.h @@ -0,0 +1,151 @@ +// Generated by Apple Swift version 3.0.1 (swiftlang-800.0.58.6 clang-800.0.42.1) +#pragma clang diagnostic push + +#if defined(__has_include) && __has_include() +# include +#endif + +#pragma clang diagnostic ignored "-Wauto-import" +#include +#include +#include +#include + +#if !defined(SWIFT_TYPEDEFS) +# define SWIFT_TYPEDEFS 1 +# if defined(__has_include) && __has_include() +# include +# elif !defined(__cplusplus) || __cplusplus < 201103L +typedef uint_least16_t char16_t; +typedef uint_least32_t char32_t; +# endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); +#endif + +#if !defined(SWIFT_PASTE) +# define SWIFT_PASTE_HELPER(x, y) x##y +# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) +#endif +#if !defined(SWIFT_METATYPE) +# define SWIFT_METATYPE(X) Class +#endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif + +#if defined(__has_attribute) && __has_attribute(objc_runtime_name) +# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) +#else +# define SWIFT_RUNTIME_NAME(X) +#endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif +#if defined(__has_attribute) && __has_attribute(noescape) +# define SWIFT_NOESCAPE __attribute__((noescape)) +#else +# define SWIFT_NOESCAPE +#endif +#if !defined(SWIFT_CLASS_EXTRA) +# define SWIFT_CLASS_EXTRA +#endif +#if !defined(SWIFT_PROTOCOL_EXTRA) +# define SWIFT_PROTOCOL_EXTRA +#endif +#if !defined(SWIFT_ENUM_EXTRA) +# define SWIFT_ENUM_EXTRA +#endif +#if !defined(SWIFT_CLASS) +# if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) +# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# else +# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# endif +#endif + +#if !defined(SWIFT_PROTOCOL) +# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +#endif + +#if !defined(SWIFT_EXTENSION) +# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) +#endif + +#if !defined(OBJC_DESIGNATED_INITIALIZER) +# if defined(__has_attribute) && __has_attribute(objc_designated_initializer) +# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) +# else +# define OBJC_DESIGNATED_INITIALIZER +# endif +#endif +#if !defined(SWIFT_ENUM) +# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type +# if defined(__has_feature) && __has_feature(generalized_swift_name) +# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_EXTRA _name : _type +# else +# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) +# endif +#endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif +#if defined(__has_feature) && __has_feature(modules) +@import ObjectiveC; +@import Foundation; +#endif + +#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" +#pragma clang diagnostic ignored "-Wduplicate-method-arg" +@class NSXMLParser; + +/** + The implementation of XMLParserDelegate and where the parsing actually happens. +*/ +SWIFT_CLASS("_TtC9SWXMLHash13FullXMLParser") +@interface FullXMLParser : NSObject +- (void)parser:(NSXMLParser * _Nonnull)parser didStartElement:(NSString * _Nonnull)elementName namespaceURI:(NSString * _Nullable)namespaceURI qualifiedName:(NSString * _Nullable)qName attributes:(NSDictionary * _Nonnull)attributeDict; +- (void)parser:(NSXMLParser * _Nonnull)parser foundCharacters:(NSString * _Nonnull)string; +- (void)parser:(NSXMLParser * _Nonnull)parser didEndElement:(NSString * _Nonnull)elementName namespaceURI:(NSString * _Nullable)namespaceURI qualifiedName:(NSString * _Nullable)qName; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; +@end + + +/** + The implementation of XMLParserDelegate and where the lazy parsing actually happens. +*/ +SWIFT_CLASS("_TtC9SWXMLHash13LazyXMLParser") +@interface LazyXMLParser : NSObject +@property (nonatomic, copy) NSData * _Nullable data; +- (void)parser:(NSXMLParser * _Nonnull)parser didStartElement:(NSString * _Nonnull)elementName namespaceURI:(NSString * _Nullable)namespaceURI qualifiedName:(NSString * _Nullable)qName attributes:(NSDictionary * _Nonnull)attributeDict; +- (void)parser:(NSXMLParser * _Nonnull)parser foundCharacters:(NSString * _Nonnull)string; +- (void)parser:(NSXMLParser * _Nonnull)parser didEndElement:(NSString * _Nonnull)elementName namespaceURI:(NSString * _Nullable)namespaceURI qualifiedName:(NSString * _Nullable)qName; +- (BOOL)onMatch; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; +@end + +#pragma clang diagnostic pop diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Headers/SWXMLHash.h b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Headers/SWXMLHash.h new file mode 100644 index 00000000..9082635e --- /dev/null +++ b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Headers/SWXMLHash.h @@ -0,0 +1,19 @@ +// +// SWXMLHash.h +// SWXMLHash +// +// Created by David Mohundro on 7/8/14. +// +// + +#import + +//! Project version number for SWXMLHash. +FOUNDATION_EXPORT double SWXMLHashVersionNumber; + +//! Project version string for SWXMLHash. +FOUNDATION_EXPORT const unsigned char SWXMLHashVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Info.plist b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Info.plist new file mode 100644 index 00000000..107e5c51 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Info.plist differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm.swiftdoc b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm.swiftdoc new file mode 100644 index 00000000..30e936a0 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm.swiftdoc differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm.swiftmodule b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm.swiftmodule new file mode 100644 index 00000000..11f95cc4 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm.swiftmodule differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm64.swiftdoc b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm64.swiftdoc new file mode 100644 index 00000000..a8efba63 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm64.swiftdoc differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm64.swiftmodule b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm64.swiftmodule new file mode 100644 index 00000000..a695291a Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/arm64.swiftmodule differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/i386.swiftdoc b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/i386.swiftdoc new file mode 100644 index 00000000..7f53908f Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/i386.swiftdoc differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/i386.swiftmodule b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/i386.swiftmodule new file mode 100644 index 00000000..7156d5e2 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/i386.swiftmodule differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/x86_64.swiftdoc b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/x86_64.swiftdoc new file mode 100644 index 00000000..466056f0 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/x86_64.swiftdoc differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/x86_64.swiftmodule b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/x86_64.swiftmodule new file mode 100644 index 00000000..3521ee31 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/SWXMLHash.swiftmodule/x86_64.swiftmodule differ diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/module.modulemap b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/module.modulemap new file mode 100644 index 00000000..164b0dd1 --- /dev/null +++ b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/Modules/module.modulemap @@ -0,0 +1,10 @@ +framework module SWXMLHash { + umbrella header "SWXMLHash.h" + + export * + module * { export * } +} + +module SWXMLHash.Swift { + header "SWXMLHash-Swift.h" +} diff --git a/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/SWXMLHash b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/SWXMLHash new file mode 100755 index 00000000..fda8d550 Binary files /dev/null and b/Dependencies/SWXMLHash/iOS/SWXMLHash.framework/SWXMLHash differ diff --git a/Macaw.xcodeproj/project.pbxproj b/Macaw.xcodeproj/project.pbxproj index 92a0d193..56f69b97 100644 --- a/Macaw.xcodeproj/project.pbxproj +++ b/Macaw.xcodeproj/project.pbxproj @@ -42,6 +42,7 @@ 573525B71E0BC8FE00EB4AAB /* PinchEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525501E0BC8FE00EB4AAB /* PinchEvent.swift */; }; 573525B81E0BC8FE00EB4AAB /* RotateEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525511E0BC8FE00EB4AAB /* RotateEvent.swift */; }; 573525B91E0BC8FE00EB4AAB /* TapEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525521E0BC8FE00EB4AAB /* TapEvent.swift */; }; + 573525BA1E0BC8FE00EB4AAB /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 573525531E0BC8FE00EB4AAB /* Info.plist */; }; 573525BB1E0BC8FE00EB4AAB /* Align.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525561E0BC8FE00EB4AAB /* Align.swift */; }; 573525BC1E0BC8FE00EB4AAB /* AspectRatio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525571E0BC8FE00EB4AAB /* AspectRatio.swift */; }; 573525BD1E0BC8FE00EB4AAB /* Baseline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525581E0BC8FE00EB4AAB /* Baseline.swift */; }; @@ -100,6 +101,8 @@ 573525F21E0BC8FF00EB4AAB /* MacawView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525941E0BC8FE00EB4AAB /* MacawView.swift */; }; 573525F31E0BC8FF00EB4AAB /* NodesMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525951E0BC8FE00EB4AAB /* NodesMap.swift */; }; 573525F41E0BC8FF00EB4AAB /* ShapeLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573525961E0BC8FE00EB4AAB /* ShapeLayer.swift */; }; + 57CAB11C1D78177900FD8E47 /* SWXMLHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57CAB11B1D78177900FD8E47 /* SWXMLHash.framework */; }; + 57CAB11D1D78178000FD8E47 /* SWXMLHash.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 57CAB11B1D78177900FD8E47 /* SWXMLHash.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 57CAB1231D782DFC00FD8E47 /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CAB1221D782DFC00FD8E47 /* TestUtils.swift */; }; 57CAB12E1D7832E000FD8E47 /* circle.svg in Resources */ = {isa = PBXBuildFile; fileRef = 57CAB1251D7832E000FD8E47 /* circle.svg */; }; 57CAB12F1D7832E000FD8E47 /* ellipse.svg in Resources */ = {isa = PBXBuildFile; fileRef = 57CAB1261D7832E000FD8E47 /* ellipse.svg */; }; @@ -110,7 +113,6 @@ 57CAB1341D7832E000FD8E47 /* rect.svg in Resources */ = {isa = PBXBuildFile; fileRef = 57CAB12B1D7832E000FD8E47 /* rect.svg */; }; 57CAB1351D7832E000FD8E47 /* roundRect.svg in Resources */ = {isa = PBXBuildFile; fileRef = 57CAB12C1D7832E000FD8E47 /* roundRect.svg */; }; 57CAB1361D7832E000FD8E47 /* triangle.svg in Resources */ = {isa = PBXBuildFile; fileRef = 57CAB12D1D7832E000FD8E47 /* triangle.svg */; }; - 57E559881E2C9C8E004339EB /* SWXMLHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E559871E2C9C8E004339EB /* SWXMLHash.framework */; }; 57FCD2771D76EA4600CC0FB6 /* Macaw.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57FCD26C1D76EA4600CC0FB6 /* Macaw.framework */; }; 57FCD27C1D76EA4600CC0FB6 /* MacawTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57FCD27B1D76EA4600CC0FB6 /* MacawTests.swift */; }; /* End PBXBuildFile section */ @@ -132,6 +134,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 57CAB11D1D78178000FD8E47 /* SWXMLHash.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -232,6 +235,7 @@ 573525941E0BC8FE00EB4AAB /* MacawView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MacawView.swift; sourceTree = ""; }; 573525951E0BC8FE00EB4AAB /* NodesMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodesMap.swift; sourceTree = ""; }; 573525961E0BC8FE00EB4AAB /* ShapeLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShapeLayer.swift; sourceTree = ""; }; + 57CAB11B1D78177900FD8E47 /* SWXMLHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SWXMLHash.framework; path = iOS/SWXMLHash.framework; sourceTree = ""; }; 57CAB1221D782DFC00FD8E47 /* TestUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestUtils.swift; sourceTree = ""; }; 57CAB1251D7832E000FD8E47 /* circle.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = circle.svg; sourceTree = ""; }; 57CAB1261D7832E000FD8E47 /* ellipse.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = ellipse.svg; sourceTree = ""; }; @@ -242,7 +246,6 @@ 57CAB12B1D7832E000FD8E47 /* rect.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = rect.svg; sourceTree = ""; }; 57CAB12C1D7832E000FD8E47 /* roundRect.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = roundRect.svg; sourceTree = ""; }; 57CAB12D1D7832E000FD8E47 /* triangle.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = triangle.svg; sourceTree = ""; }; - 57E559871E2C9C8E004339EB /* SWXMLHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SWXMLHash.framework; path = Carthage/Build/iOS/SWXMLHash.framework; sourceTree = SOURCE_ROOT; }; 57FCD26C1D76EA4600CC0FB6 /* Macaw.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Macaw.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 57FCD2761D76EA4600CC0FB6 /* MacawTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MacawTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 57FCD27B1D76EA4600CC0FB6 /* MacawTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacawTests.swift; sourceTree = ""; }; @@ -254,7 +257,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 57E559881E2C9C8E004339EB /* SWXMLHash.framework in Frameworks */, + 57CAB11C1D78177900FD8E47 /* SWXMLHash.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -522,12 +525,20 @@ path = svg; sourceTree = ""; }; - 57E559861E2C9C5D004339EB /* Dependencies */ = { + 57D2020D1D78044A00A90D4F /* Dependencies */ = { isa = PBXGroup; children = ( - 57E559871E2C9C8E004339EB /* SWXMLHash.framework */, + 57D202131D78044A00A90D4F /* SWXMLHash */, ); - name = Dependencies; + path = Dependencies; + sourceTree = SOURCE_ROOT; + }; + 57D202131D78044A00A90D4F /* SWXMLHash */ = { + isa = PBXGroup; + children = ( + 57CAB11B1D78177900FD8E47 /* SWXMLHash.framework */, + ); + path = SWXMLHash; sourceTree = ""; }; 57FCD2621D76EA4600CC0FB6 = { @@ -551,8 +562,8 @@ 57FCD26E1D76EA4600CC0FB6 /* Macaw */ = { isa = PBXGroup; children = ( - 57E559861E2C9C5D004339EB /* Dependencies */, 573525271E0BC8FE00EB4AAB /* Source */, + 57D2020D1D78044A00A90D4F /* Dependencies */, ); path = Macaw; sourceTree = ""; @@ -590,6 +601,7 @@ 57FCD2691D76EA4600CC0FB6 /* Headers */, 57FCD26A1D76EA4600CC0FB6 /* Resources */, 57D202181D78047000A90D4F /* CopyFiles */, + 57C13F371E2CC9A70052B419 /* ShellScript */, ); buildRules = ( ); @@ -661,6 +673,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 573525BA1E0BC8FE00EB4AAB /* Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -682,6 +695,23 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 57C13F371E2CC9A70052B419 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/Dependencies/SWXMLHash/iOS/SWXMLHash.framework", + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 57FCD2671D76EA4600CC0FB6 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -911,7 +941,9 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/Dependencies/RxSwift/iOS", + "$(PROJECT_DIR)/Dependencies/SWXMLHash", + "$(PROJECT_DIR)/Dependencies/SWXMLHash/iOS", ); INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -933,7 +965,9 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/Dependencies/RxSwift/iOS", + "$(PROJECT_DIR)/Dependencies/SWXMLHash", + "$(PROJECT_DIR)/Dependencies/SWXMLHash/iOS", ); INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/cartfile b/cartfile deleted file mode 100644 index a31305ea..00000000 --- a/cartfile +++ /dev/null @@ -1 +0,0 @@ -github "drmohundro/SWXMLHash" ~> 3.0