diff --git a/ConnectionKit.podspec b/ConnectionKit.podspec index 3e15cdd..1c35b4d 100644 --- a/ConnectionKit.podspec +++ b/ConnectionKit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'ConnectionKit' - s.version = '2.0' + s.version = '2.0.1' s.summary = 'Abstract possible connections' # This description is used to generate tags and improve search results. diff --git a/ConnectionKit/Classes/SocketConnection.swift b/ConnectionKit/Classes/SocketConnection.swift index 3e598c9..eec5b8e 100644 --- a/ConnectionKit/Classes/SocketConnection.swift +++ b/ConnectionKit/Classes/SocketConnection.swift @@ -56,6 +56,7 @@ public final class SocketConnection: NSObject, GCDAsyncSocketDelegate, Connectio self.socket = GCDAsyncSocket(delegate: self, delegateQueue: DispatchQueue.main) + self.socket.isIPv4PreferredOverIPv6 = false } deinit { diff --git a/Example/ConnectionKit.xcodeproj/project.pbxproj b/Example/ConnectionKit.xcodeproj/project.pbxproj index 429dacc..02317e4 100644 --- a/Example/ConnectionKit.xcodeproj/project.pbxproj +++ b/Example/ConnectionKit.xcodeproj/project.pbxproj @@ -7,20 +7,20 @@ objects = { /* Begin PBXBuildFile section */ + 28D4DA4DB490305E382E29FF /* Pods_ConnectionKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F68AC8C8479A0011228304 /* Pods_ConnectionKit_Tests.framework */; }; 607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; }; - 665D5E64524EABDE56011C11 /* Pods_ConnectionKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 534334A796923FDE532C6E78 /* Pods_ConnectionKit_Tests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 534334A796923FDE532C6E78 /* Pods_ConnectionKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ConnectionKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACE51AFB9204008FA782 /* ConnectionKit_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ConnectionKit_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = ""; }; 63F28757CD7DDA059E34A370 /* ConnectionKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = ConnectionKit.podspec; path = ../ConnectionKit.podspec; sourceTree = ""; }; + 6524475BE79AF481BBE05843 /* Pods-ConnectionKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConnectionKit_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests.debug.xcconfig"; sourceTree = ""; }; 8FE3A29E00BD57A1B96FFC5B /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - E56161DFA84520DE7B1DC69C /* Pods-ConnectionKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConnectionKit_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests.debug.xcconfig"; sourceTree = ""; }; + F1F68AC8C8479A0011228304 /* Pods_ConnectionKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ConnectionKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F2968B52C5336CC813A13702 /* Pods-ConnectionKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConnectionKit_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests.release.xcconfig"; sourceTree = ""; }; F5FA76F7EC935A2B786CA696 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - FC7AE14A1C29C9D066557D0B /* Pods-ConnectionKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConnectionKit_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -28,19 +28,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 665D5E64524EABDE56011C11 /* Pods_ConnectionKit_Tests.framework in Frameworks */, + 28D4DA4DB490305E382E29FF /* Pods_ConnectionKit_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 48ADFE942325BE31AC4285F2 /* Frameworks */ = { + 39B3E1EE81E967DCEE805CF1 /* Pods */ = { isa = PBXGroup; children = ( - 534334A796923FDE532C6E78 /* Pods_ConnectionKit_Tests.framework */, + 6524475BE79AF481BBE05843 /* Pods-ConnectionKit_Tests.debug.xcconfig */, + F2968B52C5336CC813A13702 /* Pods-ConnectionKit_Tests.release.xcconfig */, ); - name = Frameworks; + name = Pods; sourceTree = ""; }; 607FACC71AFB9204008FA782 = { @@ -49,8 +50,8 @@ 607FACF51AFB993E008FA782 /* Podspec Metadata */, 607FACE81AFB9204008FA782 /* Tests */, 607FACD11AFB9204008FA782 /* Products */, - B8E2AC5E9C4874560BD9516E /* Pods */, - 48ADFE942325BE31AC4285F2 /* Frameworks */, + 39B3E1EE81E967DCEE805CF1 /* Pods */, + 922FA9A4B21A036851B03CC2 /* Frameworks */, ); sourceTree = ""; }; @@ -89,13 +90,12 @@ name = "Podspec Metadata"; sourceTree = ""; }; - B8E2AC5E9C4874560BD9516E /* Pods */ = { + 922FA9A4B21A036851B03CC2 /* Frameworks */ = { isa = PBXGroup; children = ( - E56161DFA84520DE7B1DC69C /* Pods-ConnectionKit_Tests.debug.xcconfig */, - FC7AE14A1C29C9D066557D0B /* Pods-ConnectionKit_Tests.release.xcconfig */, + F1F68AC8C8479A0011228304 /* Pods_ConnectionKit_Tests.framework */, ); - name = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -105,12 +105,12 @@ isa = PBXNativeTarget; buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "ConnectionKit_Tests" */; buildPhases = ( - AE2178C7DF3DA4DBC917B218 /* [CP] Check Pods Manifest.lock */, + D24A9E7B772FEF2908A7B1BD /* [CP] Check Pods Manifest.lock */, 607FACE11AFB9204008FA782 /* Sources */, 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, - 77367DB6B98027FB64107271 /* [CP] Embed Pods Frameworks */, - F51274081C8F57C5FC1313C7 /* [CP] Copy Pods Resources */, + BE53319D721FE21B9D27BDC8 /* [CP] Embed Pods Frameworks */, + AB01B11C3A05C5D1C5407C62 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -167,7 +167,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 77367DB6B98027FB64107271 /* [CP] Embed Pods Frameworks */ = { + AB01B11C3A05C5D1C5407C62 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + BE53319D721FE21B9D27BDC8 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -182,7 +197,7 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - AE2178C7DF3DA4DBC917B218 /* [CP] Check Pods Manifest.lock */ = { + D24A9E7B772FEF2908A7B1BD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -197,21 +212,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - F51274081C8F57C5FC1313C7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ConnectionKit_Tests/Pods-ConnectionKit_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -315,7 +315,7 @@ }; 607FACF31AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E56161DFA84520DE7B1DC69C /* Pods-ConnectionKit_Tests.debug.xcconfig */; + baseConfigurationReference = 6524475BE79AF481BBE05843 /* Pods-ConnectionKit_Tests.debug.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -336,7 +336,7 @@ }; 607FACF41AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FC7AE14A1C29C9D066557D0B /* Pods-ConnectionKit_Tests.release.xcconfig */; + baseConfigurationReference = F2968B52C5336CC813A13702 /* Pods-ConnectionKit_Tests.release.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 15d195b..16fc6bd 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,13 +1,13 @@ PODS: - CocoaAsyncSocket (7.6.1) - - ConnectionKit (2.0): + - ConnectionKit (2.0.1): - CocoaAsyncSocket - ContentKit - RepresentationKit - ContentKit (2.0): - RepresentationKit - - Ents (2.0) - - RepresentationKit (1.1.4) + - Ents (2.0.7) + - RepresentationKit (2.0) DEPENDENCIES: - CocoaAsyncSocket (from `https://github.com/averello/CocoaAsyncSocket.git`) @@ -39,18 +39,18 @@ CHECKOUT OPTIONS: :commit: 68f8d2d064036e63a8ef788444d23634c126a2c0 :git: https://github.com/averello/ContentKit.git Ents: - :commit: 6f47f341bad8e472b97f0f17194fd70156f49e30 + :commit: 65b2e26e899338ccfe4187de38e6fe5e1e9b61f9 :git: https://github.com/averello/Ents.git RepresentationKit: - :commit: 8fbcb72326485baf98d908595e159c9dbc55dc3d + :commit: fc44c427ad7ee9c41b52248fd237e63a7dc59406 :git: https://github.com/averello/RepresentationKit.git SPEC CHECKSUMS: CocoaAsyncSocket: 7eadd3f59e1a6c84e2aefc93e9ff7b55156fe174 - ConnectionKit: 2da507eb946caacd46b47768eb2dc1c823586eca + ConnectionKit: bc1add031fbf43c665f342512603e130aa6cd3de ContentKit: 1fd3e6e87cee63cc68e728d12bf9c0b764239249 - Ents: 20bc1cb5159647ff4dbbc089fcf7ddce6e8ebacf - RepresentationKit: 1ae7749916ed014403db30f3d38204d7e000dbd1 + Ents: 3f89ec7ba55b0da7dbb6bc1fc3a2f105e9c9f66d + RepresentationKit: 13e70a642c8f6ff8ea045b76cbe7814d443e735d PODFILE CHECKSUM: ee82bb8d3cb52bcbb076ac09ced1042b43940a47 diff --git a/Example/Pods/Ents/Ents/Classes/extensions/collections/RandomAccessCollectionExtensions.swift b/Example/Pods/Ents/Ents/Classes/extensions/collections/RandomAccessCollectionExtensions.swift index 733d176..6186bff 100644 --- a/Example/Pods/Ents/Ents/Classes/extensions/collections/RandomAccessCollectionExtensions.swift +++ b/Example/Pods/Ents/Ents/Classes/extensions/collections/RandomAccessCollectionExtensions.swift @@ -9,7 +9,7 @@ import Foundation -public extension RandomAccessCollection where IndexDistance: BinaryInteger { +public extension RandomAccessCollection { /// the middle element of an odd sized collection. diff --git a/Example/Pods/Ents/Ents/Classes/extensions/collections/RangeReplaceableCollectionExtensions.swift b/Example/Pods/Ents/Ents/Classes/extensions/collections/RangeReplaceableCollectionExtensions.swift index 807017c..68547df 100644 --- a/Example/Pods/Ents/Ents/Classes/extensions/collections/RangeReplaceableCollectionExtensions.swift +++ b/Example/Pods/Ents/Ents/Classes/extensions/collections/RangeReplaceableCollectionExtensions.swift @@ -9,7 +9,7 @@ import Foundation -public extension RangeReplaceableCollection where Self.SubSequence.Iterator.Element == Self.Iterator.Element { +public extension RangeReplaceableCollection { /// creates a new collection that was deprived of its last element public func dropingLast(_ n: Int = 1) -> Self { diff --git a/Example/Pods/Ents/Ents/Classes/types/collections/Queue.swift b/Example/Pods/Ents/Ents/Classes/types/collections/Queue.swift index 0d0c6dc..874b215 100644 --- a/Example/Pods/Ents/Ents/Classes/types/collections/Queue.swift +++ b/Example/Pods/Ents/Ents/Classes/types/collections/Queue.swift @@ -11,8 +11,6 @@ import Foundation /// A type that can 'enqueue' and 'dequeue' elements. public protocol Queue: Collection { - /// The type of elements held in 'self' - associatedtype Element /// Enqueue 'element' to 'self' mutating func enqueue(_ element: Element) diff --git a/Example/Pods/Ents/Ents/Classes/utils/IDValue.swift b/Example/Pods/Ents/Ents/Classes/utils/IDValue.swift index fdad6f4..24ac302 100644 --- a/Example/Pods/Ents/Ents/Classes/utils/IDValue.swift +++ b/Example/Pods/Ents/Ents/Classes/utils/IDValue.swift @@ -29,10 +29,6 @@ public extension IDValue { public static func ==(lhs: Self, rhs: Self) -> Bool { return (lhs.rawValue == rhs.rawValue) } - - public static func !=(lhs: Self, rhs: Self) -> Bool { - return !(lhs == rhs) - } } public extension IDValue where ID: Comparable { @@ -40,18 +36,6 @@ public extension IDValue where ID: Comparable { public static func <(lhs: Self, rhs: Self) -> Bool { return (lhs.rawValue < rhs.rawValue) } - - public static func >(lhs: Self, rhs: Self) -> Bool { - return (lhs.rawValue > rhs.rawValue) - } - - public static func <=(lhs: Self, rhs: Self) -> Bool { - return (lhs.rawValue <= rhs.rawValue) - } - - public static func >=(lhs: Self, rhs: Self) -> Bool { - return (lhs.rawValue >= rhs.rawValue) - } } public extension IDValue where ID: Hashable { diff --git a/Example/Pods/Ents/Ents/Classes/utils/ReadabilityUtilities.swift b/Example/Pods/Ents/Ents/Classes/utils/ReadabilityUtilities.swift index 40cce4b..1db37fa 100644 --- a/Example/Pods/Ents/Ents/Classes/utils/ReadabilityUtilities.swift +++ b/Example/Pods/Ents/Ents/Classes/utils/ReadabilityUtilities.swift @@ -13,8 +13,17 @@ public func by(_ element: Element) -> Element { return element } +@available(swift 3.1) +@available(swift, deprecated: 3.2) +@available(swift, obsoleted: 4.0, message: "doesn't work well with refererces types.") public func with(_ o: Element, _ block: (inout Element) -> Void) -> Element { var e = o block(&e) return e } + +@available(swift, introduced: 4.0) +public func with(_ e: Element, _ block: (Element) -> Void) -> Element where Element: AnyObject { + block(e) + return e +} diff --git a/Example/Pods/Ents/Ents/Classes/utils/Value.swift b/Example/Pods/Ents/Ents/Classes/utils/Value.swift index fecc8d1..1e9cc59 100644 --- a/Example/Pods/Ents/Ents/Classes/utils/Value.swift +++ b/Example/Pods/Ents/Ents/Classes/utils/Value.swift @@ -32,36 +32,20 @@ extension Value { public static func ==(lhs: Self, rhs: Self) -> Bool { return (lhs.value == rhs.value) } - - public static func !=(lhs: Self, rhs: Self) -> Bool { - return !(lhs == rhs) - } } //MARK: Act as a Comparable extension Value { - public static func >(lhs: Self, rhs: Self) -> Bool { - return (lhs.value > rhs.value) - } - public static func <(lhs: Self, rhs: Self) -> Bool { return (lhs.value < rhs.value) } - - public static func <=(lhs: Self, rhs: Self) -> Bool { - return (lhs.value <= rhs.value) - } - - public static func >=(lhs: Self, rhs: Self) -> Bool { - return (lhs.value >= rhs.value) - } } //MARK: Act as a Hashable -extension Value where T: Hashable { +extension Value where Self: Hashable, T: Hashable { public var hashValue: Int { return self.value.hashValue @@ -72,124 +56,224 @@ extension Value where T: Hashable { extension Value where T: BinaryInteger { - public static func ==(lhs: Self, rhs: T) -> Bool { - return (lhs.value == rhs) - } +// public static func ==(lhs: Self, rhs: T) -> Bool { +// return (lhs.value == rhs) +// } public static func +(lhs: Self, rhs: Self) -> Self { - return lhs + rhs.value + return Self(value: lhs.value + rhs.value) } public static func -(lhs: Self, rhs: Self) -> Self { - return lhs - rhs.value + return Self(value: lhs.value - rhs.value) } public static func *(lhs: Self, rhs: Self) -> Self { - return lhs * rhs.value + return Self(value: lhs.value * rhs.value) } public static func /(lhs: Self, rhs: Self) -> Self { - return lhs / rhs.value + return Self(value: lhs.value / rhs.value) } public static func %(lhs: Self, rhs: Self) -> Self { - return lhs % rhs.value + return Self(value: lhs.value % rhs.value) } + + public func adding(_ other: Self) -> Self { + return self + other + } + public func subtracting(_ other: Self) -> Self { + return self - other + } + public func multiplied(by other: Self) -> Self { + return self * other + } + public func divided(by other: Self) -> Self { + return self / other + } + + +// public func adding(_ other: T) -> Self { +// return Self(value: self.value + other) +// } +// public func subtracting(_ other: T) -> Self { +// return Self(value: self.value - other) +// } +// public func multiplied(by other: T) -> Self { +// return Self(value: self.value * other) +// } +// public func divided(by other: T) -> Self { +// return Self(value: self.value / other) +// } - // - public static func +(lhs: Self, rhs: T) -> Self { - return Self(value: lhs.value + rhs) - } - - public static func -(lhs: Self, rhs: T) -> Self { - return Self(value: lhs.value - rhs) - } - - public static func *(lhs: Self, rhs: T) -> Self { - return Self(value: lhs.value * rhs) - } - - public static func /(lhs: Self, rhs: T) -> Self { - return Self(value: lhs.value / rhs) - } - - public static func %(lhs: Self, rhs: T) -> Self { - return Self(value: lhs.value % rhs) - } +// // +// public static func +(lhs: Self, rhs: T) -> Self { +// return Self(value: lhs.value + rhs) +// } +// +// public static func -(lhs: Self, rhs: T) -> Self { +// return Self(value: lhs.value - rhs) +// } +// +// public static func *(lhs: Self, rhs: T) -> Self { +// return Self(value: lhs.value * rhs) +// } +// +// public static func /(lhs: Self, rhs: T) -> Self { +// return Self(value: lhs.value / rhs) +// } +// +// public static func %(lhs: Self, rhs: T) -> Self { +// return Self(value: lhs.value % rhs) +// } public static func +=(lhs: inout Self, rhs: Self) { - lhs = lhs + rhs.value + lhs = Self(value: lhs.value + rhs.value) } public static func -=(lhs: inout Self, rhs: Self) { - lhs = lhs - rhs.value + lhs = Self(value: lhs.value - rhs.value) } public static func *=(lhs: inout Self, rhs: Self) { - lhs = lhs * rhs.value + lhs = Self(value: lhs.value * rhs.value) } public static func /=(lhs: inout Self, rhs: Self) { - lhs = lhs / rhs.value + lhs = Self(value: lhs.value / rhs.value) } public static func %=(lhs: inout Self, rhs: Self) { - lhs = lhs % rhs.value + lhs = Self(value: lhs.value % rhs.value) } + + // + + public mutating func add(_ other: Self) { + self += other + } + public mutating func subtract(_ other: Self) { + self -= other + } + public mutating func multiply(by other: Self) { + self *= other + } + public mutating func divide(by other: Self) { + self /= other + } + + +// public mutating func add(_ other: T) { +// self += other +// } +// public mutating func subtract(_ other: T) { +// self -= other +// } +// public mutating func multiply(by other: T) { +// self *= other +// } +// public mutating func divide(by other: T) { +// self /= other +// } // - public static func +=(lhs: inout Self, rhs: T) { - lhs = Self(value: lhs.value + rhs) +// public static func +=(lhs: inout Self, rhs: T) { +// lhs = Self(value: lhs.value + rhs) +// } +// +// public static func -=(lhs: inout Self, rhs: T) { +// lhs = Self(value: lhs.value - rhs) +// } +// +// public static func *=(lhs: inout Self, rhs: T) { +// lhs = Self(value: lhs.value * rhs) +// } +// +// public static func /=(lhs: inout Self, rhs: T) { +// lhs = Self(value: lhs.value / rhs) +// } +// +// public static func %=(lhs: inout Self, rhs: T) { +// lhs = Self(value: lhs.value % rhs) +// } + + // minimum/maximum + + + public func minimum(_ other: Self) -> Self { + return Self(value: self.value.minimum(other.value)) } - - public static func -=(lhs: inout Self, rhs: T) { - lhs = Self(value: lhs.value - rhs) - } - - public static func *=(lhs: inout Self, rhs: T) { - lhs = Self(value: lhs.value * rhs) - } - - public static func /=(lhs: inout Self, rhs: T) { - lhs = Self(value: lhs.value / rhs) - } - - public static func %=(lhs: inout Self, rhs: T) { - lhs = Self(value: lhs.value % rhs) + + public func maximum(_ other: Self) -> Self { + return Self(value: self.value.maximum(other.value)) } + + +// public func minimum(_ other: T) -> Self { +// return Self(value: self.value.minimum(other)) +// } +// +// public func maximum(_ other: T) -> Self { +// return Self(value: self.value.maximum(other)) +// } } extension Value where T: FixedWidthInteger { - // - public static func addWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { - let res = lhs.value.addingReportingOverflow(rhs) + public static func addWithOverflow(_ lhs: Self, _ rhs: Self) -> (Self, overflow: Bool) { + let res = lhs.value.addingReportingOverflow(rhs.value) return (Self(value: res.0), overflow: res.overflow) } - public static func subtractWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { - let res = lhs.value.subtractingReportingOverflow(rhs) + public static func subtractWithOverflow(_ lhs: Self, _ rhs: Self) -> (Self, overflow: Bool) { + let res = lhs.value.subtractingReportingOverflow(rhs.value) return (Self(value: res.0), overflow: res.overflow) } - public static func multiplyWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { - let res = lhs.value.multipliedReportingOverflow(by: rhs) + public static func multiplyWithOverflow(_ lhs: Self, _ rhs: Self) -> (Self, overflow: Bool) { + let res = lhs.value.multipliedReportingOverflow(by: rhs.value) return (Self(value: res.0), overflow: res.overflow) } - public static func divideWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { - let res = lhs.value.dividedReportingOverflow(by: rhs) + public static func divideWithOverflow(_ lhs: Self, _ rhs: Self) -> (Self, overflow: Bool) { + let res = lhs.value.dividedReportingOverflow(by: rhs.value) return (Self(value: res.0), overflow: res.overflow) } - public static func remainderWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { - let res = lhs.value.remainderReportingOverflow(dividingBy: rhs) + public static func remainderWithOverflow(_ lhs: Self, _ rhs: Self) -> (Self, overflow: Bool) { + let res = lhs.value.remainderReportingOverflow(dividingBy: rhs.value) return (Self(value: res.0), overflow: res.overflow) } // + +// public static func addWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { +// let res = lhs.value.addingReportingOverflow(rhs) +// return (Self(value: res.0), overflow: res.overflow) +// } +// +// public static func subtractWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { +// let res = lhs.value.subtractingReportingOverflow(rhs) +// return (Self(value: res.0), overflow: res.overflow) +// } +// +// public static func multiplyWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { +// let res = lhs.value.multipliedReportingOverflow(by: rhs) +// return (Self(value: res.0), overflow: res.overflow) +// } +// +// public static func divideWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { +// let res = lhs.value.dividedReportingOverflow(by: rhs) +// return (Self(value: res.0), overflow: res.overflow) +// } +// +// public static func remainderWithOverflow(_ lhs: Self, _ rhs: T) -> (Self, overflow: Bool) { +// let res = lhs.value.remainderReportingOverflow(dividingBy: rhs) +// return (Self(value: res.0), overflow: res.overflow) +// } } //MARK: Act as a SignedInteger @@ -214,31 +298,31 @@ extension Value where T: SignedInteger { extension Value where T: FloatingPoint { public func adding(_ other: Self) -> Self { - return self.adding(other.value) + return Self(value: self.value + other.value) } public func subtracting(_ other: Self) -> Self { - return self.subtracting(other.value) + return Self(value: self.value - other.value) } public func multiplied(by other: Self) -> Self { - return self.multiplied(by: other.value) + return Self(value: self.value * other.value) } public func divided(by other: Self) -> Self { - return self.divided(by: other.value) + return Self(value: self.value / other.value) } - public func adding(_ other: T) -> Self { - return Self(value: self.value + other) - } - public func subtracting(_ other: T) -> Self { - return Self(value: self.value - other) - } - public func multiplied(by other: T) -> Self { - return Self(value: self.value * other) - } - public func divided(by other: T) -> Self { - return Self(value: self.value / other) - } +// public func adding(_ other: T) -> Self { +// return Self(value: self.value + other) +// } +// public func subtracting(_ other: T) -> Self { +// return Self(value: self.value - other) +// } +// public func multiplied(by other: T) -> Self { +// return Self(value: self.value * other) +// } +// public func divided(by other: T) -> Self { +// return Self(value: self.value / other) +// } public func negated() -> Self { @@ -257,6 +341,14 @@ extension Value where T: FloatingPoint { public func maximum(_ other: Self) -> Self { return Self(value: self.value.maximum(other.value)) } + +// public func minimum(_ other: T) -> Self { +// return Self(value: self.value.minimum(other)) +// } +// +// public func maximum(_ other: T) -> Self { +// return Self(value: self.value.maximum(other)) +// } } //MARK: Act as a Strideable @@ -319,6 +411,4 @@ extension Value where T: Collection { public var count: IndexDistance { return self.value.count } public subscript(i: Index) -> Element { return self.value[i] } public func index(after i: Index) -> Index { return self.value.index(after: i) } - - } diff --git a/Example/Pods/Local Podspecs/ConnectionKit.podspec.json b/Example/Pods/Local Podspecs/ConnectionKit.podspec.json index 443f5ec..a6297c5 100644 --- a/Example/Pods/Local Podspecs/ConnectionKit.podspec.json +++ b/Example/Pods/Local Podspecs/ConnectionKit.podspec.json @@ -1,6 +1,6 @@ { "name": "ConnectionKit", - "version": "2.0", + "version": "2.0.1", "summary": "Abstract possible connections", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/averello/ConnectionKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/averello/ConnectionKit.git", - "tag": "2.0" + "tag": "2.0.1" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Local Podspecs/Ents.podspec.json b/Example/Pods/Local Podspecs/Ents.podspec.json index 00a08d6..b0c270b 100644 --- a/Example/Pods/Local Podspecs/Ents.podspec.json +++ b/Example/Pods/Local Podspecs/Ents.podspec.json @@ -1,6 +1,6 @@ { "name": "Ents", - "version": "2.0", + "version": "2.0.7", "summary": "A collection of handy extensions for Swift.", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/averello/Ents", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/averello/Ents.git", - "tag": "2.0" + "tag": "2.0.7" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Local Podspecs/RepresentationKit.podspec.json b/Example/Pods/Local Podspecs/RepresentationKit.podspec.json index 60e917e..2b36edc 100644 --- a/Example/Pods/Local Podspecs/RepresentationKit.podspec.json +++ b/Example/Pods/Local Podspecs/RepresentationKit.podspec.json @@ -1,6 +1,6 @@ { "name": "RepresentationKit", - "version": "1.1.4", + "version": "2.0", "summary": "Create representation of objects.", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/averello/RepresentationKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/averello/RepresentationKit.git", - "tag": "1.1.4" + "tag": "2.0" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 15d195b..16fc6bd 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,13 +1,13 @@ PODS: - CocoaAsyncSocket (7.6.1) - - ConnectionKit (2.0): + - ConnectionKit (2.0.1): - CocoaAsyncSocket - ContentKit - RepresentationKit - ContentKit (2.0): - RepresentationKit - - Ents (2.0) - - RepresentationKit (1.1.4) + - Ents (2.0.7) + - RepresentationKit (2.0) DEPENDENCIES: - CocoaAsyncSocket (from `https://github.com/averello/CocoaAsyncSocket.git`) @@ -39,18 +39,18 @@ CHECKOUT OPTIONS: :commit: 68f8d2d064036e63a8ef788444d23634c126a2c0 :git: https://github.com/averello/ContentKit.git Ents: - :commit: 6f47f341bad8e472b97f0f17194fd70156f49e30 + :commit: 65b2e26e899338ccfe4187de38e6fe5e1e9b61f9 :git: https://github.com/averello/Ents.git RepresentationKit: - :commit: 8fbcb72326485baf98d908595e159c9dbc55dc3d + :commit: fc44c427ad7ee9c41b52248fd237e63a7dc59406 :git: https://github.com/averello/RepresentationKit.git SPEC CHECKSUMS: CocoaAsyncSocket: 7eadd3f59e1a6c84e2aefc93e9ff7b55156fe174 - ConnectionKit: 2da507eb946caacd46b47768eb2dc1c823586eca + ConnectionKit: bc1add031fbf43c665f342512603e130aa6cd3de ContentKit: 1fd3e6e87cee63cc68e728d12bf9c0b764239249 - Ents: 20bc1cb5159647ff4dbbc089fcf7ddce6e8ebacf - RepresentationKit: 1ae7749916ed014403db30f3d38204d7e000dbd1 + Ents: 3f89ec7ba55b0da7dbb6bc1fc3a2f105e9c9f66d + RepresentationKit: 13e70a642c8f6ff8ea045b76cbe7814d443e735d PODFILE CHECKSUM: ee82bb8d3cb52bcbb076ac09ced1042b43940a47 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 64ad09a..25e4395 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -196,7 +196,7 @@ 083F1864DF1E954C79C3F3404E27722B /* ScaledImage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScaledImage.swift; path = ContentKit/Classes/visual/ScaledImage.swift; sourceTree = ""; }; 084A7DBCF62C6237052E71FEAC9CD793 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 095A67D47806BEEE17293811EAA03FB9 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = List.swift; path = Ents/Classes/types/collections/List.swift; sourceTree = ""; }; - 0E966B7B97C09D204616D18B754AD5B2 /* RepresentationKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RepresentationKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0E966B7B97C09D204616D18B754AD5B2 /* RepresentationKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RepresentationKit.framework; path = RepresentationKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0FA64613D08C42FCA40CE6AF6756DD5D /* Value.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Value.swift; path = Ents/Classes/utils/Value.swift; sourceTree = ""; }; 101EB21585EB311FBC24120C5A0EFF3E /* CompileConditionalBlock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompileConditionalBlock.swift; path = Ents/Classes/utils/CompileConditionalBlock/CompileConditionalBlock.swift; sourceTree = ""; }; 11BD7742CB1D059C18BF76664D0BDE18 /* Connection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Connection.swift; sourceTree = ""; }; @@ -208,11 +208,11 @@ 18C8EC524CD1EF76D694B53985DFF010 /* JSONRepresentationBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONRepresentationBuilder.swift; path = RepresentationKit/Classes/Builders/JSONRepresentationBuilder.swift; sourceTree = ""; }; 18ECF4D0437EF62D5BE67FFFD595C630 /* Pods-ConnectionKit_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ConnectionKit_Tests-acknowledgements.markdown"; sourceTree = ""; }; 196B30495DA1A425A3BF5CA9A122EA16 /* Pods-ConnectionKit_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ConnectionKit_Tests-umbrella.h"; sourceTree = ""; }; - 1FC55CBFE27F901944A0C48156B8E60E /* Ents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Ents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1FC55CBFE27F901944A0C48156B8E60E /* Ents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Ents.framework; path = Ents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 20C7B77A8F4301126322DB033ECA991B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 21BF63E40B73F8EC7980D07901A398E6 /* RepresentationKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RepresentationKit-umbrella.h"; sourceTree = ""; }; 22061AE01DF1720CD8ED610BAD3891C7 /* Queue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Queue.swift; path = Ents/Classes/types/collections/Queue.swift; sourceTree = ""; }; - 221D5A97E2046E08D0500ADE2ECF3938 /* Pods-ConnectionKit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-ConnectionKit_Tests.modulemap"; sourceTree = ""; }; + 221D5A97E2046E08D0500ADE2ECF3938 /* Pods-ConnectionKit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ConnectionKit_Tests.modulemap"; sourceTree = ""; }; 245B38AE7781CD8CF798970FE804132C /* UIContent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UIContent.swift; path = ContentKit/Classes/visual/UIContent.swift; sourceTree = ""; }; 25C4971BEEF5D562D67C309057FD8482 /* Pods-ConnectionKit_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ConnectionKit_Tests-resources.sh"; sourceTree = ""; }; 277B47407CD648031E6264BAF7919F6B /* Chronometer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Chronometer.swift; path = Ents/Classes/utils/Chronometer.swift; sourceTree = ""; }; @@ -224,7 +224,7 @@ 2FE2100DB7CF03476913727DF6958898 /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GCDAsyncUdpSocket.m; path = Source/GCD/GCDAsyncUdpSocket.m; sourceTree = ""; }; 3005A1CB67D5A5220F5B216E590C5F7C /* DynamicallyDisablingAudio.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DynamicallyDisablingAudio.swift; path = ContentKit/Classes/audible/DynamicallyDisablingAudio.swift; sourceTree = ""; }; 300BC86B7C99AC9947A7C8B0712E1CCB /* AnyImage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyImage.swift; path = ContentKit/Classes/visual/AnyImage.swift; sourceTree = ""; }; - 31222FDE1CC5DF354977A715EBB3DB9E /* CocoaAsyncSocket.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = CocoaAsyncSocket.modulemap; sourceTree = ""; }; + 31222FDE1CC5DF354977A715EBB3DB9E /* CocoaAsyncSocket.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = CocoaAsyncSocket.modulemap; sourceTree = ""; }; 33AD99BAEBC1FD779CDFA485389433CF /* DoubleExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DoubleExtensions.swift; path = Ents/Classes/extensions/types/numbers/DoubleExtensions.swift; sourceTree = ""; }; 34020262F2C1340DE4AE7C1CB69E054F /* RepresentationKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RepresentationKit-prefix.pch"; sourceTree = ""; }; 3473FBFD295867A480DB5123C17FB899 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; @@ -242,7 +242,7 @@ 4F94647C5414985C40C07FEDF438930E /* TextualContentKey.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TextualContentKey.swift; path = ContentKit/Classes/textual/TextualContentKey.swift; sourceTree = ""; }; 501BDCDE69D424E9E3DA9955F68A90C1 /* DisplayLinkBlock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisplayLinkBlock.swift; path = Ents/Classes/utils/DisplayLinkBlock.swift; sourceTree = ""; }; 516994BF045AD3D2F0859F18614577FF /* AverageCollection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AverageCollection.swift; path = Ents/Classes/types/collections/AverageCollection.swift; sourceTree = ""; }; - 51D6C2FEB41A2F1EF47F9BD3C721029D /* ConnectionKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ConnectionKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 51D6C2FEB41A2F1EF47F9BD3C721029D /* ConnectionKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = ConnectionKit.framework; path = ConnectionKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5564B523261DA1E1E85FA82FFA714461 /* RepresentationKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RepresentationKit.xcconfig; sourceTree = ""; }; 57508228DB05BEF14D89BB2A4D519F27 /* ConnectionKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ConnectionKit-dummy.m"; sourceTree = ""; }; 5E4A6E5AEA116F9305BB5A9CBE733BAB /* Content.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Content.swift; path = ContentKit/Classes/content/Content.swift; sourceTree = ""; }; @@ -251,7 +251,7 @@ 6343AD41F002DE3890D3D966E3C1FBB1 /* AnyText.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyText.swift; path = ContentKit/Classes/textual/AnyText.swift; sourceTree = ""; }; 641FEDAB5433C64A8EFCF9BEE5F79A70 /* DictionaryRepresentationBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DictionaryRepresentationBuilder.swift; path = RepresentationKit/Classes/Builders/DictionaryRepresentationBuilder.swift; sourceTree = ""; }; 67D025EEAA425A38D66361901FD0E2E4 /* CATransform3DExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CATransform3DExtensions.swift; path = Ents/Classes/extensions/geometry/CATransform3DExtensions.swift; sourceTree = ""; }; - 7082750E18996EEC1858D2B540B0E00D /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7082750E18996EEC1858D2B540B0E00D /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CocoaAsyncSocket.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 71FA60605435E94403C1CED337A10BB7 /* ConnectionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConnectionDelegate.swift; sourceTree = ""; }; 7230A5DCAA9988A1B5F3B34F62884F50 /* RangeReplaceableCollectionExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RangeReplaceableCollectionExtensions.swift; path = Ents/Classes/extensions/collections/RangeReplaceableCollectionExtensions.swift; sourceTree = ""; }; 759F3DA6338E92EAB98D80529AF5E8CB /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -268,7 +268,7 @@ 8FF975AD2736BE20DB871AB14A443247 /* Ents-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Ents-prefix.pch"; sourceTree = ""; }; 92618CF32D8551432900A91B52CB648A /* UIImageViewExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UIImageViewExtensions.swift; path = ContentKit/Classes/visual/UIImageViewExtensions.swift; sourceTree = ""; }; 92B53FA04F75CD3AD09D8B52401FCDB7 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 95958E20628BE90CFA2C42DE877A380A /* ArrayRepresentationBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ArrayRepresentationBuilder.swift; path = RepresentationKit/Classes/Builders/ArrayRepresentationBuilder.swift; sourceTree = ""; }; 96BB9E154398A8D343CDC3291F0EB5F3 /* CocoaAsyncSocket.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaAsyncSocket.xcconfig; sourceTree = ""; }; 9926B970FE66C6BC1E0E1B72406F3E82 /* Types.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = ""; }; @@ -281,8 +281,8 @@ A071D5021D9E89911C5C70AF66DE36E2 /* CollectionTypeExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CollectionTypeExtensions.swift; path = Ents/Classes/extensions/collections/CollectionTypeExtensions.swift; sourceTree = ""; }; A1A4E383C1FA6321886575EBD6BF193C /* BinaryFloatingPointExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryFloatingPointExtensions.swift; path = Ents/Classes/extensions/types/numbers/BinaryFloatingPointExtensions.swift; sourceTree = ""; }; A42C93033A40E307D16981CAF9CE7CA2 /* Copying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Copying.swift; path = Ents/Classes/utils/Copying.swift; sourceTree = ""; }; - A62120FAF58777E4F9573FC0BE0CD978 /* RepresentationKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = RepresentationKit.modulemap; sourceTree = ""; }; - A772EDC65B5B91E8DD54EB0C230932CB /* ContentKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = ContentKit.modulemap; sourceTree = ""; }; + A62120FAF58777E4F9573FC0BE0CD978 /* RepresentationKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = RepresentationKit.modulemap; sourceTree = ""; }; + A772EDC65B5B91E8DD54EB0C230932CB /* ContentKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = ContentKit.modulemap; sourceTree = ""; }; AC97C6CEB2F980BFDDE19BC54413BA3D /* ContentKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ContentKit-prefix.pch"; sourceTree = ""; }; AEA90DD28F89A0E3E30E60F9587203B2 /* UIViewExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UIViewExtensions.swift; path = Ents/Classes/extensions/geometry/UIViewExtensions.swift; sourceTree = ""; }; AF2257B19D2FDD7A022156BB3E313BBB /* GCDAsyncSocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GCDAsyncSocket.h; path = Source/GCD/GCDAsyncSocket.h; sourceTree = ""; }; @@ -290,10 +290,10 @@ B4E4464F7A5A0B4834CA2164CBF3AAE4 /* DictionaryExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DictionaryExtension.swift; path = RepresentationKit/Classes/extensions/DictionaryExtension.swift; sourceTree = ""; }; B6EB9B96D03BF9F1274A94401A8AD2A2 /* OptionalExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OptionalExtensions.swift; path = Ents/Classes/extensions/types/OptionalExtensions.swift; sourceTree = ""; }; B95698764FDFAB3957D661E965F38633 /* ContentKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ContentKit-dummy.m"; sourceTree = ""; }; - B9D4BC4490C00B307D47C846409B9BBB /* ConnectionKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = ConnectionKit.modulemap; sourceTree = ""; }; + B9D4BC4490C00B307D47C846409B9BBB /* ConnectionKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = ConnectionKit.modulemap; sourceTree = ""; }; BAC1B32513C8857C22E7868A73AA8551 /* TypedArrayRepresentation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TypedArrayRepresentation.swift; path = RepresentationKit/Classes/Representations/TypedArrayRepresentation.swift; sourceTree = ""; }; BC155B331A6C3D0515968CD184E40AF5 /* TypedArrayRepresentationBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TypedArrayRepresentationBuilder.swift; path = RepresentationKit/Classes/Builders/TypedArrayRepresentationBuilder.swift; sourceTree = ""; }; - BD11406EAFDA33AA61AA13C390966D84 /* Ents.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Ents.modulemap; sourceTree = ""; }; + BD11406EAFDA33AA61AA13C390966D84 /* Ents.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Ents.modulemap; sourceTree = ""; }; BD458399DCB85816A369AE0986D07C62 /* VoidAudio.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VoidAudio.swift; path = ContentKit/Classes/audible/VoidAudio.swift; sourceTree = ""; }; BD76B63396205DAAF040C014F2FE2825 /* CGPointExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CGPointExtensions.swift; path = Ents/Classes/extensions/geometry/CGPointExtensions.swift; sourceTree = ""; }; C07107CD70D7204573B51784BB5C4F62 /* CALayerExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CALayerExtensions.swift; path = Ents/Classes/extensions/geometry/CALayerExtensions.swift; sourceTree = ""; }; @@ -302,7 +302,7 @@ C61617CA95F1C71A6DFE24CB1C90E6FA /* Alarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alarm.swift; path = Ents/Classes/utils/Alarm.swift; sourceTree = ""; }; C7461F8CE6FAD524E5F662FEF2054A53 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CACFE485F8FB25DDB159137185D3225B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CB8CCFD4324404BFF37DCB7FD1E0B884 /* ContentKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ContentKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CB8CCFD4324404BFF37DCB7FD1E0B884 /* ContentKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = ContentKit.framework; path = ContentKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CC4C3B7A423B3BBAB080E99CA76503A0 /* NonEmptyArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NonEmptyArray.swift; path = Ents/Classes/utils/NonEmptyArray.swift; sourceTree = ""; }; CEBD91C7123BF6FB10F7E9DBC90F9F6E /* IntegerExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IntegerExtensions.swift; path = Ents/Classes/extensions/types/numbers/IntegerExtensions.swift; sourceTree = ""; }; CF88679F2D7BAEA388F45F8F9DA4B0AB /* CGAffineTransformExtensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CGAffineTransformExtensions.swift; path = Ents/Classes/extensions/geometry/CGAffineTransformExtensions.swift; sourceTree = ""; }; @@ -328,7 +328,7 @@ EE1FC9648566BFBA7ECEA983480E57FA /* Pods-ConnectionKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ConnectionKit_Tests.debug.xcconfig"; sourceTree = ""; }; F029053B828B368FBCEE6B0E46099EDB /* Pods-ConnectionKit_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ConnectionKit_Tests-dummy.m"; sourceTree = ""; }; F0684FC4049FC5B19DEC526A12304A99 /* Lazy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Lazy.swift; path = Ents/Classes/utils/Lazy.swift; sourceTree = ""; }; - F26F11A8D9C5DCDC91B2799661550FC5 /* Pods_ConnectionKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ConnectionKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F26F11A8D9C5DCDC91B2799661550FC5 /* Pods_ConnectionKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ConnectionKit_Tests.framework; path = "Pods-ConnectionKit_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; F371A803FE0097E4BDA84EBFD168C8AB /* Weak.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Weak.swift; path = Ents/Classes/utils/Weak.swift; sourceTree = ""; }; F549A3C04A25230893DE684C1C49D849 /* ConnectionKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ConnectionKit-umbrella.h"; sourceTree = ""; }; F63E9ADCC1475783C21FE264A0823AB3 /* TextualRepresentation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TextualRepresentation.swift; path = ContentKit/Classes/textual/TextualRepresentation.swift; sourceTree = ""; }; @@ -530,6 +530,7 @@ F371A803FE0097E4BDA84EBFD168C8AB /* Weak.swift */, 2C875D13B0D9FDB5063ACC0D172A671E /* Support Files */, ); + name = Ents; path = Ents; sourceTree = ""; }; @@ -554,6 +555,7 @@ 2FE2100DB7CF03476913727DF6958898 /* GCDAsyncUdpSocket.m */, 01A974E3C9CF90D53E50FC22EA4C96A6 /* Support Files */, ); + name = CocoaAsyncSocket; path = CocoaAsyncSocket; sourceTree = ""; }; @@ -594,6 +596,7 @@ BC155B331A6C3D0515968CD184E40AF5 /* TypedArrayRepresentationBuilder.swift */, DC4186AD8CD3BB322380E68ED6546110 /* Support Files */, ); + name = RepresentationKit; path = RepresentationKit; sourceTree = ""; }; @@ -604,6 +607,7 @@ 71FA60605435E94403C1CED337A10BB7 /* ConnectionDelegate.swift */, 9EE3585FBB94F0D3ACA27EA86315C373 /* ConnectionErrorDelegate.swift */, ); + name = Protocols; path = Protocols; sourceTree = ""; }; @@ -620,6 +624,7 @@ children = ( D66E84E960EA2843D7F58368F8D09B9A /* Classes */, ); + name = ConnectionKit; path = ConnectionKit; sourceTree = ""; }; @@ -631,6 +636,7 @@ 9926B970FE66C6BC1E0E1B72406F3E82 /* Types.swift */, B4FABFC939552FACA6855C1B698EFC57 /* Protocols */, ); + name = Classes; path = Classes; sourceTree = ""; }; @@ -660,6 +666,7 @@ BD458399DCB85816A369AE0986D07C62 /* VoidAudio.swift */, 2367371A163407525DA001789C7AFAEC /* Support Files */, ); + name = ContentKit; path = ContentKit; sourceTree = ""; }; @@ -890,20 +897,6 @@ attributes = { LastSwiftUpdateCheck = 0830; LastUpgradeCheck = 0700; - TargetAttributes = { - 0493348A506ADD47301A4CD53D28DA69 = { - LastSwiftMigration = 0900; - }; - 474BAD16F5DEE20FC6E33B41EBFB9D30 = { - LastSwiftMigration = 0900; - }; - 75E80FE2281D3177E22D8DA8AEC5E07B = { - LastSwiftMigration = 0900; - }; - F8177030F874D53008556EE8BCBD11AC = { - LastSwiftMigration = 0900; - }; - }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -1126,42 +1119,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 096D8D40F78703DE33B81C2A4A301221 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 61E264137EEFE9B9C8E75CA4F35B9C3F /* Ents.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Ents/Ents-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Ents/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/Ents/Ents.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = Ents; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; 19E09CE44113E485A1FE869C50D5E0AB /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = EE1FC9648566BFBA7ECEA983480E57FA /* Pods-ConnectionKit_Tests.debug.xcconfig */; @@ -1201,9 +1158,9 @@ }; name = Debug; }; - 1A37D63153A464E344962373348B4545 /* Release */ = { + 1ADBE2060612F6E725D351DADA9C1BEB /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 96BB9E154398A8D343CDC3291F0EB5F3 /* CocoaAsyncSocket.xcconfig */; + baseConfigurationReference = 5564B523261DA1E1E85FA82FFA714461 /* RepresentationKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1217,24 +1174,25 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/CocoaAsyncSocket/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/RepresentationKit/RepresentationKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RepresentationKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.modulemap"; + MODULEMAP_FILE = "Target Support Files/RepresentationKit/RepresentationKit.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = CocoaAsyncSocket; + PRODUCT_NAME = RepresentationKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 26C54C617F13839BA7BDCED36556AA3B /* Debug */ = { + 2FD424E87B4E36C14562E27CB977092F /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 96BB9E154398A8D343CDC3291F0EB5F3 /* CocoaAsyncSocket.xcconfig */; buildSettings = { @@ -1260,7 +1218,7 @@ PRODUCT_NAME = CocoaAsyncSocket; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1311,9 +1269,9 @@ }; name = Release; }; - 437617FCA96E53AABC44775A0F72B7D0 /* Debug */ = { + 451E88049591994E9A57EB54C54E7C24 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C196A09EF4012ED62C13571FF7BECAB4 /* ConnectionKit.xcconfig */; + baseConfigurationReference = 5564B523261DA1E1E85FA82FFA714461 /* RepresentationKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1327,19 +1285,18 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/ConnectionKit/ConnectionKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ConnectionKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/RepresentationKit/RepresentationKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RepresentationKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ConnectionKit/ConnectionKit.modulemap"; + MODULEMAP_FILE = "Target Support Files/RepresentationKit/RepresentationKit.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = ConnectionKit; + PRODUCT_NAME = RepresentationKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1347,9 +1304,9 @@ }; name = Debug; }; - 64D9816DCD56B7929206B1F84863B9C5 /* Release */ = { + 4C6CF19E0C4259844B91FBCCC34E3C57 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 61E264137EEFE9B9C8E75CA4F35B9C3F /* Ents.xcconfig */; + baseConfigurationReference = C196A09EF4012ED62C13571FF7BECAB4 /* ConnectionKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1363,18 +1320,51 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Ents/Ents-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Ents/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/ConnectionKit/ConnectionKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ConnectionKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/Ents/Ents.modulemap"; + MODULEMAP_FILE = "Target Support Files/ConnectionKit/ConnectionKit.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = Ents; + PRODUCT_NAME = ConnectionKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 4DAF8E9C482E2892D84FA60FA6342174 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 126AD347023BE805E915F12441A74EA9 /* ContentKit.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREFIX_HEADER = "Target Support Files/ContentKit/ContentKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ContentKit/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/ContentKit/ContentKit.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = ContentKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1420,9 +1410,44 @@ }; name = Release; }; - 7FDC7CD3C27137BA62D458E200452B61 /* Release */ = { + 80E30E5301EF8F43DE910DEF0B0224A7 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 126AD347023BE805E915F12441A74EA9 /* ContentKit.xcconfig */; + baseConfigurationReference = 61E264137EEFE9B9C8E75CA4F35B9C3F /* Ents.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREFIX_HEADER = "Target Support Files/Ents/Ents-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Ents/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/Ents/Ents.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = Ents; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + A88F45C66290C36A348E2C613657A73F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 96BB9E154398A8D343CDC3291F0EB5F3 /* CocoaAsyncSocket.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1436,18 +1461,16 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/ContentKit/ContentKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ContentKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/CocoaAsyncSocket/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ContentKit/ContentKit.modulemap"; + MODULEMAP_FILE = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = ContentKit; + PRODUCT_NAME = CocoaAsyncSocket; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1455,7 +1478,41 @@ }; name = Release; }; - 98E55F5433A176013285C51570053DB2 /* Release */ = { + A98CF5F6B1414AF7EABE2266FDBF65E1 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 61E264137EEFE9B9C8E75CA4F35B9C3F /* Ents.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREFIX_HEADER = "Target Support Files/Ents/Ents-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Ents/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/Ents/Ents.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = Ents; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + B5340CFAA655BF6DD633CCDF525DF64D /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = C196A09EF4012ED62C13571FF7BECAB4 /* ConnectionKit.xcconfig */; buildSettings = { @@ -1464,7 +1521,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1477,84 +1534,12 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/ConnectionKit/ConnectionKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; + MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = ConnectionKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - A6BAE6753C85A044AEADA7E4749E9A86 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 126AD347023BE805E915F12441A74EA9 /* ContentKit.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/ContentKit/ContentKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ContentKit/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ContentKit/ContentKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = ContentKit; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - BE5901BA08F2E9A711611C23101052ED /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5564B523261DA1E1E85FA82FFA714461 /* RepresentationKit.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/RepresentationKit/RepresentationKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RepresentationKit/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RepresentationKit/RepresentationKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = RepresentationKit; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1610,40 +1595,40 @@ }; name = Debug; }; - E2AF62655E7F34D7AD8D69E001F09117 /* Release */ = { + FDC4E2503FDBDC983A04033D46571DBA /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5564B523261DA1E1E85FA82FFA714461 /* RepresentationKit.xcconfig */; + baseConfigurationReference = 126AD347023BE805E915F12441A74EA9 /* ContentKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/RepresentationKit/RepresentationKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RepresentationKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/ContentKit/ContentKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ContentKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RepresentationKit/RepresentationKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = RepresentationKit; + MODULEMAP_FILE = "Target Support Files/ContentKit/ContentKit.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = ContentKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; /* End XCBuildConfiguration section */ @@ -1669,8 +1654,8 @@ 6D862A631803D39FA01ADD9902132DF3 /* Build configuration list for PBXNativeTarget "ConnectionKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 437617FCA96E53AABC44775A0F72B7D0 /* Debug */, - 98E55F5433A176013285C51570053DB2 /* Release */, + B5340CFAA655BF6DD633CCDF525DF64D /* Debug */, + 4C6CF19E0C4259844B91FBCCC34E3C57 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1678,8 +1663,8 @@ B8F705263F80C6D9B02DEDCAB96C8A33 /* Build configuration list for PBXNativeTarget "Ents" */ = { isa = XCConfigurationList; buildConfigurations = ( - 096D8D40F78703DE33B81C2A4A301221 /* Debug */, - 64D9816DCD56B7929206B1F84863B9C5 /* Release */, + 80E30E5301EF8F43DE910DEF0B0224A7 /* Debug */, + A98CF5F6B1414AF7EABE2266FDBF65E1 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1687,8 +1672,8 @@ C760B1AADE98905EDE77A3BFEE7B67AD /* Build configuration list for PBXNativeTarget "RepresentationKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - BE5901BA08F2E9A711611C23101052ED /* Debug */, - E2AF62655E7F34D7AD8D69E001F09117 /* Release */, + 451E88049591994E9A57EB54C54E7C24 /* Debug */, + 1ADBE2060612F6E725D351DADA9C1BEB /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1696,8 +1681,8 @@ D8C097E51F611D86488AD03D637FB8D3 /* Build configuration list for PBXNativeTarget "ContentKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - A6BAE6753C85A044AEADA7E4749E9A86 /* Debug */, - 7FDC7CD3C27137BA62D458E200452B61 /* Release */, + FDC4E2503FDBDC983A04033D46571DBA /* Debug */, + 4DAF8E9C482E2892D84FA60FA6342174 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1705,8 +1690,8 @@ F2A03B912F777B2BFB05E7B9E903B15F /* Build configuration list for PBXNativeTarget "CocoaAsyncSocket" */ = { isa = XCConfigurationList; buildConfigurations = ( - 26C54C617F13839BA7BDCED36556AA3B /* Debug */, - 1A37D63153A464E344962373348B4545 /* Release */, + 2FD424E87B4E36C14562E27CB977092F /* Debug */, + A88F45C66290C36A348E2C613657A73F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Target Support Files/ConnectionKit/Info.plist b/Example/Pods/Target Support Files/ConnectionKit/Info.plist index 0a12077..bdac57c 100644 --- a/Example/Pods/Target Support Files/ConnectionKit/Info.plist +++ b/Example/Pods/Target Support Files/ConnectionKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.0 + 2.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/Ents/Info.plist b/Example/Pods/Target Support Files/Ents/Info.plist index 0a12077..4fcad82 100644 --- a/Example/Pods/Target Support Files/Ents/Info.plist +++ b/Example/Pods/Target Support Files/Ents/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.0 + 2.0.7 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/RepresentationKit/Info.plist b/Example/Pods/Target Support Files/RepresentationKit/Info.plist index 02abef5..0a12077 100644 --- a/Example/Pods/Target Support Files/RepresentationKit/Info.plist +++ b/Example/Pods/Target Support Files/RepresentationKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.4 + 2.0.0 CFBundleSignature ???? CFBundleVersion