From 5c775d5b1a43fd4213906d22101fc4f718ff34c5 Mon Sep 17 00:00:00 2001 From: merlos Date: Fri, 2 Oct 2020 20:07:30 -0400 Subject: [PATCH 01/20] change zoom for overZoom type --- MapCache/Classes/CachedTileOverlay.swift | 3 +-- MapCache/Classes/ZoomableTile.swift | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/MapCache/Classes/CachedTileOverlay.swift b/MapCache/Classes/CachedTileOverlay.swift index a2db93a..8695451 100644 --- a/MapCache/Classes/CachedTileOverlay.swift +++ b/MapCache/Classes/CachedTileOverlay.swift @@ -76,7 +76,6 @@ open class CachedTileOverlay : MKTileOverlay { let tileSize = mapCache.config.tileSize var z = scale.toZoomLevel(tileSize: tileSize) - // Represents the number of tiles the current tile is going to be divided var overZoom = 1 let tileSetMaxZ = mapCache.config.maximumZ if (z > tileSetMaxZ) { @@ -105,7 +104,7 @@ open class CachedTileOverlay : MKTileOverlay { guard rect.intersects(tileRect) else { continue } let path = MKTileOverlayPath(x: x, y: y, z: z, contentScaleFactor: scale) - let tile = ZoomableTile(maximumZPath: path, rect: tileRect, overZoom: Zoom(overZoom)) + let tile = ZoomableTile(maximumZPath: path, rect: tileRect, overZoom: overZoom) tiles.append(tile) } } diff --git a/MapCache/Classes/ZoomableTile.swift b/MapCache/Classes/ZoomableTile.swift index 35729b7..f0c1a60 100644 --- a/MapCache/Classes/ZoomableTile.swift +++ b/MapCache/Classes/ZoomableTile.swift @@ -23,6 +23,6 @@ public struct ZoomableTile { /// Delta from given tile z to desired tile z. /// Example: maximum zoom supported by the server is 20 and the desired tile is in zoom level 24, the delta is 4. - let overZoom: Zoom + let overZoom: Int } From 5b88173a3991057b1c927719d29c09514f693c0c Mon Sep 17 00:00:00 2001 From: merlos Date: Fri, 2 Oct 2020 20:27:32 -0400 Subject: [PATCH 02/20] Upgraded nimble and quick Pods to support Swift 5.3 and Xcode 12 --- Example/MapCache.xcodeproj/project.pbxproj | 6 +- Example/Podfile | 4 +- Example/Podfile.lock | 20 +- .../Pods/Local Podspecs/MapCache.podspec.json | 13 +- Example/Pods/Manifest.lock | 20 +- .../CwlCatchException/CwlCatchException.swift | 6 +- .../CwlCatchException.m | 7 +- .../include/CwlCatchException.h | 13 +- .../CwlMachBadInstructionHandler.m | 61 +- .../include/CwlMachBadInstructionHandler.h | 10 +- .../mach_excServer.c | 7 +- .../mach_excServer.h | 8 + .../CwlBadInstructionException.swift | 84 +- .../CwlCatchBadInstruction.swift | 304 +-- .../CwlDarwinDefinitions.swift | 62 +- .../Mach/CwlPreconditionTesting.h | 32 - Example/Pods/Nimble/README.md | 113 +- .../Nimble/Adapters/AdapterProtocols.swift | 2 - .../Nimble/Adapters/AssertionRecorder.swift | 2 - .../Nimble/Adapters/NMBExpectation.swift | 116 +- .../Nimble/Adapters/NMBObjCMatcher.swift | 4 +- .../Nimble/Adapters/NimbleEnvironment.swift | 3 +- .../Nimble/Adapters/NimbleXCTestHandler.swift | 4 +- .../Pods/Nimble/Sources/Nimble/DSL+Wait.swift | 28 +- Example/Pods/Nimble/Sources/Nimble/DSL.swift | 80 +- .../Nimble/Sources/Nimble/Expectation.swift | 33 +- .../Sources/Nimble/ExpectationMessage.swift | 19 +- .../Nimble/Sources/Nimble/Expression.swift | 6 +- .../Sources/Nimble/Matchers/AllPass.swift | 107 +- .../Sources/Nimble/Matchers/Async.swift | 24 +- .../Sources/Nimble/Matchers/BeAKindOf.swift | 15 +- .../Nimble/Matchers/BeAnInstanceOf.swift | 8 +- .../Sources/Nimble/Matchers/BeCloseTo.swift | 89 +- .../Sources/Nimble/Matchers/BeEmpty.swift | 47 +- .../Nimble/Matchers/BeGreaterThan.swift | 25 +- .../Matchers/BeGreaterThanOrEqualTo.swift | 26 +- .../Nimble/Matchers/BeIdenticalTo.swift | 36 +- .../Sources/Nimble/Matchers/BeLessThan.swift | 25 +- .../Nimble/Matchers/BeLessThanOrEqual.swift | 25 +- .../Sources/Nimble/Matchers/BeLogical.swift | 10 +- .../Sources/Nimble/Matchers/BeNil.swift | 8 +- .../Sources/Nimble/Matchers/BeVoid.swift | 2 - .../Sources/Nimble/Matchers/BeginWith.swift | 23 +- .../Nimble/Matchers/BeginWithPrefix.swift | 39 + .../Sources/Nimble/Matchers/Contain.swift | 94 +- .../Matchers/ContainElementSatisfying.swift | 57 +- .../Nimble/Matchers/ElementsEqual.swift | 32 +- .../Sources/Nimble/Matchers/EndWith.swift | 36 +- .../Sources/Nimble/Matchers/Equal.swift | 10 +- .../Sources/Nimble/Matchers/HaveCount.swift | 14 +- .../Sources/Nimble/Matchers/Match.swift | 18 +- .../Sources/Nimble/Matchers/MatchError.swift | 20 +- .../Sources/Nimble/Matchers/MatcherFunc.swift | 6 +- .../Nimble/Matchers/MatcherProtocols.swift | 14 +- .../Nimble/Matchers/PostNotification.swift | 122 +- .../Sources/Nimble/Matchers/Predicate.swift | 46 +- .../Nimble/Matchers/RaisesException.swift | 252 +- .../Nimble/Matchers/SatisfyAllOf.swift | 13 +- .../Nimble/Matchers/SatisfyAnyOf.swift | 15 +- .../Nimble/Matchers/ThrowAssertion.swift | 16 +- .../Sources/Nimble/Matchers/ThrowError.swift | 55 +- .../Sources/Nimble/Matchers/ToSucceed.swift | 4 +- Example/Pods/Nimble/Sources/Nimble/Nimble.h | 7 +- .../Nimble/Sources/Nimble/Utils/Await.swift | 42 +- .../Nimble/Utils/DispatchTimeInterval.swift | 41 + .../Nimble/Sources/Nimble/Utils/Errors.swift | 44 +- .../Sources/Nimble/Utils/Functional.swift | 14 - .../Sources/Nimble/Utils/Stringers.swift | 41 +- .../Nimble/Sources/NimbleObjectiveC/DSL.h | 132 +- .../Nimble/Sources/NimbleObjectiveC/DSL.m | 104 +- .../XCTestObservationCenter+Register.m | 68 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 2190 +++++++++-------- Example/Pods/Quick/README.md | 5 +- .../Pods/Quick/Sources/Quick/Behavior.swift | 14 +- .../Pods/Quick/Sources/Quick/Callsite.swift | 4 +- .../Quick/Configuration/Configuration.swift | 40 +- .../Configuration/QuickConfiguration.swift | 78 + .../Pods/Quick/Sources/Quick/DSL/DSL.swift | 14 +- .../Quick/Sources/Quick/DSL/World+DSL.swift | 29 +- .../Pods/Quick/Sources/Quick/Example.swift | 40 +- .../Quick/Sources/Quick/ExampleGroup.swift | 7 + .../Quick/Sources/Quick/ExampleMetadata.swift | 4 +- Example/Pods/Quick/Sources/Quick/Filter.swift | 4 +- .../Sources/Quick/QuickTestObservation.swift | 69 + .../Quick/String+C99ExtendedIdentifier.swift | 2 +- Example/Pods/Quick/Sources/Quick/World.swift | 58 +- .../QuickSpecBase.m | 27 +- .../QuickObjCRuntime/include/QuickSpecBase.h | 7 + .../Configuration/QuickConfiguration.m | 45 +- .../Quick/Sources/QuickObjectiveC/QuickSpec.m | 92 +- .../QuickSpecBase/include/QuickSpecBase.h | 11 - .../MapCache/MapCache-Info.plist | 2 +- .../MapCache/MapCache.xcconfig | 2 +- .../Nimble/Nimble-Info.plist | 2 +- .../Nimble/Nimble-umbrella.h | 1 - .../Nimble/Nimble.xcconfig | 2 + ...MapCache_Example-acknowledgements.markdown | 2 +- ...ds-MapCache_Example-acknowledgements.plist | 2 +- .../Pods-MapCache_Example.debug.xcconfig | 2 +- .../Pods-MapCache_Example.release.xcconfig | 2 +- .../Pods-MapCache_Tests.debug.xcconfig | 2 +- .../Pods-MapCache_Tests.release.xcconfig | 2 +- .../Quick/Quick-Info.plist | 2 +- .../Target Support Files/Quick/Quick.xcconfig | 1 + 104 files changed, 3093 insertions(+), 2564 deletions(-) delete mode 100644 Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h create mode 100644 Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWithPrefix.swift create mode 100644 Example/Pods/Nimble/Sources/Nimble/Utils/DispatchTimeInterval.swift delete mode 100644 Example/Pods/Nimble/Sources/Nimble/Utils/Functional.swift create mode 100644 Example/Pods/Quick/Sources/Quick/Configuration/QuickConfiguration.swift create mode 100644 Example/Pods/Quick/Sources/Quick/QuickTestObservation.swift rename Example/Pods/Quick/Sources/{QuickSpecBase => QuickObjCRuntime}/QuickSpecBase.m (60%) create mode 100644 Example/Pods/Quick/Sources/QuickObjCRuntime/include/QuickSpecBase.h delete mode 100644 Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h diff --git a/Example/MapCache.xcodeproj/project.pbxproj b/Example/MapCache.xcodeproj/project.pbxproj index f2e5133..97c51eb 100644 --- a/Example/MapCache.xcodeproj/project.pbxproj +++ b/Example/MapCache.xcodeproj/project.pbxproj @@ -485,9 +485,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -534,8 +535,9 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALIDATE_PRODUCT = YES; diff --git a/Example/Podfile b/Example/Podfile index 2aac31f..f6bc1b3 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -6,7 +6,7 @@ target 'MapCache_Example' do target 'MapCache_Tests' do inherit! :search_paths pod 'OHHTTPStubs/Swift','~> 8.0.0' - pod 'Quick', '~> 2.1.0' - pod 'Nimble', '~> 8.0.1' + pod 'Quick', '~> 3.0.0' + pod 'Nimble', '~> 9.0.0-rc.3' end end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 53510c9..5018517 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,6 +1,6 @@ PODS: - - MapCache (0.6.0) - - Nimble (8.0.1) + - MapCache (0.8.2) + - Nimble (9.0.0-rc.3) - OHHTTPStubs/Core (8.0.0) - OHHTTPStubs/Default (8.0.0): - OHHTTPStubs/Core @@ -14,13 +14,13 @@ PODS: - OHHTTPStubs/OHPathHelpers (8.0.0) - OHHTTPStubs/Swift (8.0.0): - OHHTTPStubs/Default - - Quick (2.1.0) + - Quick (3.0.0) DEPENDENCIES: - MapCache (from `../`) - - Nimble (~> 8.0.1) - - OHHTTPStubs/Swift - - Quick (~> 2.1.0) + - Nimble (~> 9.0.0-rc.3) + - OHHTTPStubs/Swift (~> 8.0.0) + - Quick (~> 3.0.0) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -33,11 +33,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - MapCache: 8afa98ddc3539a384ba75b019284cded95aaccab - Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0 + MapCache: 8aba59bb2231af79c2b07a7b2c303d3c63b5f291 + Nimble: 1b5fa99320d0d87ed72bb0add38dc696aa77f556 OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881 - Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d + Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2 -PODFILE CHECKSUM: f633177aab625c73613530f877c4d12c4a305fa7 +PODFILE CHECKSUM: 7457c5aa836f6afd21c0dbf4a82325af9b183e31 COCOAPODS: 1.7.5 diff --git a/Example/Pods/Local Podspecs/MapCache.podspec.json b/Example/Pods/Local Podspecs/MapCache.podspec.json index 244e43d..0101544 100644 --- a/Example/Pods/Local Podspecs/MapCache.podspec.json +++ b/Example/Pods/Local Podspecs/MapCache.podspec.json @@ -1,6 +1,6 @@ { "name": "MapCache", - "version": "0.6.0", + "version": "0.8.2", "summary": "Map caching for iOS. Support offline maps in your app.", "description": "Cache for iOS applications for supporting offline tile maps. Downloads and keeps tiles in disk as user browses the map. Also, it can download a complete area at all different zoom levels for a complete offline experience (beta).\u0013", "homepage": "https://github.com/merlos/MapCache", @@ -13,16 +13,17 @@ }, "source": { "git": "https://github.com/merlos/MapCache.git", - "tag": "0.6.0" + "tag": "0.8.2" }, "social_media_url": "https://twitter.com/merlos", - "platforms": { - "ios": "8.0" - }, "swift_versions": "5.0", "source_files": "MapCache/Classes/**/*", + "platforms": { + "ios": "8.0", + "osx": "10.10" + }, "frameworks": [ - "UIKit", + "Foundation", "MapKit" ], "swift_version": "5.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 53510c9..5018517 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,6 +1,6 @@ PODS: - - MapCache (0.6.0) - - Nimble (8.0.1) + - MapCache (0.8.2) + - Nimble (9.0.0-rc.3) - OHHTTPStubs/Core (8.0.0) - OHHTTPStubs/Default (8.0.0): - OHHTTPStubs/Core @@ -14,13 +14,13 @@ PODS: - OHHTTPStubs/OHPathHelpers (8.0.0) - OHHTTPStubs/Swift (8.0.0): - OHHTTPStubs/Default - - Quick (2.1.0) + - Quick (3.0.0) DEPENDENCIES: - MapCache (from `../`) - - Nimble (~> 8.0.1) - - OHHTTPStubs/Swift - - Quick (~> 2.1.0) + - Nimble (~> 9.0.0-rc.3) + - OHHTTPStubs/Swift (~> 8.0.0) + - Quick (~> 3.0.0) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -33,11 +33,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - MapCache: 8afa98ddc3539a384ba75b019284cded95aaccab - Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0 + MapCache: 8aba59bb2231af79c2b07a7b2c303d3c63b5f291 + Nimble: 1b5fa99320d0d87ed72bb0add38dc696aa77f556 OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881 - Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d + Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2 -PODFILE CHECKSUM: f633177aab625c73613530f877c4d12c4a305fa7 +PODFILE CHECKSUM: 7457c5aa836f6afd21c0dbf4a82325af9b183e31 COCOAPODS: 1.7.5 diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift b/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift index 3e89e23..2cb9b29 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift @@ -3,7 +3,7 @@ // CwlAssertionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -24,12 +24,12 @@ import Foundation import CwlCatchExceptionSupport #endif -private func catchReturnTypeConverter(_ type: T.Type, block: () -> Void) -> T? { +private func catchReturnTypeConverter(_ type: T.Type, block: @escaping () -> Void) -> T? { return catchExceptionOfKind(type, block) as? T } extension NSException { - public static func catchException(in block: () -> Void) -> Self? { + public static func catchException(in block: @escaping () -> Void) -> Self? { return catchReturnTypeConverter(self, block: block) } } diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m b/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m index 8cf414f..ff35465 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m @@ -3,7 +3,7 @@ // CwlAssertionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -20,10 +20,7 @@ #import "CwlCatchException.h" -#if !SWIFT_PACKAGE && NON_SWIFT_PACKAGE -__attribute__((visibility("hidden"))) -#endif -NSException* catchExceptionOfKind(Class __nonnull type, __attribute__((noescape)) void (^ __nonnull inBlock)(void)) { +NSException* __nullable catchExceptionOfKind(Class __nonnull type, void (^ __nonnull inBlock)(void)) { @try { inBlock(); } @catch (NSException *exception) { diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h b/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h index 0c8dd87..eb42378 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h @@ -3,7 +3,7 @@ // CwlCatchException // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -20,13 +20,4 @@ #import -//! Project version number for CwlCatchException. -FOUNDATION_EXPORT double CwlCatchExceptionVersionNumber; - -//! Project version string for CwlCatchException. -FOUNDATION_EXPORT const unsigned char CwlCatchExceptionVersionString[]; - -#if !SWIFT_PACKAGE && NON_SWIFT_PACKAGE -__attribute__((visibility("hidden"))) -#endif -NSException* __nullable catchExceptionOfKind(Class __nonnull type, __attribute__((noescape)) void (^ __nonnull inBlock)(void)); +NSException* __nullable catchExceptionOfKind(Class __nonnull type, void (^ __nonnull inBlock)(void)); diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m index 8183196..2ab0ea5 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m @@ -3,7 +3,7 @@ // CwlPreconditionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -18,33 +18,36 @@ // IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // -#if defined(__x86_64__) +#ifdef __APPLE__ +#import "TargetConditionals.h" +#if TARGET_OS_OSX || TARGET_OS_IOS - #import "mach_excServer.h" - #import "CwlMachBadInstructionHandler.h" - - @protocol BadInstructionReply - +(NSNumber *)receiveReply:(NSValue *)value; - @end - - /// A basic function that receives callbacks from mach_exc_server and relays them to the Swift implemented BadInstructionException.catch_mach_exception_raise_state. - kern_return_t catch_mach_exception_raise_state(mach_port_t exception_port, exception_type_t exception, const mach_exception_data_t code, mach_msg_type_number_t codeCnt, int *flavor, const thread_state_t old_state, mach_msg_type_number_t old_stateCnt, thread_state_t new_state, mach_msg_type_number_t *new_stateCnt) { - bad_instruction_exception_reply_t reply = { exception_port, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt }; - Class badInstructionClass = NSClassFromString(@"BadInstructionException"); - NSValue *value = [NSValue valueWithBytes: &reply objCType: @encode(bad_instruction_exception_reply_t)]; - return [[badInstructionClass performSelector: @selector(receiveReply:) withObject: value] intValue]; - } - - // The mach port should be configured so that this function is never used. - kern_return_t catch_mach_exception_raise(mach_port_t exception_port, mach_port_t thread, mach_port_t task, exception_type_t exception, mach_exception_data_t code, mach_msg_type_number_t codeCnt) { - assert(false); - return KERN_FAILURE; - } - - // The mach port should be configured so that this function is never used. - kern_return_t catch_mach_exception_raise_state_identity(mach_port_t exception_port, mach_port_t thread, mach_port_t task, exception_type_t exception, mach_exception_data_t code, mach_msg_type_number_t codeCnt, int *flavor, thread_state_t old_state, mach_msg_type_number_t old_stateCnt, thread_state_t new_state, mach_msg_type_number_t *new_stateCnt) { - assert(false); - return KERN_FAILURE; - } +#import "mach_excServer.h" +#import "CwlMachBadInstructionHandler.h" + +@protocol BadInstructionReply ++(NSNumber *)receiveReply:(NSValue *)value; +@end + +/// A basic function that receives callbacks from mach_exc_server and relays them to the Swift implemented BadInstructionException.catch_mach_exception_raise_state. +kern_return_t catch_mach_exception_raise_state(mach_port_t exception_port, exception_type_t exception, const mach_exception_data_t code, mach_msg_type_number_t codeCnt, int *flavor, const thread_state_t old_state, mach_msg_type_number_t old_stateCnt, thread_state_t new_state, mach_msg_type_number_t *new_stateCnt) { + bad_instruction_exception_reply_t reply = { exception_port, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt }; + Class badInstructionClass = NSClassFromString(@"BadInstructionException"); + NSValue *value = [NSValue valueWithBytes: &reply objCType: @encode(bad_instruction_exception_reply_t)]; + return [[badInstructionClass performSelector: @selector(receiveReply:) withObject: value] intValue]; +} + +// The mach port should be configured so that this function is never used. +kern_return_t catch_mach_exception_raise(mach_port_t exception_port, mach_port_t thread, mach_port_t task, exception_type_t exception, mach_exception_data_t code, mach_msg_type_number_t codeCnt) { + assert(false); + return KERN_FAILURE; +} + +// The mach port should be configured so that this function is never used. +kern_return_t catch_mach_exception_raise_state_identity(mach_port_t exception_port, mach_port_t thread, mach_port_t task, exception_type_t exception, mach_exception_data_t code, mach_msg_type_number_t codeCnt, int *flavor, thread_state_t old_state, mach_msg_type_number_t old_stateCnt, thread_state_t new_state, mach_msg_type_number_t *new_stateCnt) { + assert(false); + return KERN_FAILURE; +} -#endif +#endif /* TARGET_OS_OSX || TARGET_OS_IOS */ +#endif /* __APPLE__ */ diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h index aef59c2..3fbd5a4 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h @@ -3,7 +3,7 @@ // CwlPreconditionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -19,8 +19,14 @@ // #import + +#if TARGET_OS_OSX || TARGET_OS_IOS + #import +extern bool _swift_disableExclusivityChecking; +extern bool _swift_reportFatalErrorsToDebugger; + NS_ASSUME_NONNULL_BEGIN extern boolean_t mach_exc_server(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP); @@ -68,3 +74,5 @@ typedef struct } bad_instruction_exception_reply_t; NS_ASSUME_NONNULL_END + +#endif diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c index 733c564..ccd8f84 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c @@ -5,13 +5,12 @@ * OPTIONS: */ -#if defined(__x86_64__) - /* Module mach_exc */ #define __MIG_check__Request__mach_exc_subsystem__ 1 -#include "mach_excServer.h" +#import "mach_excServer.h" +#if TARGET_OS_OSX || TARGET_OS_IOS #ifndef mig_internal #define mig_internal static __inline__ @@ -534,4 +533,4 @@ mig_external mig_routine_t mach_exc_server_routine return catch_mach_exc_subsystem.routine[msgh_id].stub_routine; } -#endif +#endif /* TARGET_OS_OSX || TARGET_OS_IOS */ diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h index 52e53ae..1f03d66 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h @@ -1,9 +1,14 @@ +#ifdef __APPLE__ +#import "TargetConditionals.h" +#if TARGET_OS_OSX || TARGET_OS_IOS + #ifndef _mach_exc_server_ #define _mach_exc_server_ /* Module mach_exc */ #include + #include #include #include @@ -319,3 +324,6 @@ __AfterMigServerHeader #endif /* __AfterMigServerHeader */ #endif /* _mach_exc_server_ */ + +#endif /* TARGET_OS_OSX || TARGET_OS_IOS */ +#endif /* __APPLE__ */ diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift index 91e5d4d..90ee022 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift @@ -3,7 +3,7 @@ // CwlPreconditionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -18,6 +18,8 @@ // IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // +#if (os(macOS) || os(iOS)) && arch(x86_64) + import Foundation #if SWIFT_PACKAGE @@ -44,46 +46,44 @@ public class BadInstructionException: NSException { /// An Objective-C callable function, invoked from the `mach_exc_server` callback function `catch_mach_exception_raise_state` to push the `raiseBadInstructionException` function onto the stack. @objc(receiveReply:) public class func receiveReply(_ value: NSValue) -> NSNumber { - #if arch(x86_64) - var reply = bad_instruction_exception_reply_t(exception_port: 0, exception: 0, code: nil, codeCnt: 0, flavor: nil, old_state: nil, old_stateCnt: 0, new_state: nil, new_stateCnt: nil) - withUnsafeMutablePointer(to: &reply) { value.getValue(UnsafeMutableRawPointer($0)) } - - let old_state: UnsafePointer = reply.old_state! - let old_stateCnt: mach_msg_type_number_t = reply.old_stateCnt - let new_state: thread_state_t = reply.new_state! - let new_stateCnt: UnsafeMutablePointer = reply.new_stateCnt! - - // Make sure we've been given enough memory - if old_stateCnt != x86_THREAD_STATE64_COUNT || new_stateCnt.pointee < x86_THREAD_STATE64_COUNT { - return NSNumber(value: KERN_INVALID_ARGUMENT) - } - - // Read the old thread state - var state = old_state.withMemoryRebound(to: x86_thread_state64_t.self, capacity: 1) { return $0.pointee } - - // 1. Decrement the stack pointer - state.__rsp -= __uint64_t(MemoryLayout.size) - - // 2. Save the old Instruction Pointer to the stack. - if let pointer = UnsafeMutablePointer<__uint64_t>(bitPattern: UInt(state.__rsp)) { - pointer.pointee = state.__rip - } else { - return NSNumber(value: KERN_INVALID_ARGUMENT) - } - - // 3. Set the Instruction Pointer to the new function's address - var f: @convention(c) () -> Void = raiseBadInstructionException - withUnsafePointer(to: &f) { - state.__rip = $0.withMemoryRebound(to: __uint64_t.self, capacity: 1) { return $0.pointee } - } - - // Write the new thread state - new_state.withMemoryRebound(to: x86_thread_state64_t.self, capacity: 1) { $0.pointee = state } - new_stateCnt.pointee = x86_THREAD_STATE64_COUNT - - return NSNumber(value: KERN_SUCCESS) - #else - fatalError("Unavailable for this CPU architecture") - #endif + var reply = bad_instruction_exception_reply_t(exception_port: 0, exception: 0, code: nil, codeCnt: 0, flavor: nil, old_state: nil, old_stateCnt: 0, new_state: nil, new_stateCnt: nil) + withUnsafeMutablePointer(to: &reply) { value.getValue(UnsafeMutableRawPointer($0)) } + + let old_state: UnsafePointer = reply.old_state! + let old_stateCnt: mach_msg_type_number_t = reply.old_stateCnt + let new_state: thread_state_t = reply.new_state! + let new_stateCnt: UnsafeMutablePointer = reply.new_stateCnt! + + // Make sure we've been given enough memory + if old_stateCnt != x86_THREAD_STATE64_COUNT || new_stateCnt.pointee < x86_THREAD_STATE64_COUNT { + return NSNumber(value: KERN_INVALID_ARGUMENT) + } + + // Read the old thread state + var state = old_state.withMemoryRebound(to: x86_thread_state64_t.self, capacity: 1) { return $0.pointee } + + // 1. Decrement the stack pointer + state.__rsp -= __uint64_t(MemoryLayout.size) + + // 2. Save the old Instruction Pointer to the stack. + if let pointer = UnsafeMutablePointer<__uint64_t>(bitPattern: UInt(state.__rsp)) { + pointer.pointee = state.__rip + } else { + return NSNumber(value: KERN_INVALID_ARGUMENT) + } + + // 3. Set the Instruction Pointer to the new function's address + var f: @convention(c) () -> Void = raiseBadInstructionException + withUnsafePointer(to: &f) { + state.__rip = $0.withMemoryRebound(to: __uint64_t.self, capacity: 1) { return $0.pointee } + } + + // Write the new thread state + new_state.withMemoryRebound(to: x86_thread_state64_t.self, capacity: 1) { $0.pointee = state } + new_stateCnt.pointee = x86_THREAD_STATE64_COUNT + + return NSNumber(value: KERN_SUCCESS) } } + +#endif diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift index f96ec63..521b2a1 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift @@ -3,7 +3,7 @@ // CwlPreconditionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -18,180 +18,192 @@ // IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // +#if (os(macOS) || os(iOS)) && arch(x86_64) + import Foundation +import Swift #if SWIFT_PACKAGE import CwlMachBadInstructionHandler #endif -#if arch(x86_64) - - private enum PthreadError: Error { case code(Int32) } - private enum MachExcServer: Error { case code(kern_return_t) } - - /// A quick function for converting Mach error results into Swift errors - private func kernCheck(_ f: () -> Int32) throws { - let r = f() - guard r == KERN_SUCCESS else { - throw NSError(domain: NSMachErrorDomain, code: Int(r), userInfo: nil) - } +private enum PthreadError: Error { case code(Int32) } +private enum MachExcServer: Error { case code(kern_return_t) } + +/// A quick function for converting Mach error results into Swift errors +private func kernCheck(_ f: () -> Int32) throws { + let r = f() + guard r == KERN_SUCCESS else { + throw NSError(domain: NSMachErrorDomain, code: Int(r), userInfo: nil) } - - extension request_mach_exception_raise_t { - mutating func withMsgHeaderPointer(in block: (UnsafeMutablePointer) -> R) -> R { - return withUnsafeMutablePointer(to: &self) { p -> R in - return p.withMemoryRebound(to: mach_msg_header_t.self, capacity: 1) { ptr -> R in - return block(ptr) - } +} + +extension request_mach_exception_raise_t { + mutating func withMsgHeaderPointer(in block: (UnsafeMutablePointer) -> R) -> R { + return withUnsafeMutablePointer(to: &self) { p -> R in + return p.withMemoryRebound(to: mach_msg_header_t.self, capacity: 1) { ptr -> R in + return block(ptr) } } } - - extension reply_mach_exception_raise_state_t { - mutating func withMsgHeaderPointer(in block: (UnsafeMutablePointer) -> R) -> R { - return withUnsafeMutablePointer(to: &self) { p -> R in - return p.withMemoryRebound(to: mach_msg_header_t.self, capacity: 1) { ptr -> R in - return block(ptr) - } +} + +extension reply_mach_exception_raise_state_t { + mutating func withMsgHeaderPointer(in block: (UnsafeMutablePointer) -> R) -> R { + return withUnsafeMutablePointer(to: &self) { p -> R in + return p.withMemoryRebound(to: mach_msg_header_t.self, capacity: 1) { ptr -> R in + return block(ptr) } } } +} + +/// A structure used to store context associated with the Mach message port +private struct MachContext { + var masks = execTypesCountTuple() + var count: mach_msg_type_number_t = 0 + var ports = execTypesCountTuple() + var behaviors = execTypesCountTuple() + var flavors = execTypesCountTuple() + var currentExceptionPort: mach_port_t = 0 + var handlerThread: pthread_t? = nil - /// A structure used to store context associated with the Mach message port - private struct MachContext { - var masks = execTypesCountTuple() - var count: mach_msg_type_number_t = 0 - var ports = execTypesCountTuple() - var behaviors = execTypesCountTuple() - var flavors = execTypesCountTuple() - var currentExceptionPort: mach_port_t = 0 - var handlerThread: pthread_t? = nil - - static func internalMutablePointers(_ m: UnsafeMutablePointer>, _ c: UnsafeMutablePointer, _ p: UnsafeMutablePointer>, _ b: UnsafeMutablePointer>, _ f: UnsafeMutablePointer>, _ block: (UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer) -> R) -> R { - return m.withMemoryRebound(to: exception_mask_t.self, capacity: 1) { masksPtr in - return c.withMemoryRebound(to: mach_msg_type_number_t.self, capacity: 1) { countPtr in - return p.withMemoryRebound(to: mach_port_t.self, capacity: 1) { portsPtr in - return b.withMemoryRebound(to: exception_behavior_t.self, capacity: 1) { behaviorsPtr in - return f.withMemoryRebound(to: thread_state_flavor_t.self, capacity: 1) { flavorsPtr in - return block(masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr) - } + static func internalMutablePointers(_ m: UnsafeMutablePointer>, _ c: UnsafeMutablePointer, _ p: UnsafeMutablePointer>, _ b: UnsafeMutablePointer>, _ f: UnsafeMutablePointer>, _ block: (UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer) -> R) -> R { + return m.withMemoryRebound(to: exception_mask_t.self, capacity: 1) { masksPtr in + return c.withMemoryRebound(to: mach_msg_type_number_t.self, capacity: 1) { countPtr in + return p.withMemoryRebound(to: mach_port_t.self, capacity: 1) { portsPtr in + return b.withMemoryRebound(to: exception_behavior_t.self, capacity: 1) { behaviorsPtr in + return f.withMemoryRebound(to: thread_state_flavor_t.self, capacity: 1) { flavorsPtr in + return block(masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr) } } } } } - - mutating func withUnsafeMutablePointers(in block: @escaping (UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer) -> R) -> R { - return MachContext.internalMutablePointers(&masks, &count, &ports, &behaviors, &flavors, block) - } } - /// A function for receiving mach messages and parsing the first with mach_exc_server (and if any others are received, throwing them away). - private func machMessageHandler(_ arg: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer? { - let context = arg.assumingMemoryBound(to: MachContext.self).pointee - var request = request_mach_exception_raise_t() - var reply = reply_mach_exception_raise_state_t() + mutating func withUnsafeMutablePointers(in block: @escaping (UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer) -> R) -> R { + return MachContext.internalMutablePointers(&masks, &count, &ports, &behaviors, &flavors, block) + } +} + +/// A function for receiving mach messages and parsing the first with mach_exc_server (and if any others are received, throwing them away). +private func machMessageHandler(_ arg: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer? { + let context = arg.assumingMemoryBound(to: MachContext.self).pointee + var request = request_mach_exception_raise_t() + var reply = reply_mach_exception_raise_state_t() + + var handledfirstException = false + repeat { do { + // Request the next mach message from the port + request.Head.msgh_local_port = context.currentExceptionPort + request.Head.msgh_size = UInt32(MemoryLayout.size) + let requestSize = request.Head.msgh_size + try kernCheck { request.withMsgHeaderPointer { requestPtr in + mach_msg(requestPtr, MACH_RCV_MSG | MACH_RCV_INTERRUPT, 0, requestSize, context.currentExceptionPort, 0, UInt32(MACH_PORT_NULL)) + } } - var handledfirstException = false - repeat { do { - // Request the next mach message from the port - request.Head.msgh_local_port = context.currentExceptionPort - request.Head.msgh_size = UInt32(MemoryLayout.size) - let requestSize = request.Head.msgh_size - try kernCheck { request.withMsgHeaderPointer { requestPtr in - mach_msg(requestPtr, MACH_RCV_MSG | MACH_RCV_INTERRUPT, 0, requestSize, context.currentExceptionPort, 0, UInt32(MACH_PORT_NULL)) - } } - - // Prepare the reply structure - reply.Head.msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(request.Head.msgh_bits), 0) - reply.Head.msgh_local_port = UInt32(MACH_PORT_NULL) - reply.Head.msgh_remote_port = request.Head.msgh_remote_port - reply.Head.msgh_size = UInt32(MemoryLayout.size) - reply.NDR = NDR_record - - if !handledfirstException { - // Use the MiG generated server to invoke our handler for the request and fill in the rest of the reply structure - guard request.withMsgHeaderPointer(in: { requestPtr in reply.withMsgHeaderPointer { replyPtr in - mach_exc_server(requestPtr, replyPtr) - } }) != 0 else { throw MachExcServer.code(reply.RetCode) } - - handledfirstException = true - } else { - // If multiple fatal errors occur, don't handle subsquent errors (let the program crash) - reply.RetCode = KERN_FAILURE - } + // Prepare the reply structure + reply.Head.msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(request.Head.msgh_bits), 0) + reply.Head.msgh_local_port = UInt32(MACH_PORT_NULL) + reply.Head.msgh_remote_port = request.Head.msgh_remote_port + reply.Head.msgh_size = UInt32(MemoryLayout.size) + reply.NDR = NDR_record + + if !handledfirstException { + // Use the MiG generated server to invoke our handler for the request and fill in the rest of the reply structure + guard request.withMsgHeaderPointer(in: { requestPtr in reply.withMsgHeaderPointer { replyPtr in + mach_exc_server(requestPtr, replyPtr) + } }) != 0 else { throw MachExcServer.code(reply.RetCode) } - // Send the reply - let replySize = reply.Head.msgh_size - try kernCheck { reply.withMsgHeaderPointer { replyPtr in - mach_msg(replyPtr, MACH_SEND_MSG, replySize, 0, UInt32(MACH_PORT_NULL), 0, UInt32(MACH_PORT_NULL)) - } } - } catch let error as NSError where (error.domain == NSMachErrorDomain && (error.code == Int(MACH_RCV_PORT_CHANGED) || error.code == Int(MACH_RCV_INVALID_NAME))) { - // Port was already closed before we started or closed while we were listening. - // This means the controlling thread shut down. - return nil - } catch { - // Should never be reached but this is testing code, don't try to recover, just abort - fatalError("Mach message error: \(error)") - } } while true + handledfirstException = true + } else { + // If multiple fatal errors occur, don't handle subsquent errors (let the program crash) + reply.RetCode = KERN_FAILURE + } + + // Send the reply + let replySize = reply.Head.msgh_size + try kernCheck { reply.withMsgHeaderPointer { replyPtr in + mach_msg(replyPtr, MACH_SEND_MSG, replySize, 0, UInt32(MACH_PORT_NULL), 0, UInt32(MACH_PORT_NULL)) + } } + } catch let error as NSError where (error.domain == NSMachErrorDomain && (error.code == Int(MACH_RCV_PORT_CHANGED) || error.code == Int(MACH_RCV_INVALID_NAME))) { + // Port was already closed before we started or closed while we were listening. + // This means the controlling thread shut down. + return nil + } catch { + // Should never be reached but this is testing code, don't try to recover, just abort + fatalError("Mach message error: \(error)") + } } while true +} + +/// Run the provided block. If a mach "BAD_INSTRUCTION" exception is raised, catch it and return a BadInstructionException (which captures stack information about the throw site, if desired). Otherwise return nil. +/// NOTE: This function is only intended for use in test harnesses – use in a distributed build is almost certainly a bad choice. If a "BAD_INSTRUCTION" exception is raised, the block will be exited before completion via Objective-C exception. The risks associated with an Objective-C exception apply here: most Swift/Objective-C functions are *not* exception-safe. Memory may be leaked and the program will not necessarily be left in a safe state. +/// - parameter block: a function without parameters that will be run +/// - returns: if an EXC_BAD_INSTRUCTION is raised during the execution of `block` then a BadInstructionException will be returned, otherwise `nil`. +public func catchBadInstruction(in block: @escaping () -> Void) -> BadInstructionException? { + // Suppress Swift runtime's direct triggering of the debugger and exclusivity checking which crashes when we throw past it + let previousExclusivity = _swift_disableExclusivityChecking + let previousReporting = _swift_reportFatalErrorsToDebugger + _swift_disableExclusivityChecking = true + _swift_reportFatalErrorsToDebugger = false + defer { + _swift_reportFatalErrorsToDebugger = previousReporting + _swift_disableExclusivityChecking = previousExclusivity } - /// Run the provided block. If a mach "BAD_INSTRUCTION" exception is raised, catch it and return a BadInstructionException (which captures stack information about the throw site, if desired). Otherwise return nil. - /// NOTE: This function is only intended for use in test harnesses – use in a distributed build is almost certainly a bad choice. If a "BAD_INSTRUCTION" exception is raised, the block will be exited before completion via Objective-C exception. The risks associated with an Objective-C exception apply here: most Swift/Objective-C functions are *not* exception-safe. Memory may be leaked and the program will not necessarily be left in a safe state. - /// - parameter block: a function without parameters that will be run - /// - returns: if an EXC_BAD_INSTRUCTION is raised during the execution of `block` then a BadInstructionException will be returned, otherwise `nil`. - public func catchBadInstruction(in block: () -> Void) -> BadInstructionException? { - var context = MachContext() - var result: BadInstructionException? = nil - do { - var handlerThread: pthread_t? = nil - defer { - // 8. Wait for the thread to terminate *if* we actually made it to the creation point - // The mach port should be destroyed *before* calling pthread_join to avoid a deadlock. - if handlerThread != nil { - pthread_join(handlerThread!, nil) - } - } - - try kernCheck { - // 1. Create the mach port - mach_port_allocate(mach_task_self_, MACH_PORT_RIGHT_RECEIVE, &context.currentExceptionPort) - } - defer { - // 7. Cleanup the mach port - mach_port_destroy(mach_task_self_, context.currentExceptionPort) - } - - try kernCheck { - // 2. Configure the mach port - mach_port_insert_right(mach_task_self_, context.currentExceptionPort, context.currentExceptionPort, MACH_MSG_TYPE_MAKE_SEND) + var context = MachContext() + var result: BadInstructionException? = nil + do { + var handlerThread: pthread_t? = nil + defer { + // 8. Wait for the thread to terminate *if* we actually made it to the creation point + // The mach port should be destroyed *before* calling pthread_join to avoid a deadlock. + if handlerThread != nil { + pthread_join(handlerThread!, nil) } + } + + try kernCheck { + // 1. Create the mach port + mach_port_allocate(mach_task_self_, MACH_PORT_RIGHT_RECEIVE, &context.currentExceptionPort) + } + defer { + // 7. Cleanup the mach port + mach_port_destroy(mach_task_self_, context.currentExceptionPort) + } + + try kernCheck { + // 2. Configure the mach port + mach_port_insert_right(mach_task_self_, context.currentExceptionPort, context.currentExceptionPort, MACH_MSG_TYPE_MAKE_SEND) + } + + let currentExceptionPtr = context.currentExceptionPort + try kernCheck { context.withUnsafeMutablePointers { masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr in + // 3. Apply the mach port as the handler for this thread + thread_swap_exception_ports(mach_thread_self(), EXC_MASK_BAD_INSTRUCTION, currentExceptionPtr, Int32(bitPattern: UInt32(EXCEPTION_STATE) | MACH_EXCEPTION_CODES), x86_THREAD_STATE64, masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr) + } } + + defer { context.withUnsafeMutablePointers { masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr in + // 6. Unapply the mach port + _ = thread_swap_exception_ports(mach_thread_self(), EXC_MASK_BAD_INSTRUCTION, 0, EXCEPTION_DEFAULT, THREAD_STATE_NONE, masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr) + } } + + try withUnsafeMutablePointer(to: &context) { c throws in + // 4. Create the thread + let e = pthread_create(&handlerThread, nil, machMessageHandler, c) + guard e == 0 else { throw PthreadError.code(e) } - let currentExceptionPtr = context.currentExceptionPort - try kernCheck { context.withUnsafeMutablePointers { masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr in - // 3. Apply the mach port as the handler for this thread - thread_swap_exception_ports(mach_thread_self(), EXC_MASK_BAD_INSTRUCTION, currentExceptionPtr, Int32(bitPattern: UInt32(EXCEPTION_STATE) | MACH_EXCEPTION_CODES), x86_THREAD_STATE64, masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr) - } } - - defer { context.withUnsafeMutablePointers { masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr in - // 6. Unapply the mach port - _ = thread_swap_exception_ports(mach_thread_self(), EXC_MASK_BAD_INSTRUCTION, 0, EXCEPTION_DEFAULT, THREAD_STATE_NONE, masksPtr, countPtr, portsPtr, behaviorsPtr, flavorsPtr) - } } - - try withUnsafeMutablePointer(to: &context) { c throws in - // 4. Create the thread - let e = pthread_create(&handlerThread, nil, machMessageHandler, c) - guard e == 0 else { throw PthreadError.code(e) } - - // 5. Run the block - result = BadInstructionException.catchException(in: block) - } - } catch { - // Should never be reached but this is testing code, don't try to recover, just abort - fatalError("Mach port error: \(error)") + // 5. Run the block + result = BadInstructionException.catchException(in: block) } - return result + } catch { + // Should never be reached but this is testing code, don't try to recover, just abort + fatalError("Mach port error: \(error)") } + + return result +} #endif diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift index 8d99d5e..f22ed1f 100644 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift +++ b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift @@ -3,7 +3,7 @@ // CwlPreconditionTesting // // Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. +// Copyright © 2016 Matt Gallagher ( https://www.cocoawithlove.com ). All rights reserved. // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -18,38 +18,38 @@ // IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // +#if (os(macOS) || os(iOS)) && arch(x86_64) + import Darwin -#if arch(x86_64) - - // From /usr/include/mach/message.h - // #define MACH_MSG_TYPE_MAKE_SEND 20 /* Must hold receive right */ - // #define MACH_MSGH_BITS_REMOTE(bits) \ - // ((bits) & MACH_MSGH_BITS_REMOTE_MASK) - // #define MACH_MSGH_BITS(remote, local) /* legacy */ \ - // ((remote) | ((local) << 8)) - public let MACH_MSG_TYPE_MAKE_SEND: UInt32 = 20 - public func MACH_MSGH_BITS_REMOTE(_ bits: UInt32) -> UInt32 { return bits & UInt32(MACH_MSGH_BITS_REMOTE_MASK) } - public func MACH_MSGH_BITS(_ remote: UInt32, _ local: UInt32) -> UInt32 { return ((remote) | ((local) << 8)) } - - // From /usr/include/mach/exception_types.h - // #define EXC_BAD_INSTRUCTION 2 /* Instruction failed */ - // #define EXC_MASK_BAD_INSTRUCTION (1 << EXC_BAD_INSTRUCTION) - public let EXC_BAD_INSTRUCTION: UInt32 = 2 - public let EXC_MASK_BAD_INSTRUCTION: UInt32 = 1 << EXC_BAD_INSTRUCTION - - // From /usr/include/mach/i386/thread_status.h - // #define x86_THREAD_STATE64_COUNT ((mach_msg_type_number_t) \ - // ( sizeof (x86_thread_state64_t) / sizeof (int) )) - public let x86_THREAD_STATE64_COUNT = UInt32(MemoryLayout.size / MemoryLayout.size) - - public let EXC_TYPES_COUNT = 14 - public struct execTypesCountTuple { - // From /usr/include/mach/i386/exception.h - // #define EXC_TYPES_COUNT 14 /* incl. illegal exception 0 */ - public var value: (T, T, T, T, T, T, T, T, T, T, T, T, T, T) = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) - public init() { - } +// From /usr/include/mach/message.h +// #define MACH_MSG_TYPE_MAKE_SEND 20 /* Must hold receive right */ +// #define MACH_MSGH_BITS_REMOTE(bits) \ +// ((bits) & MACH_MSGH_BITS_REMOTE_MASK) +// #define MACH_MSGH_BITS(remote, local) /* legacy */ \ +// ((remote) | ((local) << 8)) +public let MACH_MSG_TYPE_MAKE_SEND: UInt32 = 20 +public func MACH_MSGH_BITS_REMOTE(_ bits: UInt32) -> UInt32 { return bits & UInt32(MACH_MSGH_BITS_REMOTE_MASK) } +public func MACH_MSGH_BITS(_ remote: UInt32, _ local: UInt32) -> UInt32 { return ((remote) | ((local) << 8)) } + +// From /usr/include/mach/exception_types.h +// #define EXC_BAD_INSTRUCTION 2 /* Instruction failed */ +// #define EXC_MASK_BAD_INSTRUCTION (1 << EXC_BAD_INSTRUCTION) +public let EXC_BAD_INSTRUCTION: UInt32 = 2 +public let EXC_MASK_BAD_INSTRUCTION: UInt32 = 1 << EXC_BAD_INSTRUCTION + +// From /usr/include/mach/i386/thread_status.h +// #define x86_THREAD_STATE64_COUNT ((mach_msg_type_number_t) \ +// ( sizeof (x86_thread_state64_t) / sizeof (int) )) +public let x86_THREAD_STATE64_COUNT = UInt32(MemoryLayout.size / MemoryLayout.size) + +public let EXC_TYPES_COUNT = 14 +public struct execTypesCountTuple { + // From /usr/include/mach/i386/exception.h + // #define EXC_TYPES_COUNT 14 /* incl. illegal exception 0 */ + public var value: (T, T, T, T, T, T, T, T, T, T, T, T, T, T) = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + public init() { } +} #endif diff --git a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h b/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h deleted file mode 100644 index 7c50da1..0000000 --- a/Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// CwlPreconditionTesting.h -// CwlPreconditionTesting -// -// Created by Matt Gallagher on 2016/01/10. -// Copyright © 2016 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved. -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -// IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// - -#import - -extern bool _swift_reportFatalErrorsToDebugger; - -//! Project version number for CwlUtils. -FOUNDATION_EXPORT double CwlPreconditionTestingVersionNumber; - -//! Project version string for CwlUtils. -FOUNDATION_EXPORT const unsigned char CwlAssertingTestingVersionString[]; - -#include "CwlMachBadInstructionHandler.h" -#include "CwlCatchException.h" diff --git a/Example/Pods/Nimble/README.md b/Example/Pods/Nimble/README.md index dde7fc4..aa7ef09 100644 --- a/Example/Pods/Nimble/README.md +++ b/Example/Pods/Nimble/README.md @@ -3,8 +3,8 @@ [![Build Status](https://travis-ci.org/Quick/Nimble.svg?branch=master)](https://travis-ci.org/Quick/Nimble) [![CocoaPods](https://img.shields.io/cocoapods/v/Nimble.svg)](https://cocoapods.org/pods/Nimble) [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) +[![Accio supported](https://img.shields.io/badge/Accio-supported-0A7CF5.svg?style=flat)](https://github.com/JamitLabs/Accio) [![Platforms](https://img.shields.io/cocoapods/p/Nimble.svg)](https://cocoapods.org/pods/Nimble) -[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com) Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by @@ -70,6 +70,7 @@ expect(ocean.isClean).toEventually(beTruthy()) - [Installing Nimble](#installing-nimble) - [Installing Nimble as a Submodule](#installing-nimble-as-a-submodule) - [Installing Nimble via CocoaPods](#installing-nimble-via-cocoapods) + - [Installing Nimble via Accio](#installing-nimble-via-accio) - [Using Nimble without XCTest](#using-nimble-without-xctest) @@ -344,10 +345,10 @@ cases, use the `timeout` parameter: // Swift // Waits three seconds for ocean to contain "starfish": -expect(ocean).toEventually(contain("starfish"), timeout: 3) +expect(ocean).toEventually(contain("starfish"), timeout: .seconds(3)) // Evaluate someValue every 0.2 seconds repeatedly until it equals 100, or fails if it timeouts after 5.5 seconds. -expect(someValue).toEventually(equal(100), timeout: 5.5, pollInterval: 0.2) +expect(someValue).toEventually(equal(100), timeout: .milliseconds(5500), pollInterval: .milliseconds(200)) ``` ```objc @@ -386,7 +387,7 @@ waitUntil(^(void (^done)(void)){ ```swift // Swift -waitUntil(timeout: 10) { done in +waitUntil(timeout: .seconds(10)) { done in ocean.goFish { success in expect(success).to(beTrue()) done() @@ -418,10 +419,10 @@ the default timeout and poll interval values. This can be done as follows: // Swift // Increase the global timeout to 5 seconds: -Nimble.AsyncDefaults.Timeout = 5 +Nimble.AsyncDefaults.timeout = .seconds(1) // Slow the polling interval to 0.1 seconds: -Nimble.AsyncDefaults.PollInterval = 0.1 +Nimble.AsyncDefaults.pollInterval = .milliseconds(100) ``` ## Objective-C Support @@ -1171,20 +1172,31 @@ For Objective-C, the actual value must be one of the following classes, or their ```swift // Swift -let testNotification = Notification(name: "Foo", object: nil) +let testNotification = Notification(name: Notification.Name("Foo"), object: nil) -// passes if the closure in expect { ... } posts a notification to the default +// Passes if the closure in expect { ... } posts a notification to the default // notification center. expect { - NotificationCenter.default.postNotification(testNotification) -}.to(postNotifications(equal([testNotification])) + NotificationCenter.default.post(testNotification) +}.to(postNotifications(equal([testNotification]))) -// passes if the closure in expect { ... } posts a notification to a given +// Passes if the closure in expect { ... } posts a notification to a given // notification center let notificationCenter = NotificationCenter() expect { - notificationCenter.postNotification(testNotification) -}.to(postNotifications(equal([testNotification]), fromNotificationCenter: notificationCenter)) + notificationCenter.post(testNotification) +}.to(postNotifications(equal([testNotification]), from: notificationCenter)) + +// Passes if the closure in expect { ... } posts a notification with the provided names to a given +// notification center. Make sure to use this when running tests on Catalina, +// using DistributedNotificationCenter as there is currently no way +// of observing notifications without providing specific names. +let distributedNotificationCenter = DistributedNotificationCenter() +expect { + distributedNotificationCenter.post(testNotification) +}.toEventually(postDistributedNotifications(equal([testNotification]), + from: distributedNotificationCenter, + names: [testNotification.name])) ``` > This matcher is only available in Swift. @@ -1503,19 +1515,17 @@ For a more comprehensive message that spans multiple lines, use ## Supporting Objective-C To use a custom matcher written in Swift from Objective-C, you'll have -to extend the `NMBObjCMatcher` class, adding a new class method for your +to extend the `NMBPredicate` class, adding a new class method for your custom matcher. The example below defines the class method -`+[NMBObjCMatcher beNilMatcher]`: +`+[NMBPredicate beNilMatcher]`: ```swift // Swift -extension NMBObjCMatcher { - public class func beNilMatcher() -> NMBObjCMatcher { - return NMBObjCMatcher { actualBlock, failureMessage, location in - let block = ({ actualBlock() as NSObject? }) - let expr = Expression(expression: block, location: location) - return beNil().matches(expr, failureMessage: failureMessage) +extension NMBPredicate { + @objc public class func beNilMatcher() -> NMBPredicate { + return NMBPredicate { actualExpression in + return try beNil().satisfies(actualExpression).toObjectiveC() } } } @@ -1526,7 +1536,7 @@ The above allows you to use the matcher from Objective-C: ```objc // Objective-C -expect(actual).to([NMBObjCMatcher beNilMatcher]()); +expect(actual).to([NMBPredicate beNilMatcher]()); ``` To make the syntax easier to use, define a C function that calls the @@ -1535,8 +1545,8 @@ class method: ```objc // Objective-C -FOUNDATION_EXPORT id beNil() { - return [NMBObjCMatcher beNilMatcher]; +FOUNDATION_EXPORT NMBPredicate *beNil() { + return [NMBPredicate beNilMatcher]; } ``` @@ -1558,29 +1568,25 @@ expect(nil).to(equal(nil)); // fails expect(nil).to(beNil()); // passes ``` -If your matcher does not want to match with nil, you use `NonNilMatcherFunc` -and the `canMatchNil` constructor on `NMBObjCMatcher`. Using both types will -automatically generate expected value failure messages when they're nil. +If your matcher does not want to match with nil, you use `Predicate.define` or `Predicate.simple`. +Using those factory methods will automatically generate expected value failure messages when they're nil. ```swift +public func beginWith(_ startingElement: S.Element) -> Predicate where S.Element: Equatable { + return Predicate.simple("begin with <\(startingElement)>") { actualExpression in + guard let actualValue = try actualExpression.evaluate() else { return .fail } -public func beginWith(startingElement: T) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "begin with <\(startingElement)>" - if let actualValue = actualExpression.evaluate() { - var actualGenerator = actualValue.makeIterator() - return actualGenerator.next() == startingElement - } - return false + var actualGenerator = actualValue.makeIterator() + return PredicateStatus(bool: actualGenerator.next() == startingElement) } } -extension NMBObjCMatcher { - public class func beginWithMatcher(expected: AnyObject) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in - let actual = actualExpression.evaluate() +extension NMBPredicate { + @objc public class func beginWithMatcher(_ expected: Any) -> NMBPredicate { + return NMBPredicate { actualExpression in + let actual = try actualExpression.evaluate() let expr = actualExpression.cast { $0 as? NMBOrderedCollection } - return beginWith(expected).matches(expr, failureMessage: failureMessage) + return try beginWith(expected).satisfies(expr).toObjectiveC() } } } @@ -1605,7 +1611,7 @@ converts those types to the newer `Predicate`. ```swift // Swift -public func beginWith(startingElement: T) -> Predicate { +public func beginWith(_ startingElement: S.Element) -> Predicate where S.Element: Equatable { return NonNilMatcherFunc { actualExpression, failureMessage in failureMessage.postfixMessage = "begin with <\(startingElement)>" if let actualValue = actualExpression.evaluate() { @@ -1628,7 +1634,7 @@ matcher types. ```swift // Swift -public func beginWith(startingElement: T) -> Predicate { +public func beginWith(_ startingElement: S.Element) -> Predicate where S.Element: Equatable { return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "begin with <\(startingElement)>" if let actualValue = actualExpression.evaluate() { @@ -1705,12 +1711,33 @@ source 'https://github.com/CocoaPods/Specs.git' target 'YOUR_APP_NAME_HERE_Tests', :exclusive => true do use_frameworks! - pod 'Nimble', '~> 6.0.0' + pod 'Nimble' end ``` Finally run `pod install`. +## Installing Nimble via Accio + +Add the following to your Package.swift: + +```swift +.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.1")), +``` + +Next, add `Nimble` to your App targets dependencies like so: + +```swift +.testTarget( + name: "AppTests", + dependencies: [ + "Nimble", + ] +), +``` + +Then run `accio update`. + ## Using Nimble without XCTest Nimble is integrated with XCTest to allow it work well when used in Xcode test diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift index abaf532..a28bf2b 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift @@ -1,5 +1,3 @@ -import Foundation - /// Protocol for the assertion handler that Nimble uses for all expectations. public protocol AssertionHandler { func assert(_ assertion: Bool, message: FailureMessage, location: SourceLocation) diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift index 0f5df59..ac75467 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift @@ -1,5 +1,3 @@ -import Foundation - /// A data structure that stores information about an assertion when /// AssertionRecorder is set as the Nimble assertion handler. /// diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift index b3eb09a..32d9b60 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift @@ -1,6 +1,7 @@ -import Foundation - #if canImport(Darwin) && !SWIFT_PACKAGE +import class Foundation.NSObject +import typealias Foundation.TimeInterval +import enum Dispatch.DispatchTimeInterval private func from(objcPredicate: NMBPredicate) -> Predicate { return Predicate { actualExpression in @@ -10,24 +11,27 @@ private func from(objcPredicate: NMBPredicate) -> Predicate { } } -internal struct ObjCMatcherWrapper: Matcher { - let matcher: NMBMatcher - - func matches(_ actualExpression: Expression, failureMessage: FailureMessage) -> Bool { - return matcher.matches( - // swiftlint:disable:next force_try - ({ try! actualExpression.evaluate() }), - failureMessage: failureMessage, - location: actualExpression.location) - } - - func doesNotMatch(_ actualExpression: Expression, failureMessage: FailureMessage) -> Bool { - return matcher.doesNotMatch( - // swiftlint:disable:next force_try - ({ try! actualExpression.evaluate() }), - failureMessage: failureMessage, - location: actualExpression.location) +private func from(matcher: NMBMatcher, style: ExpectationStyle) -> Predicate { + // Almost same as `Matcher.toClosure` + let closure: (Expression, FailureMessage) throws -> Bool = { expr, msg in + switch style { + case .toMatch: + return matcher.matches( + // swiftlint:disable:next force_try + ({ try! expr.evaluate() }), + failureMessage: msg, + location: expr.location + ) + case .toNotMatch: + return !matcher.doesNotMatch( + // swiftlint:disable:next force_try + ({ try! expr.evaluate() }), + failureMessage: msg, + location: expr.location + ) + } } + return Predicate._fromDeprecatedClosure(closure) } // Equivalent to Expectation, but for Nimble's Objective-C interface @@ -37,7 +41,7 @@ public class NMBExpectation: NSObject { internal var _negative: Bool internal let _file: FileString internal let _line: UInt - internal var _timeout: TimeInterval = 1.0 + internal var _timeout: DispatchTimeInterval = .seconds(1) // swiftlint:enable identifier_name @objc public init(actualBlock: @escaping () -> NSObject?, negative: Bool, file: FileString, line: UInt) { @@ -48,63 +52,65 @@ public class NMBExpectation: NSObject { } private var expectValue: Expectation { - return expect(_file, line: _line) { - self._actualBlock() as NSObject? - } + return expect(file: _file, line: _line, self._actualBlock() as NSObject?) } @objc public var withTimeout: (TimeInterval) -> NMBExpectation { - return ({ timeout in self._timeout = timeout + return { timeout in self._timeout = timeout.dispatchInterval return self - }) + } } - @objc public var to: (NMBMatcher) -> Void { - return ({ matcher in + @objc public var to: (NMBMatcher) -> NMBExpectation { + return { matcher in if let pred = matcher as? NMBPredicate { self.expectValue.to(from(objcPredicate: pred)) } else { - self.expectValue.to(ObjCMatcherWrapper(matcher: matcher)) + self.expectValue.to(from(matcher: matcher, style: .toMatch)) } - }) + return self + } } - @objc public var toWithDescription: (NMBMatcher, String) -> Void { - return ({ matcher, description in + @objc public var toWithDescription: (NMBMatcher, String) -> NMBExpectation { + return { matcher, description in if let pred = matcher as? NMBPredicate { self.expectValue.to(from(objcPredicate: pred), description: description) } else { - self.expectValue.to(ObjCMatcherWrapper(matcher: matcher), description: description) + self.expectValue.to(from(matcher: matcher, style: .toMatch), description: description) } - }) + return self + } } - @objc public var toNot: (NMBMatcher) -> Void { - return ({ matcher in + @objc public var toNot: (NMBMatcher) -> NMBExpectation { + return { matcher in if let pred = matcher as? NMBPredicate { self.expectValue.toNot(from(objcPredicate: pred)) } else { - self.expectValue.toNot(ObjCMatcherWrapper(matcher: matcher)) + self.expectValue.toNot(from(matcher: matcher, style: .toNotMatch)) } - }) + return self + } } - @objc public var toNotWithDescription: (NMBMatcher, String) -> Void { - return ({ matcher, description in + @objc public var toNotWithDescription: (NMBMatcher, String) -> NMBExpectation { + return { matcher, description in if let pred = matcher as? NMBPredicate { self.expectValue.toNot(from(objcPredicate: pred), description: description) } else { - self.expectValue.toNot(ObjCMatcherWrapper(matcher: matcher), description: description) + self.expectValue.toNot(from(matcher: matcher, style: .toNotMatch), description: description) } - }) + return self + } } - @objc public var notTo: (NMBMatcher) -> Void { return toNot } + @objc public var notTo: (NMBMatcher) -> NMBExpectation { return toNot } - @objc public var notToWithDescription: (NMBMatcher, String) -> Void { return toNotWithDescription } + @objc public var notToWithDescription: (NMBMatcher, String) -> NMBExpectation { return toNotWithDescription } @objc public var toEventually: (NMBMatcher) -> Void { - return ({ matcher in + return { matcher in if let pred = matcher as? NMBPredicate { self.expectValue.toEventually( from(objcPredicate: pred), @@ -113,16 +119,16 @@ public class NMBExpectation: NSObject { ) } else { self.expectValue.toEventually( - ObjCMatcherWrapper(matcher: matcher), + from(matcher: matcher, style: .toMatch), timeout: self._timeout, description: nil ) } - }) + } } @objc public var toEventuallyWithDescription: (NMBMatcher, String) -> Void { - return ({ matcher, description in + return { matcher, description in if let pred = matcher as? NMBPredicate { self.expectValue.toEventually( from(objcPredicate: pred), @@ -131,16 +137,16 @@ public class NMBExpectation: NSObject { ) } else { self.expectValue.toEventually( - ObjCMatcherWrapper(matcher: matcher), + from(matcher: matcher, style: .toMatch), timeout: self._timeout, description: description ) } - }) + } } @objc public var toEventuallyNot: (NMBMatcher) -> Void { - return ({ matcher in + return { matcher in if let pred = matcher as? NMBPredicate { self.expectValue.toEventuallyNot( from(objcPredicate: pred), @@ -149,16 +155,16 @@ public class NMBExpectation: NSObject { ) } else { self.expectValue.toEventuallyNot( - ObjCMatcherWrapper(matcher: matcher), + from(matcher: matcher, style: .toNotMatch), timeout: self._timeout, description: nil ) } - }) + } } @objc public var toEventuallyNotWithDescription: (NMBMatcher, String) -> Void { - return ({ matcher, description in + return { matcher, description in if let pred = matcher as? NMBPredicate { self.expectValue.toEventuallyNot( from(objcPredicate: pred), @@ -167,12 +173,12 @@ public class NMBExpectation: NSObject { ) } else { self.expectValue.toEventuallyNot( - ObjCMatcherWrapper(matcher: matcher), + from(matcher: matcher, style: .toNotMatch), timeout: self._timeout, description: description ) } - }) + } } @objc public var toNotEventually: (NMBMatcher) -> Void { diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift index a91efe3..8b8258d 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift @@ -1,12 +1,12 @@ -import Foundation - #if canImport(Darwin) +import class Foundation.NSObject // swiftlint:disable line_length public typealias MatcherBlock = (_ actualExpression: Expression, _ failureMessage: FailureMessage) throws -> Bool public typealias FullMatcherBlock = (_ actualExpression: Expression, _ failureMessage: FailureMessage, _ shouldNotMatch: Bool) throws -> Bool // swiftlint:enable line_length +@available(*, deprecated, message: "Use NMBPredicate instead") public class NMBObjCMatcher: NSObject, NMBMatcher { // swiftlint:disable identifier_name let _match: MatcherBlock diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift index 1b2e8c0..06bde8a 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift @@ -1,5 +1,6 @@ import Dispatch -import Foundation +import class Foundation.NSObject +import class Foundation.Thread /// "Global" state of Nimble is stored here. Only DSL functions should access / be aware of this /// class' existence diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift index 719bf44..5f29628 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift @@ -45,7 +45,7 @@ class NimbleXCTestUnavailableHandler: AssertionHandler { private var stashed_swift_reportFatalErrorsToDebugger: Bool = false @objc func testCaseWillStart(_ testCase: XCTestCase) { - #if swift(>=3.2) + #if os(macOS) || os(iOS) stashed_swift_reportFatalErrorsToDebugger = _swift_reportFatalErrorsToDebugger _swift_reportFatalErrorsToDebugger = false #endif @@ -56,7 +56,7 @@ class NimbleXCTestUnavailableHandler: AssertionHandler { @objc func testCaseDidFinish(_ testCase: XCTestCase) { currentTestCase = nil - #if swift(>=3.2) + #if os(macOS) || os(iOS) _swift_reportFatalErrorsToDebugger = stashed_swift_reportFatalErrorsToDebugger #endif } diff --git a/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift b/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift index c049417..4be4524 100644 --- a/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift +++ b/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift @@ -21,13 +21,13 @@ internal class NMBWait: NSObject { file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) { - return throwableUntil(timeout: timeout, file: file, line: line) { done in - action(done) - } + // Convert TimeInterval to DispatchTimeInterval + until(timeout: timeout.dispatchInterval, file: file, line: line, action: action) } -#else +#endif + internal class func until( - timeout: TimeInterval, + timeout: DispatchTimeInterval, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) { @@ -35,16 +35,15 @@ internal class NMBWait: NSObject { action(done) } } -#endif // Using a throwable closure makes this method not objc compatible. internal class func throwableUntil( - timeout: TimeInterval, + timeout: DispatchTimeInterval, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) throws -> Void) { let awaiter = NimbleEnvironment.activeInstance.awaiter - let leeway = timeout / 2.0 + let leeway = timeout.divided // swiftlint:disable:next line_length let result = awaiter.performBlock(file: file, line: line) { (done: @escaping (ErrorResult) -> Void) throws -> Void in DispatchQueue.main.async { @@ -72,8 +71,7 @@ internal class NMBWait: NSObject { fail(blockedRunLoopErrorMessageFor("-waitUntil()", leeway: leeway), file: file, line: line) case .timedOut: - let pluralize = (timeout == 1 ? "" : "s") - fail("Waited more than \(timeout) second\(pluralize)", file: file, line: line) + fail("Waited more than \(timeout.description)", file: file, line: line) case let .raisedException(exception): fail("Unexpected exception raised: \(exception)") case let .errorThrown(error): @@ -93,21 +91,21 @@ internal class NMBWait: NSObject { _ file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) { - until(timeout: 1, file: file, line: line, action: action) + until(timeout: .seconds(1), file: file, line: line, action: action) } #else internal class func until( _ file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) { - until(timeout: 1, file: file, line: line, action: action) + until(timeout: .seconds(1), file: file, line: line, action: action) } #endif } -internal func blockedRunLoopErrorMessageFor(_ fnName: String, leeway: TimeInterval) -> String { +internal func blockedRunLoopErrorMessageFor(_ fnName: String, leeway: DispatchTimeInterval) -> String { // swiftlint:disable:next line_length - return "\(fnName) timed out but was unable to run the timeout handler because the main thread is unresponsive (\(leeway) seconds is allow after the wait times out). Conditions that may cause this include processing blocking IO on the main thread, calls to sleep(), deadlocks, and synchronous IPC. Nimble forcefully stopped run loop which may cause future failures in test run." + return "\(fnName) timed out but was unable to run the timeout handler because the main thread is unresponsive (\(leeway.description) is allow after the wait times out). Conditions that may cause this include processing blocking IO on the main thread, calls to sleep(), deadlocks, and synchronous IPC. Nimble forcefully stopped run loop which may cause future failures in test run." } /// Wait asynchronously until the done closure is called or the timeout has been reached. @@ -117,6 +115,6 @@ internal func blockedRunLoopErrorMessageFor(_ fnName: String, leeway: TimeInterv /// /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. -public func waitUntil(timeout: TimeInterval = AsyncDefaults.Timeout, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) { +public func waitUntil(timeout: DispatchTimeInterval = AsyncDefaults.timeout, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) { NMBWait.until(timeout: timeout, file: file, line: line, action: action) } diff --git a/Example/Pods/Nimble/Sources/Nimble/DSL.swift b/Example/Pods/Nimble/Sources/Nimble/DSL.swift index d6dc9cc..e481f87 100644 --- a/Example/Pods/Nimble/Sources/Nimble/DSL.swift +++ b/Example/Pods/Nimble/Sources/Nimble/DSL.swift @@ -1,7 +1,5 @@ -import Foundation - /// Make an expectation on a given actual value. The value given is lazily evaluated. -public func expect(_ expression: @autoclosure @escaping () throws -> T?, file: FileString = #file, line: UInt = #line) -> Expectation { +public func expect(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure @escaping () throws -> T?) -> Expectation { return Expectation( expression: Expression( expression: expression, @@ -10,10 +8,28 @@ public func expect(_ expression: @autoclosure @escaping () throws -> T?, file } /// Make an expectation on a given actual value. The closure is lazily invoked. -public func expect(_ file: FileString = #file, line: UInt = #line, expression: @escaping () throws -> T?) -> Expectation { +public func expect(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure () -> (() throws -> T)) -> Expectation { return Expectation( expression: Expression( - expression: expression, + expression: expression(), + location: SourceLocation(file: file, line: line), + isClosure: true)) +} + +/// Make an expectation on a given actual value. The closure is lazily invoked. +public func expect(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure () -> (() throws -> T?)) -> Expectation { + return Expectation( + expression: Expression( + expression: expression(), + location: SourceLocation(file: file, line: line), + isClosure: true)) +} + +/// Make an expectation on a given actual value. The closure is lazily invoked. +public func expect(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure () -> (() throws -> Void)) -> Expectation { + return Expectation( + expression: Expression( + expression: expression(), location: SourceLocation(file: file, line: line), isClosure: true)) } @@ -36,24 +52,16 @@ public func fail(_ file: FileString = #file, line: UInt = #line) { /// Like Swift's precondition(), but raises NSExceptions instead of sigaborts internal func nimblePrecondition( - _ expr: @autoclosure() -> Bool, - _ name: @autoclosure() -> String, - _ message: @autoclosure() -> String, + _ expr: @autoclosure () -> Bool, + _ name: @autoclosure () -> String, + _ message: @autoclosure () -> String, file: StaticString = #file, - line: UInt = #line) { - let result = expr() - if !result { -#if canImport(Darwin) - let exception = NSException( - name: NSExceptionName(name()), - reason: message(), - userInfo: nil - ) - exception.raise() -#else - preconditionFailure("\(name()) - \(message())", file: file, line: line) -#endif - } + line: UInt = #line +) { + let result = expr() + if !result { + _nimblePrecondition(name(), message(), file, line) + } } internal func internalError(_ msg: String, file: FileString = #file, line: UInt = #line) -> Never { @@ -66,3 +74,31 @@ internal func internalError(_ msg: String, file: FileString = #file, line: UInt ) // swiftlint:enable line_length } + +#if canImport(Darwin) +import class Foundation.NSException +import struct Foundation.NSExceptionName + +private func _nimblePrecondition( + _ name: String, + _ message: String, + _ file: StaticString, + _ line: UInt +) { + let exception = NSException( + name: NSExceptionName(name), + reason: message, + userInfo: nil + ) + exception.raise() +} +#else +private func _nimblePrecondition( + _ name: String, + _ message: String, + _ file: StaticString, + _ line: UInt +) { + preconditionFailure("\(name) - \(message)", file: file, line: line) +} +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Expectation.swift b/Example/Pods/Nimble/Sources/Nimble/Expectation.swift index 41625a1..9906c70 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Expectation.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Expectation.swift @@ -1,6 +1,4 @@ -import Foundation - -// Deprecated +@available(*, deprecated) internal func expressionDoesNotMatch(_ expression: Expression, matcher: U, toNot: String, description: String?) -> (Bool, FailureMessage) where U: Matcher, U.ValueType == T { let msg = FailureMessage() @@ -69,7 +67,9 @@ public struct Expectation { ////////////////// OLD API ///////////////////// /// DEPRECATED: Tests the actual value using a matcher to match. - public func to(_ matcher: U, description: String? = nil) + @available(*, deprecated, message: "Use Predicate instead") + @discardableResult + public func to(_ matcher: U, description: String? = nil) -> Self where U: Matcher, U.ValueType == T { let (pass, msg) = execute( expression, @@ -80,43 +80,54 @@ public struct Expectation { captureExceptions: false ) verify(pass, msg) + return self } /// DEPRECATED: Tests the actual value using a matcher to not match. - public func toNot(_ matcher: U, description: String? = nil) + @available(*, deprecated, message: "Use Predicate instead") + @discardableResult + public func toNot(_ matcher: U, description: String? = nil) -> Self where U: Matcher, U.ValueType == T { // swiftlint:disable:next line_length let (pass, msg) = expressionDoesNotMatch(expression, matcher: matcher, toNot: "to not", description: description) verify(pass, msg) + return self } /// DEPRECATED: Tests the actual value using a matcher to not match. /// /// Alias to toNot(). - public func notTo(_ matcher: U, description: String? = nil) + @available(*, deprecated, message: "Use Predicate instead") + @discardableResult + public func notTo(_ matcher: U, description: String? = nil) -> Self where U: Matcher, U.ValueType == T { - toNot(matcher, description: description) + return toNot(matcher, description: description) } ////////////////// NEW API ///////////////////// /// Tests the actual value using a matcher to match. - public func to(_ predicate: Predicate, description: String? = nil) { + @discardableResult + public func to(_ predicate: Predicate, description: String? = nil) -> Self { let (pass, msg) = execute(expression, .toMatch, predicate, to: "to", description: description) verify(pass, msg) + return self } /// Tests the actual value using a matcher to not match. - public func toNot(_ predicate: Predicate, description: String? = nil) { + @discardableResult + public func toNot(_ predicate: Predicate, description: String? = nil) -> Self { let (pass, msg) = execute(expression, .toNotMatch, predicate, to: "to not", description: description) verify(pass, msg) + return self } /// Tests the actual value using a matcher to not match. /// /// Alias to toNot(). - public func notTo(_ predicate: Predicate, description: String? = nil) { - toNot(predicate, description: description) + @discardableResult + public func notTo(_ predicate: Predicate, description: String? = nil) -> Self { + return toNot(predicate, description: description) } // see: diff --git a/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift b/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift index b0cbcc3..4efda7c 100644 --- a/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift +++ b/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift @@ -1,11 +1,9 @@ -import Foundation - public indirect enum ExpectationMessage { // --- Primary Expectations --- /// includes actual value in output ("expected to , got ") case expectedActualValueTo(/* message: */ String) /// uses a custom actual value string in output ("expected to , got ") - case expectedCustomValueTo(/* message: */ String, /* actual: */ String) + case expectedCustomValueTo(/* message: */ String, actual: String) /// excludes actual value in output ("expected to ") case expectedTo(/* message: */ String) /// allows any free-form message ("") @@ -23,14 +21,6 @@ public indirect enum ExpectationMessage { /// provides long-form multi-line explainations ("\n\n") case details(ExpectationMessage, String) - internal var sampleMessage: String { - let asStr = toString(actual: "", expected: "expected", to: "to") - let asFailureMessage = FailureMessage() - update(failureMessage: asFailureMessage) - // swiftlint:disable:next line_length - return "(toString(actual:expected:to:) -> \(asStr) || update(failureMessage:) -> \(asFailureMessage.stringValue))" - } - /// Returns the smallest message after the "expected to" string that summarizes the error. /// /// Returns the message part from ExpectationMessage, ignoring all .appends and .details. @@ -118,7 +108,7 @@ public indirect enum ExpectationMessage { case let .expectedActualValueTo(msg): return .expectedActualValueTo(message + msg) case let .expectedCustomValueTo(msg, actual): - return .expectedCustomValueTo(message + msg, actual) + return .expectedCustomValueTo(message + msg, actual: actual) default: return msg.visitLeafs(walk) } @@ -193,7 +183,7 @@ extension FailureMessage { var message: ExpectationMessage = .fail(userDescription ?? "") if actualValue != "" && actualValue != nil { - message = .expectedCustomValueTo(postfixMessage, actualValue ?? "") + message = .expectedCustomValueTo(postfixMessage, actual: actualValue ?? "") } else if postfixMessage != defaultMessage.postfixMessage { if actualValue == nil { message = .expectedTo(postfixMessage) @@ -212,6 +202,7 @@ extension FailureMessage { } #if canImport(Darwin) +import class Foundation.NSObject public class NMBExpectationMessage: NSObject { private let msg: ExpectationMessage @@ -228,7 +219,7 @@ public class NMBExpectationMessage: NSObject { } public init(expectedActualValueTo message: String, customActualValue actual: String) { - self.msg = .expectedCustomValueTo(message, actual) + self.msg = .expectedCustomValueTo(message, actual: actual) } public init(fail message: String) { diff --git a/Example/Pods/Nimble/Sources/Nimble/Expression.swift b/Example/Pods/Nimble/Sources/Nimble/Expression.swift index b6b2ee3..40dde89 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Expression.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Expression.swift @@ -1,15 +1,13 @@ -import Foundation - // Memoizes the given closure, only calling the passed // closure once; even if repeat calls to the returned closure internal func memoizedClosure(_ closure: @escaping () throws -> T) -> (Bool) throws -> T { var cache: T? - return ({ withoutCaching in + return { withoutCaching in if withoutCaching || cache == nil { cache = try closure() } return cache! - }) + } } /// Expression represents the closure of the value inside expect(...). diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift index dbbccb9..f067aff 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift @@ -1,70 +1,71 @@ -import Foundation - -public func allPass - (_ passFunc: @escaping (T?) throws -> Bool) -> Predicate - where U: Sequence, T == U.Iterator.Element { - let matcher = Predicate.simpleNilable("pass a condition") { actualExpression in - return PredicateStatus(bool: try passFunc(try actualExpression.evaluate())) - } - return createPredicate(matcher) +public func allPass( + _ passFunc: @escaping (S.Element?) throws -> Bool +) -> Predicate { + let matcher = Predicate.simpleNilable("pass a condition") { actualExpression in + return PredicateStatus(bool: try passFunc(try actualExpression.evaluate())) + } + return createPredicate(matcher) } -public func allPass - (_ passName: String, _ passFunc: @escaping (T?) throws -> Bool) -> Predicate - where U: Sequence, T == U.Iterator.Element { - let matcher = Predicate.simpleNilable(passName) { actualExpression in - return PredicateStatus(bool: try passFunc(try actualExpression.evaluate())) - } - return createPredicate(matcher) +public func allPass( + _ passName: String, + _ passFunc: @escaping (S.Element?) throws -> Bool +) -> Predicate { + let matcher = Predicate.simpleNilable(passName) { actualExpression in + return PredicateStatus(bool: try passFunc(try actualExpression.evaluate())) + } + return createPredicate(matcher) } -public func allPass(_ elementMatcher: M) -> Predicate - where S: Sequence, M: Matcher, S.Iterator.Element == M.ValueType { - return createPredicate(elementMatcher.predicate) +@available(*, deprecated, message: "Use Predicate instead") +public func allPass(_ elementMatcher: M) -> Predicate where S.Element == M.ValueType { + return createPredicate(elementMatcher.predicate) } -public func allPass(_ elementPredicate: Predicate) -> Predicate - where S: Sequence { - return createPredicate(elementPredicate) +public func allPass(_ elementPredicate: Predicate) -> Predicate { + return createPredicate(elementPredicate) } -private func createPredicate(_ elementMatcher: Predicate) -> Predicate - where S: Sequence { - return Predicate { actualExpression in - guard let actualValue = try actualExpression.evaluate() else { - return PredicateResult( - status: .fail, - message: .appends(.expectedTo("all pass"), " (use beNil() to match nils)") - ) - } +private func createPredicate(_ elementMatcher: Predicate) -> Predicate { + return Predicate { actualExpression in + guard let actualValue = try actualExpression.evaluate() else { + return PredicateResult( + status: .fail, + message: .appends(.expectedTo("all pass"), " (use beNil() to match nils)") + ) + } - var failure: ExpectationMessage = .expectedTo("all pass") - for currentElement in actualValue { - let exp = Expression( - expression: {currentElement}, location: actualExpression.location) - let predicateResult = try elementMatcher.satisfies(exp) - if predicateResult.status == .matches { - failure = predicateResult.message.prepended(expectation: "all ") - } else { - failure = predicateResult.message - .replacedExpectation({ .expectedTo($0.expectedMessage) }) - .wrappedExpectation( - before: "all ", - after: ", but failed first at element <\(stringify(currentElement))>" - + " in <\(stringify(actualValue))>" - ) - return PredicateResult(status: .doesNotMatch, message: failure) - } + var failure: ExpectationMessage = .expectedTo("all pass") + for currentElement in actualValue { + let exp = Expression( + expression: {currentElement}, location: actualExpression.location) + let predicateResult = try elementMatcher.satisfies(exp) + if predicateResult.status == .matches { + failure = predicateResult.message.prepended(expectation: "all ") + } else { + failure = predicateResult.message + .replacedExpectation({ .expectedTo($0.expectedMessage) }) + .wrappedExpectation( + before: "all ", + after: ", but failed first at element <\(stringify(currentElement))>" + + " in <\(stringify(actualValue))>" + ) + return PredicateResult(status: .doesNotMatch, message: failure) } - failure = failure.replacedExpectation({ expectation in - return .expectedTo(expectation.expectedMessage) - }) - return PredicateResult(status: .matches, message: failure) } + failure = failure.replacedExpectation({ expectation in + return .expectedTo(expectation.expectedMessage) + }) + return PredicateResult(status: .matches, message: failure) + } } #if canImport(Darwin) -extension NMBObjCMatcher { +import class Foundation.NSObject +import struct Foundation.NSFastEnumerationIterator +import protocol Foundation.NSFastEnumeration + +extension NMBPredicate { @objc public class func allPassMatcher(_ matcher: NMBMatcher) -> NMBPredicate { return NMBPredicate { actualExpression in let location = actualExpression.location diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Async.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Async.swift index 5022fe2..dc5e5ed 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Async.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Async.swift @@ -1,13 +1,21 @@ import Foundation +import Dispatch /// If you are running on a slower machine, it could be useful to increase the default timeout value /// or slow down poll interval. Default timeout interval is 1, and poll interval is 0.01. public struct AsyncDefaults { + public static var timeout: DispatchTimeInterval = .seconds(1) + public static var pollInterval: DispatchTimeInterval = .milliseconds(10) +} + +extension AsyncDefaults { + @available(*, unavailable, renamed: "timeout") public static var Timeout: TimeInterval = 1 + @available(*, unavailable, renamed: "pollInterval") public static var PollInterval: TimeInterval = 0.01 } -private func async(style: ExpectationStyle, predicate: Predicate, timeout: TimeInterval, poll: TimeInterval, fnName: String) -> Predicate { +private func async(style: ExpectationStyle, predicate: Predicate, timeout: DispatchTimeInterval, poll: DispatchTimeInterval, fnName: String) -> Predicate { return Predicate { actualExpression in let uncachedExpression = actualExpression.withoutCaching() let fnName = "expect(...).\(fnName)(...)" @@ -55,7 +63,7 @@ extension Expectation { /// @discussion /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. - public func toEventually(_ predicate: Predicate, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil) { + public func toEventually(_ predicate: Predicate, timeout: DispatchTimeInterval = AsyncDefaults.timeout, pollInterval: DispatchTimeInterval = AsyncDefaults.pollInterval, description: String? = nil) { nimblePrecondition(expression.isClosure, "NimbleInternalError", toEventuallyRequiresClosureError.stringValue) let (pass, msg) = execute( @@ -75,7 +83,7 @@ extension Expectation { /// @discussion /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. - public func toEventuallyNot(_ predicate: Predicate, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil) { + public func toEventuallyNot(_ predicate: Predicate, timeout: DispatchTimeInterval = AsyncDefaults.timeout, pollInterval: DispatchTimeInterval = AsyncDefaults.pollInterval, description: String? = nil) { nimblePrecondition(expression.isClosure, "NimbleInternalError", toEventuallyRequiresClosureError.stringValue) let (pass, msg) = execute( @@ -103,12 +111,12 @@ extension Expectation { /// @discussion /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. - public func toNotEventually(_ predicate: Predicate, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil) { + public func toNotEventually(_ predicate: Predicate, timeout: DispatchTimeInterval = AsyncDefaults.timeout, pollInterval: DispatchTimeInterval = AsyncDefaults.pollInterval, description: String? = nil) { return toEventuallyNot(predicate, timeout: timeout, pollInterval: pollInterval, description: description) } } -// Deprecated +@available(*, deprecated, message: "Use Predicate instead") extension Expectation { /// Tests the actual value using a matcher to match by checking continuously /// at each pollInterval until the timeout is reached. @@ -116,7 +124,7 @@ extension Expectation { /// @discussion /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. - public func toEventually(_ matcher: U, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil) + public func toEventually(_ matcher: U, timeout: DispatchTimeInterval = AsyncDefaults.timeout, pollInterval: DispatchTimeInterval = AsyncDefaults.pollInterval, description: String? = nil) where U: Matcher, U.ValueType == T { if expression.isClosure { let (pass, msg) = execute( @@ -145,7 +153,7 @@ extension Expectation { /// @discussion /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. - public func toEventuallyNot(_ matcher: U, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil) + public func toEventuallyNot(_ matcher: U, timeout: DispatchTimeInterval = AsyncDefaults.timeout, pollInterval: DispatchTimeInterval = AsyncDefaults.pollInterval, description: String? = nil) where U: Matcher, U.ValueType == T { if expression.isClosure { let (pass, msg) = expressionDoesNotMatch( @@ -174,7 +182,7 @@ extension Expectation { /// @discussion /// This function manages the main run loop (`NSRunLoop.mainRunLoop()`) while this function /// is executing. Any attempts to touch the run loop may cause non-deterministic behavior. - public func toNotEventually(_ matcher: U, timeout: TimeInterval = AsyncDefaults.Timeout, pollInterval: TimeInterval = AsyncDefaults.PollInterval, description: String? = nil) + public func toNotEventually(_ matcher: U, timeout: DispatchTimeInterval = AsyncDefaults.timeout, pollInterval: DispatchTimeInterval = AsyncDefaults.pollInterval, description: String? = nil) where U: Matcher, U.ValueType == T { return toEventuallyNot(matcher, timeout: timeout, pollInterval: pollInterval, description: description) } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift index 3a68b09..f01ca77 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift @@ -1,5 +1,3 @@ -import Foundation - private func matcherMessage(forType expectedType: T.Type) -> String { return "be a kind of \(String(describing: expectedType))" } @@ -14,12 +12,12 @@ public func beAKindOf(_ expectedType: T.Type) -> Predicate { let instance = try actualExpression.evaluate() guard let validInstance = instance else { - message = .expectedCustomValueTo(matcherMessage(forType: expectedType), "") + message = .expectedCustomValueTo(matcherMessage(forType: expectedType), actual: "") return PredicateResult(status: .fail, message: message) } message = .expectedCustomValueTo( "be a kind of \(String(describing: expectedType))", - "<\(String(describing: type(of: validInstance))) instance>" + actual: "<\(String(describing: type(of: validInstance))) instance>" ) return PredicateResult( @@ -30,6 +28,7 @@ public func beAKindOf(_ expectedType: T.Type) -> Predicate { } #if canImport(Darwin) +import class Foundation.NSObject /// A Nimble matcher that succeeds when the actual value is an instance of the given class. /// @see beAnInstanceOf if you want to match against the exact class @@ -43,13 +42,13 @@ public func beAKindOf(_ expectedClass: AnyClass) -> Predicate { status = PredicateStatus(bool: instance != nil && instance!.isKind(of: expectedClass)) message = .expectedCustomValueTo( matcherMessage(forClass: expectedClass), - "<\(String(describing: type(of: validInstance))) instance>" + actual: "<\(String(describing: type(of: validInstance))) instance>" ) } else { status = .fail message = .expectedCustomValueTo( matcherMessage(forClass: expectedClass), - "" + actual: "" ) } @@ -57,8 +56,8 @@ public func beAKindOf(_ expectedClass: AnyClass) -> Predicate { } } -extension NMBObjCMatcher { - @objc public class func beAKindOfMatcher(_ expected: AnyClass) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beAKindOfMatcher(_ expected: AnyClass) -> NMBPredicate { return NMBPredicate { actualExpression in return try beAKindOf(expected).satisfies(actualExpression).toObjectiveC() } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift index 3cef3a7..47ea663 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift @@ -16,7 +16,7 @@ public func beAnInstanceOf(_ expectedType: T.Type) -> Predicate { return PredicateResult( status: PredicateStatus(bool: type(of: validInstance) == expectedType), - message: .expectedCustomValueTo(errorMessage, actualString) + message: .expectedCustomValueTo(errorMessage, actual: actualString) ) } } @@ -40,14 +40,14 @@ public func beAnInstanceOf(_ expectedClass: AnyClass) -> Predicate { #endif return PredicateResult( status: PredicateStatus(bool: matches), - message: .expectedCustomValueTo(errorMessage, actualString) + message: .expectedCustomValueTo(errorMessage, actual: actualString) ) } } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beAnInstanceOfMatcher(_ expected: AnyClass) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beAnInstanceOfMatcher(_ expected: AnyClass) -> NMBPredicate { return NMBPredicate { actualExpression in return try beAnInstanceOf(expected).satisfies(actualExpression).toObjectiveC() } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift index d6fd1ee..c05f967 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift @@ -11,7 +11,7 @@ internal func isCloseTo(_ actualValue: NMBDoubleConvertible?, return PredicateResult( bool: actualValue != nil && abs(actualValue!.doubleValue - expectedValue.doubleValue) < delta, - message: .expectedCustomValueTo(errorMessage, "<\(stringify(actualValue))>") + message: .expectedCustomValueTo(errorMessage, actual: "<\(stringify(actualValue))>") ) } @@ -36,56 +36,31 @@ public func beCloseTo(_ expectedValue: NMBDoubleConvertible, within delta: Doubl } #if canImport(Darwin) -public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { - // swiftlint:disable identifier_name - var _expected: NSNumber - var _delta: CDouble - // swiftlint:enable identifier_name - init(expected: NSNumber, within: CDouble) { +public class NMBObjCBeCloseToPredicate: NMBPredicate { + private let _expected: NSNumber + + fileprivate init(expected: NSNumber, within: CDouble) { _expected = expected - _delta = within - } - @objc public func matches(_ actualExpression: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { - let actualBlock: () -> NMBDoubleConvertible? = ({ - return actualExpression() as? NMBDoubleConvertible - }) - let expr = Expression(expression: actualBlock, location: location) - let matcher = beCloseTo(self._expected, within: self._delta) - - do { - return try matcher.matches(expr, failureMessage: failureMessage) - } catch let error { - failureMessage.stringValue = "unexpected error thrown: <\(error)>" - return false + let predicate = beCloseTo(expected, within: within) + let predicateBlock: PredicateBlock = { actualExpression in + let expr = actualExpression.cast { $0 as? NMBDoubleConvertible } + return try predicate.satisfies(expr).toObjectiveC() } + super.init(predicate: predicateBlock) } - @objc public func doesNotMatch(_ actualExpression: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { - let actualBlock: () -> NMBDoubleConvertible? = ({ - return actualExpression() as? NMBDoubleConvertible - }) - let expr = Expression(expression: actualBlock, location: location) - let matcher = beCloseTo(self._expected, within: self._delta) - - do { - return try matcher.doesNotMatch(expr, failureMessage: failureMessage) - } catch let error { - failureMessage.stringValue = "unexpected error thrown: <\(error)>" - return false + @objc public var within: (CDouble) -> NMBObjCBeCloseToPredicate { + let expected = _expected + return { delta in + return NMBObjCBeCloseToPredicate(expected: expected, within: delta) } } - - @objc public var within: (CDouble) -> NMBObjCBeCloseToMatcher { - return ({ delta in - return NMBObjCBeCloseToMatcher(expected: self._expected, within: delta) - }) - } } -extension NMBObjCMatcher { - @objc public class func beCloseToMatcher(_ expected: NSNumber, within: CDouble) -> NMBObjCBeCloseToMatcher { - return NMBObjCBeCloseToMatcher(expected: expected, within: within) +extension NMBPredicate { + @objc public class func beCloseToMatcher(_ expected: NSNumber, within: CDouble) -> NMBObjCBeCloseToPredicate { + return NMBObjCBeCloseToPredicate(expected: expected, within: within) } } #endif @@ -113,23 +88,27 @@ public func beCloseTo(_ expectedValues: [Double], within delta: Double = Default infix operator ≈ : ComparisonPrecedence -// swiftlint:disable:next identifier_name -public func ≈(lhs: Expectation<[Double]>, rhs: [Double]) { - lhs.to(beCloseTo(rhs)) +extension Expectation where T == [Double] { + // swiftlint:disable:next identifier_name + public static func ≈(lhs: Expectation, rhs: [Double]) { + lhs.to(beCloseTo(rhs)) + } } -// swiftlint:disable:next identifier_name -public func ≈(lhs: Expectation, rhs: NMBDoubleConvertible) { - lhs.to(beCloseTo(rhs)) -} +extension Expectation where T == NMBDoubleConvertible { + // swiftlint:disable:next identifier_name + public static func ≈(lhs: Expectation, rhs: NMBDoubleConvertible) { + lhs.to(beCloseTo(rhs)) + } -// swiftlint:disable:next identifier_name -public func ≈(lhs: Expectation, rhs: (expected: NMBDoubleConvertible, delta: Double)) { - lhs.to(beCloseTo(rhs.expected, within: rhs.delta)) -} + // swiftlint:disable:next identifier_name + public static func ≈(lhs: Expectation, rhs: (expected: NMBDoubleConvertible, delta: Double)) { + lhs.to(beCloseTo(rhs.expected, within: rhs.delta)) + } -public func == (lhs: Expectation, rhs: (expected: NMBDoubleConvertible, delta: Double)) { - lhs.to(beCloseTo(rhs.expected, within: rhs.delta)) + public static func == (lhs: Expectation, rhs: (expected: NMBDoubleConvertible, delta: Double)) { + lhs.to(beCloseTo(rhs.expected, within: rhs.delta)) + } } // make this higher precedence than exponents so the Doubles either end aren't pulled in diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift index 860287f..3e890d5 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift @@ -4,9 +4,8 @@ import Foundation /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - guard let actual = try actualExpression.evaluate() else { - return .fail - } + guard let actual = try actualExpression.evaluate() else { return .fail } + var generator = actual.makeIterator() return PredicateStatus(bool: generator.next() == nil) } @@ -16,9 +15,7 @@ public func beEmpty() -> Predicate { /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - guard let actual = try actualExpression.evaluate() else { - return .fail - } + guard let actual = try actualExpression.evaluate() else { return .fail } return PredicateStatus(bool: actual.isEmpty) } } @@ -27,9 +24,7 @@ public func beEmpty() -> Predicate { /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - guard let actual = try actualExpression.evaluate() else { - return .fail - } + guard let actual = try actualExpression.evaluate() else { return .fail } return PredicateStatus(bool: actual.isEmpty) } } @@ -38,8 +33,8 @@ public func beEmpty() -> Predicate { /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - let actualString = try actualExpression.evaluate() - return PredicateStatus(bool: actualString == nil || NSString(string: actualString!).length == 0) + guard let actual = try actualExpression.evaluate() else { return .fail } + return PredicateStatus(bool: actual.isEmpty) } } @@ -47,8 +42,8 @@ public func beEmpty() -> Predicate { /// means the are no items in that collection. For NSString instances, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - let actualString = try actualExpression.evaluate() - return PredicateStatus(bool: actualString == nil || actualString!.length == 0) + guard let actual = try actualExpression.evaluate() else { return .fail } + return PredicateStatus(bool: actual.length == 0) } } @@ -58,42 +53,42 @@ public func beEmpty() -> Predicate { /// A Nimble matcher that succeeds when a value is "empty". For collections, this /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { - return Predicate.simple("be empty") { actualExpression in - let actualDictionary = try actualExpression.evaluate() - return PredicateStatus(bool: actualDictionary == nil || actualDictionary!.count == 0) - } + return Predicate.simple("be empty") { actualExpression in + guard let actual = try actualExpression.evaluate() else { return .fail } + return PredicateStatus(bool: actual.count == 0) + } } /// A Nimble matcher that succeeds when a value is "empty". For collections, this /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { - return Predicate.simple("be empty") { actualExpression in - let actualArray = try actualExpression.evaluate() - return PredicateStatus(bool: actualArray == nil || actualArray!.count == 0) - } + return Predicate.simple("be empty") { actualExpression in + guard let actual = try actualExpression.evaluate() else { return .fail } + return PredicateStatus(bool: actual.count == 0) + } } /// A Nimble matcher that succeeds when a value is "empty". For collections, this /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - let actual = try actualExpression.evaluate() - return PredicateStatus(bool: actual == nil || actual!.count == 0) + guard let actual = try actualExpression.evaluate() else { return .fail } + return PredicateStatus(bool: actual.count == 0) } } #if canImport(Darwin) -extension NMBObjCMatcher { +extension NMBPredicate { @objc public class func beEmptyMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try actualExpression.evaluate() if let value = actualValue as? NMBCollection { - let expr = Expression(expression: ({ value as NMBCollection }), location: location) + let expr = Expression(expression: ({ value }), location: location) return try beEmpty().satisfies(expr).toObjectiveC() } else if let value = actualValue as? NSString { - let expr = Expression(expression: ({ value as String }), location: location) + let expr = Expression(expression: ({ value }), location: location) return try beEmpty().satisfies(expr).toObjectiveC() } else if let actualValue = actualValue { // swiftlint:disable:next line_length diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift index 4a4cdd2..a8d1212 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift @@ -1,16 +1,20 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is greater than the expected value. public func beGreaterThan(_ expectedValue: T?) -> Predicate { let errorMessage = "be greater than <\(stringify(expectedValue))>" return Predicate.simple(errorMessage) { actualExpression in - if let actual = try actualExpression.evaluate(), let expected = expectedValue { - return PredicateStatus(bool: actual > expected) - } - return .fail + guard let actual = try actualExpression.evaluate(), let expected = expectedValue else { return .fail } + + return PredicateStatus(bool: actual > expected) } } +public func >(lhs: Expectation, rhs: T) { + lhs.to(beGreaterThan(rhs)) +} + +#if canImport(Darwin) +import enum Foundation.ComparisonResult + /// A Nimble matcher that succeeds when the actual value is greater than the expected value. public func beGreaterThan(_ expectedValue: NMBComparable?) -> Predicate { let errorMessage = "be greater than <\(stringify(expectedValue))>" @@ -22,17 +26,12 @@ public func beGreaterThan(_ expectedValue: NMBComparable?) -> Predicate(lhs: Expectation, rhs: T) { - lhs.to(beGreaterThan(rhs)) -} - public func > (lhs: Expectation, rhs: NMBComparable?) { lhs.to(beGreaterThan(rhs)) } -#if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } return try beGreaterThan(expected).satisfies(expr).toObjectiveC() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift index 39d9e63..affa58c 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift @@ -1,18 +1,21 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is greater than /// or equal to the expected value. public func beGreaterThanOrEqualTo(_ expectedValue: T?) -> Predicate { let message = "be greater than or equal to <\(stringify(expectedValue))>" return Predicate.simple(message) { actualExpression in - let actualValue = try actualExpression.evaluate() - if let actual = actualValue, let expected = expectedValue { - return PredicateStatus(bool: actual >= expected) - } - return .fail + guard let actual = try actualExpression.evaluate(), let expected = expectedValue else { return .fail } + + return PredicateStatus(bool: actual >= expected) } } +public func >=(lhs: Expectation, rhs: T) { + lhs.to(beGreaterThanOrEqualTo(rhs)) +} + +#if canImport(Darwin) +import enum Foundation.ComparisonResult + /// A Nimble matcher that succeeds when the actual value is greater than /// or equal to the expected value. public func beGreaterThanOrEqualTo(_ expectedValue: T?) -> Predicate { @@ -24,17 +27,12 @@ public func beGreaterThanOrEqualTo(_ expectedValue: T?) -> Pre } } -public func >=(lhs: Expectation, rhs: T) { - lhs.to(beGreaterThanOrEqualTo(rhs)) -} - public func >=(lhs: Expectation, rhs: T) { lhs.to(beGreaterThanOrEqualTo(rhs)) } -#if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } return try beGreaterThanOrEqualTo(expected).satisfies(expr).toObjectiveC() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift index 49e503e..85e14f9 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift @@ -1,36 +1,28 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is the same instance /// as the expected instance. public func beIdenticalTo(_ expected: Any?) -> Predicate { return Predicate.define { actualExpression in - #if os(Linux) && !swift(>=4.1.50) - let actual = try actualExpression.evaluate() as? AnyObject - #else - let actual = try actualExpression.evaluate() as AnyObject? - #endif + let actual = try actualExpression.evaluate() as AnyObject? - let bool: Bool - #if os(Linux) && !swift(>=4.1.50) - bool = actual === (expected as? AnyObject) && actual !== nil - #else - bool = actual === (expected as AnyObject?) && actual !== nil - #endif + let bool = actual === (expected as AnyObject?) && actual !== nil return PredicateResult( bool: bool, message: .expectedCustomValueTo( "be identical to \(identityAsString(expected))", - "\(identityAsString(actual))" + actual: "\(identityAsString(actual))" ) ) } } -public func === (lhs: Expectation, rhs: Any?) { - lhs.to(beIdenticalTo(rhs)) -} -public func !== (lhs: Expectation, rhs: Any?) { - lhs.toNot(beIdenticalTo(rhs)) +extension Expectation where T == Any { + public static func === (lhs: Expectation, rhs: Any?) { + lhs.to(beIdenticalTo(rhs)) + } + + public static func !== (lhs: Expectation, rhs: Any?) { + lhs.toNot(beIdenticalTo(rhs)) + } } /// A Nimble matcher that succeeds when the actual value is the same instance @@ -42,8 +34,10 @@ public func be(_ expected: Any?) -> Predicate { } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBMatcher { +import class Foundation.NSObject + +extension NMBPredicate { + @objc public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBPredicate { return NMBPredicate { actualExpression in let aExpr = actualExpression.cast { $0 as Any? } return try beIdenticalTo(expected).satisfies(aExpr).toObjectiveC() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift index ef0a7d4..256f3a6 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift @@ -1,16 +1,20 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is less than the expected value. public func beLessThan(_ expectedValue: T?) -> Predicate { let message = "be less than <\(stringify(expectedValue))>" return Predicate.simple(message) { actualExpression in - if let actual = try actualExpression.evaluate(), let expected = expectedValue { - return PredicateStatus(bool: actual < expected) - } - return .fail + guard let actual = try actualExpression.evaluate(), let expected = expectedValue else { return .fail } + + return PredicateStatus(bool: actual < expected) } } +public func <(lhs: Expectation, rhs: T) { + lhs.to(beLessThan(rhs)) +} + +#if canImport(Darwin) +import enum Foundation.ComparisonResult + /// A Nimble matcher that succeeds when the actual value is less than the expected value. public func beLessThan(_ expectedValue: NMBComparable?) -> Predicate { let message = "be less than <\(stringify(expectedValue))>" @@ -21,17 +25,12 @@ public func beLessThan(_ expectedValue: NMBComparable?) -> Predicate(lhs: Expectation, rhs: T) { - lhs.to(beLessThan(rhs)) -} - public func < (lhs: Expectation, rhs: NMBComparable?) { lhs.to(beLessThan(rhs)) } -#if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } return try beLessThan(expected).satisfies(expr).toObjectiveC() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift index 30ce043..6174be5 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift @@ -1,16 +1,20 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is less than /// or equal to the expected value. public func beLessThanOrEqualTo(_ expectedValue: T?) -> Predicate { return Predicate.simple("be less than or equal to <\(stringify(expectedValue))>") { actualExpression in - if let actual = try actualExpression.evaluate(), let expected = expectedValue { - return PredicateStatus(bool: actual <= expected) - } - return .fail + guard let actual = try actualExpression.evaluate(), let expected = expectedValue else { return .fail } + + return PredicateStatus(bool: actual <= expected) } } +public func <=(lhs: Expectation, rhs: T) { + lhs.to(beLessThanOrEqualTo(rhs)) +} + +#if canImport(Darwin) +import enum Foundation.ComparisonResult + /// A Nimble matcher that succeeds when the actual value is less than /// or equal to the expected value. public func beLessThanOrEqualTo(_ expectedValue: T?) -> Predicate { @@ -21,17 +25,12 @@ public func beLessThanOrEqualTo(_ expectedValue: T?) -> Predic } } -public func <=(lhs: Expectation, rhs: T) { - lhs.to(beLessThanOrEqualTo(rhs)) -} - public func <=(lhs: Expectation, rhs: T) { lhs.to(beLessThanOrEqualTo(rhs)) } -#if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } return try beLessThanOrEqualTo(expected).satisfies(expr).toObjectiveC() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift index 788234b..1676ba4 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift @@ -119,29 +119,29 @@ public func beFalsy() -> Predicate NMBMatcher { +extension NMBPredicate { + @objc public class func beTruthyMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try beTruthy().satisfies(expr).toObjectiveC() } } - @objc public class func beFalsyMatcher() -> NMBMatcher { + @objc public class func beFalsyMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try beFalsy().satisfies(expr).toObjectiveC() } } - @objc public class func beTrueMatcher() -> NMBMatcher { + @objc public class func beTrueMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try beTrue().satisfies(expr).toObjectiveC() } } - @objc public class func beFalseMatcher() -> NMBMatcher { + @objc public class func beFalseMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in let expr = actualExpression.cast { value -> Bool? in guard let value = value else { return nil } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift index 0f21d41..270bd35 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift @@ -1,5 +1,3 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is nil. public func beNil() -> Predicate { return Predicate.simpleNilable("be nil") { actualExpression in @@ -9,8 +7,10 @@ public func beNil() -> Predicate { } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beNilMatcher() -> NMBMatcher { +import Foundation + +extension NMBPredicate { + @objc public class func beNilMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in return try beNil().satisfies(actualExpression).toObjectiveC() } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift index 9a7eafd..c4bbaf6 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift @@ -1,5 +1,3 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is Void. public func beVoid() -> Predicate<()> { return Predicate.simpleNilable("be void") { actualExpression in diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift index 3183eb9..1da7818 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift @@ -2,14 +2,12 @@ import Foundation /// A Nimble matcher that succeeds when the actual sequence's first element /// is equal to the expected value. -public func beginWith(_ startingElement: T) -> Predicate - where S.Iterator.Element == T { +public func beginWith(_ startingElement: S.Element) -> Predicate where S.Element: Equatable { return Predicate.simple("begin with <\(startingElement)>") { actualExpression in - if let actualValue = try actualExpression.evaluate() { - var actualGenerator = actualValue.makeIterator() - return PredicateStatus(bool: actualGenerator.next() == startingElement) - } - return .fail + guard let actualValue = try actualExpression.evaluate() else { return .fail } + + var actualGenerator = actualValue.makeIterator() + return PredicateStatus(bool: actualGenerator.next() == startingElement) } } @@ -34,16 +32,15 @@ public func beginWith(_ startingElement: Any) -> Predicate /// where the expected substring's location is zero. public func beginWith(_ startingSubstring: String) -> Predicate { return Predicate.simple("begin with <\(startingSubstring)>") { actualExpression in - if let actual = try actualExpression.evaluate() { - return PredicateStatus(bool: actual.hasPrefix(startingSubstring)) - } - return .fail + guard let actual = try actualExpression.evaluate() else { return .fail } + + return PredicateStatus(bool: actual.hasPrefix(startingSubstring)) } } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func beginWithMatcher(_ expected: Any) -> NMBMatcher { +extension NMBPredicate { + @objc public class func beginWithMatcher(_ expected: Any) -> NMBPredicate { return NMBPredicate { actualExpression in let actual = try actualExpression.evaluate() if actual is String { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWithPrefix.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWithPrefix.swift new file mode 100644 index 0000000..c3a79b1 --- /dev/null +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWithPrefix.swift @@ -0,0 +1,39 @@ +/// A Nimble matcher that succeeds when the exepected sequence is a prefix of the actual sequence. +/// +/// This is a matcher abstraction for https://developer.apple.com/documentation/swift/sequence/2854218-starts +public func beginWith(prefix expectedPrefix: Seq2?) + -> Predicate where Seq1.Element: Equatable, Seq1.Element == Seq2.Element { + return Predicate.define("begin with <\(stringify(expectedPrefix))>") { (actualExpression, msg) in + let actualPrefix = try actualExpression.evaluate() + switch (expectedPrefix, actualPrefix) { + case (nil, _?): + return PredicateResult(status: .fail, message: msg.appendedBeNilHint()) + case (nil, nil), (_, nil): + return PredicateResult(status: .fail, message: msg) + case (let expected?, let actual?): + let matches = actual.starts(with: expected) + return PredicateResult(bool: matches, message: msg) + } + } +} + +/// A Nimble matcher that succeeds when the expected sequence is the prefix of the actual sequence, using the given predicate as the equivalence test. +/// +/// This is a matcher abstraction for https://developer.apple.com/documentation/swift/sequence/2996828-starts +public func beginWith( + prefix expectedPrefix: Seq2?, + by areEquivalent: @escaping (Seq1.Element, Seq2.Element) -> Bool +) -> Predicate { + return Predicate.define("begin with <\(stringify(expectedPrefix))>") { (actualExpression, msg) in + let actualPrefix = try actualExpression.evaluate() + switch (expectedPrefix, actualPrefix) { + case (nil, _?): + return PredicateResult(status: .fail, message: msg.appendedBeNilHint()) + case (nil, nil), (_, nil): + return PredicateResult(status: .fail, message: msg) + case (let expected?, let actual?): + let matches = actual.starts(with: expected, by: areEquivalent) + return PredicateResult(bool: matches, message: msg) + } + } +} diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift index 6974a4d..c7fc15b 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift @@ -1,63 +1,56 @@ +#if canImport(Foundation) import Foundation +#endif /// A Nimble matcher that succeeds when the actual sequence contains the expected values. -public func contain(_ items: T...) -> Predicate - where S.Element == T { +public func contain(_ items: S.Element...) -> Predicate where S.Element: Equatable { return contain(items) } /// A Nimble matcher that succeeds when the actual sequence contains the expected values. -public func contain(_ items: [T]) -> Predicate - where S.Element == T { +public func contain(_ items: [S.Element]) -> Predicate where S.Element: Equatable { return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in - if let actual = try actualExpression.evaluate() { - let matches = items.allSatisfy { - return actual.contains($0) - } - return PredicateStatus(bool: matches) + guard let actual = try actualExpression.evaluate() else { return .fail } + + let matches = items.allSatisfy { + return actual.contains($0) } - return .fail + return PredicateStatus(bool: matches) } } /// A Nimble matcher that succeeds when the actual set contains the expected values. -public func contain(_ items: T...) -> Predicate - where S.Element == T { - return contain(items) +public func contain(_ items: S.Element...) -> Predicate where S.Element: Equatable { + return contain(items) } /// A Nimble matcher that succeeds when the actual set contains the expected values. -public func contain(_ items: [T]) -> Predicate - where S.Element == T { - return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in - if let actual = try actualExpression.evaluate() { - let matches = items.allSatisfy { - return actual.contains($0) - } - return PredicateStatus(bool: matches) - } - return .fail +public func contain(_ items: [S.Element]) -> Predicate where S.Element: Equatable { + return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in + guard let actual = try actualExpression.evaluate() else { return .fail } + + let matches = items.allSatisfy { + return actual.contains($0) } + return PredicateStatus(bool: matches) + } } /// A Nimble matcher that succeeds when the actual set contains the expected values. -public func contain(_ items: T...) -> Predicate - where S.Element == T { - return contain(items) +public func contain(_ items: S.Element...) -> Predicate where S.Element: Equatable { + return contain(items) } /// A Nimble matcher that succeeds when the actual set contains the expected values. -public func contain(_ items: [T]) -> Predicate - where S.Element == T { - return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in - if let actual = try actualExpression.evaluate() { - let matches = items.allSatisfy { - return actual.contains($0) - } - return PredicateStatus(bool: matches) - } - return .fail +public func contain(_ items: [S.Element]) -> Predicate where S.Element: Equatable { + return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in + guard let actual = try actualExpression.evaluate() else { return .fail } + + let matches = items.allSatisfy { + return actual.contains($0) } + return PredicateStatus(bool: matches) + } } /// A Nimble matcher that succeeds when the actual string contains the expected substring. @@ -67,17 +60,17 @@ public func contain(_ substrings: String...) -> Predicate { public func contain(_ substrings: [String]) -> Predicate { return Predicate.simple("contain <\(arrayAsString(substrings))>") { actualExpression in - if let actual = try actualExpression.evaluate() { - let matches = substrings.allSatisfy { - let range = actual.range(of: $0) - return range != nil && !range!.isEmpty - } - return PredicateStatus(bool: matches) + guard let actual = try actualExpression.evaluate() else { return .fail } + + let matches = substrings.allSatisfy { + let range = actual.range(of: $0) + return range != nil && !range!.isEmpty } - return .fail + return PredicateStatus(bool: matches) } } +#if canImport(Foundation) /// A Nimble matcher that succeeds when the actual string contains the expected substring. public func contain(_ substrings: NSString...) -> Predicate { return contain(substrings) @@ -85,13 +78,13 @@ public func contain(_ substrings: NSString...) -> Predicate { public func contain(_ substrings: [NSString]) -> Predicate { return Predicate.simple("contain <\(arrayAsString(substrings))>") { actualExpression in - if let actual = try actualExpression.evaluate() { - let matches = substrings.allSatisfy { actual.range(of: $0.description).length != 0 } - return PredicateStatus(bool: matches) - } - return .fail + guard let actual = try actualExpression.evaluate() else { return .fail } + + let matches = substrings.allSatisfy { actual.range(of: $0.description).length != 0 } + return PredicateStatus(bool: matches) } } +#endif /// A Nimble matcher that succeeds when the actual collection contains the expected object. public func contain(_ items: Any?...) -> Predicate { @@ -101,6 +94,7 @@ public func contain(_ items: Any?...) -> Predicate { public func contain(_ items: [Any?]) -> Predicate { return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in guard let actual = try actualExpression.evaluate() else { return .fail } + let matches = items.allSatisfy { item in return item.map { actual.contains($0) } ?? false } @@ -109,8 +103,8 @@ public func contain(_ items: [Any?]) -> Predicate { } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func containMatcher(_ expected: [NSObject]) -> NMBMatcher { +extension NMBPredicate { + @objc public class func containMatcher(_ expected: [NSObject]) -> NMBPredicate { return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try actualExpression.evaluate() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift index 331f3bc..2e7875b 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift @@ -1,7 +1,6 @@ -import Foundation - -public func containElementSatisfying(_ predicate: @escaping ((T) -> Bool), _ predicateDescription: String = "") -> Predicate where S.Iterator.Element == T { - +public func containElementSatisfying( + _ predicate: @escaping ((S.Element) -> Bool), _ predicateDescription: String = "" +) -> Predicate { return Predicate.define { actualExpression in let message: ExpectationMessage if predicateDescription == "" { @@ -25,34 +24,38 @@ public func containElementSatisfying(_ predicate: @escaping ((T) } #if canImport(Darwin) - extension NMBObjCMatcher { - @objc public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBMatcher { - return NMBPredicate { actualExpression in - let value = try actualExpression.evaluate() - guard let enumeration = value as? NSFastEnumeration else { - let message = ExpectationMessage.fail( - "containElementSatisfying must be provided an NSFastEnumeration object" - ) - return NMBPredicateResult(status: .fail, message: message.toObjectiveC()) - } - - let message = ExpectationMessage - .expectedTo("find object in collection that satisfies predicate") - .toObjectiveC() +import class Foundation.NSObject +import struct Foundation.NSFastEnumerationIterator +import protocol Foundation.NSFastEnumeration + +extension NMBPredicate { + @objc public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBPredicate { + return NMBPredicate { actualExpression in + let value = try actualExpression.evaluate() + guard let enumeration = value as? NSFastEnumeration else { + let message = ExpectationMessage.fail( + "containElementSatisfying must be provided an NSFastEnumeration object" + ) + return NMBPredicateResult(status: .fail, message: message.toObjectiveC()) + } - var iterator = NSFastEnumerationIterator(enumeration) - while let item = iterator.next() { - guard let object = item as? NSObject else { - continue - } + let message = ExpectationMessage + .expectedTo("find object in collection that satisfies predicate") + .toObjectiveC() - if predicate(object) { - return NMBPredicateResult(status: .matches, message: message) - } + var iterator = NSFastEnumerationIterator(enumeration) + while let item = iterator.next() { + guard let object = item as? NSObject else { + continue } - return NMBPredicateResult(status: .doesNotMatch, message: message) + if predicate(object) { + return NMBPredicateResult(status: .matches, message: message) + } } + + return NMBPredicateResult(status: .doesNotMatch, message: message) } } +} #endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift index 1704e94..708cf1c 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift @@ -1,6 +1,10 @@ -/// A Nimble matcher that succeeds when the actual sequence contain the same elements in the same order to the exepected sequence. -public func elementsEqual(_ expectedValue: S?) -> Predicate where S.Element: Equatable { - // A matcher abstraction for https://developer.apple.com/documentation/swift/sequence/2949668-elementsequal +/// A Nimble matcher that succeeds when the actual sequence and the exepected sequence contain the same elements in +/// the same order. +/// +/// This is a matcher abstraction for https://developer.apple.com/documentation/swift/sequence/2854213-elementsequal +public func elementsEqual( + _ expectedValue: Seq2? +) -> Predicate where Seq1.Element: Equatable, Seq1.Element == Seq2.Element { return Predicate.define("elementsEqual <\(stringify(expectedValue))>") { (actualExpression, msg) in let actualValue = try actualExpression.evaluate() switch (expectedValue, actualValue) { @@ -14,3 +18,25 @@ public func elementsEqual(_ expectedValue: S?) -> Predicate wher } } } + +/// A Nimble matcher that succeeds when the actual sequence and the exepected sequence contain equivalent elements in +/// the same order, using the given predicate as the equivalence test. +/// +/// This is a matcher abstraction for https://developer.apple.com/documentation/swift/sequence/2949668-elementsequal +public func elementsEqual( + _ expectedValue: Seq2?, + by areEquivalent: @escaping (Seq1.Element, Seq2.Element) -> Bool +) -> Predicate { + return Predicate.define("elementsEqual <\(stringify(expectedValue))>") { (actualExpression, msg) in + let actualValue = try actualExpression.evaluate() + switch (expectedValue, actualValue) { + case (nil, _?): + return PredicateResult(status: .fail, message: msg.appendedBeNilHint()) + case (nil, nil), (_, nil): + return PredicateResult(status: .fail, message: msg) + case (let expected?, let actual?): + let matches = actual.elementsEqual(expected, by: areEquivalent) + return PredicateResult(bool: matches, message: msg) + } + } +} diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift index 13bdb31..16c4d06 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift @@ -2,21 +2,19 @@ import Foundation /// A Nimble matcher that succeeds when the actual sequence's last element /// is equal to the expected value. -public func endWith(_ endingElement: T) -> Predicate - where S.Iterator.Element == T { +public func endWith(_ endingElement: S.Element) -> Predicate where S.Element: Equatable { return Predicate.simple("end with <\(endingElement)>") { actualExpression in - if let actualValue = try actualExpression.evaluate() { - var actualGenerator = actualValue.makeIterator() - var lastItem: T? - var item: T? - repeat { - lastItem = item - item = actualGenerator.next() - } while(item != nil) + guard let actualValue = try actualExpression.evaluate() else { return .fail } - return PredicateStatus(bool: lastItem == endingElement) - } - return .fail + var actualGenerator = actualValue.makeIterator() + var lastItem: S.Element? + var item: S.Element? + repeat { + lastItem = item + item = actualGenerator.next() + } while(item != nil) + + return PredicateStatus(bool: lastItem == endingElement) } } @@ -25,6 +23,7 @@ public func endWith(_ endingElement: T) -> Predicate< public func endWith(_ endingElement: Any) -> Predicate { return Predicate.simple("end with <\(endingElement)>") { actualExpression in guard let collection = try actualExpression.evaluate() else { return .fail } + guard collection.count > 0 else { return PredicateStatus(bool: false) } #if os(Linux) guard let collectionValue = collection.object(at: collection.count - 1) as? NSObject else { @@ -43,16 +42,15 @@ public func endWith(_ endingElement: Any) -> Predicate { /// expected substring's length. public func endWith(_ endingSubstring: String) -> Predicate { return Predicate.simple("end with <\(endingSubstring)>") { actualExpression in - if let collection = try actualExpression.evaluate() { - return PredicateStatus(bool: collection.hasSuffix(endingSubstring)) - } - return .fail + guard let collection = try actualExpression.evaluate() else { return .fail } + + return PredicateStatus(bool: collection.hasSuffix(endingSubstring)) } } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func endWithMatcher(_ expected: Any) -> NMBMatcher { +extension NMBPredicate { + @objc public class func endWithMatcher(_ expected: Any) -> NMBPredicate { return NMBPredicate { actualExpression in let actual = try actualExpression.evaluate() if actual is String { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift index b08d5f6..190edb4 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift @@ -1,5 +1,3 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual value is equal to the expected value. /// Values can support equal by supporting the Equatable protocol. /// @@ -71,7 +69,7 @@ private func equal(_ expectedValue: Set?, stringify: @escaping (Set?) - errorMessage = .expectedCustomValueTo( "equal <\(stringify(expectedValue))>", - "<\(stringify(actualValue))>" + actual: "<\(stringify(actualValue))>" ) if expectedValue == actualValue { @@ -138,8 +136,10 @@ public func !=(lhs: Expectation<[T: C]>, rhs: [T: C]?) { } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func equalMatcher(_ expected: NSObject) -> NMBMatcher { +import class Foundation.NSObject + +extension NMBPredicate { + @objc public class func equalMatcher(_ expected: NSObject) -> NMBPredicate { return NMBPredicate { actualExpression in return try equal(expected).satisfies(actualExpression).toObjectiveC() } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift index 984e2d4..20397f5 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift @@ -1,5 +1,3 @@ -import Foundation - // The `haveCount` matchers do not print the full string representation of the collection value, // instead they only print the type name and the expected count. This makes it easier to understand // the reason for failed expectations. See: https://github.com/Quick/Nimble/issues/308. @@ -13,7 +11,7 @@ public func haveCount(_ expectedValue: Int) -> Predicate { let message = ExpectationMessage .expectedCustomValueTo( "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))", - "\(actualValue.count)" + actual: "\(actualValue.count)" ) .appended(details: "Actual Value: \(stringify(actualValue))") @@ -33,7 +31,7 @@ public func haveCount(_ expectedValue: Int) -> Predicate { let message = ExpectationMessage .expectedCustomValueTo( "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))", - "\(actualValue.count)" + actual: "\(actualValue.count)" ) .appended(details: "Actual Value: \(stringify(actualValue))") @@ -46,8 +44,10 @@ public func haveCount(_ expectedValue: Int) -> Predicate { } #if canImport(Darwin) -extension NMBObjCMatcher { - @objc public class func haveCountMatcher(_ expected: NSNumber) -> NMBMatcher { +import Foundation + +extension NMBPredicate { + @objc public class func haveCountMatcher(_ expected: NSNumber) -> NMBPredicate { return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try actualExpression.evaluate() @@ -60,7 +60,7 @@ extension NMBObjCMatcher { if let actualValue = actualValue { message = ExpectationMessage.expectedCustomValueTo( "get type of NSArray, NSSet, NSDictionary, or NSHashTable", - "\(String(describing: type(of: actualValue)))" + actual: "\(String(describing: type(of: actualValue)))" ) } else { message = ExpectationMessage diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift index dbcff09..93363b3 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift @@ -1,29 +1,23 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual string satisfies the regular expression /// described by the expected string. public func match(_ expectedValue: String?) -> Predicate { return Predicate.simple("match <\(stringify(expectedValue))>") { actualExpression in - if let actual = try actualExpression.evaluate() { - if let regexp = expectedValue { - let bool = actual.range(of: regexp, options: .regularExpression) != nil - return PredicateStatus(bool: bool) - } - } + guard let actual = try actualExpression.evaluate(), let regexp = expectedValue else { return .fail } - return .fail + let bool = actual.range(of: regexp, options: .regularExpression) != nil + return PredicateStatus(bool: bool) } } #if canImport(Darwin) +import class Foundation.NSString -extension NMBObjCMatcher { - @objc public class func matchMatcher(_ expected: NSString) -> NMBMatcher { +extension NMBPredicate { + @objc public class func matchMatcher(_ expected: NSString) -> NMBPredicate { return NMBPredicate { actualExpression in let actual = actualExpression.cast { $0 as? String } return try match(expected.description).satisfies(actual).toObjectiveC() } } } - #endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift index 4ad71d4..3edc99b 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift @@ -1,5 +1,3 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual expression evaluates to an /// error from the specified case. /// @@ -9,9 +7,7 @@ public func matchError(_ error: T) -> Predicate { return Predicate.define { actualExpression in let actualError = try actualExpression.evaluate() - let failureMessage = FailureMessage() - setFailureMessageForError( - failureMessage, + let message = messageForError( postfixMessageVerb: "match", actualError: actualError, error: error @@ -22,7 +18,7 @@ public func matchError(_ error: T) -> Predicate { matches = true } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } @@ -35,9 +31,7 @@ public func matchError(_ error: T) -> Predicate { return Predicate.define { actualExpression in let actualError = try actualExpression.evaluate() - let failureMessage = FailureMessage() - setFailureMessageForError( - failureMessage, + let message = messageForError( postfixMessageVerb: "match", actualError: actualError, error: error @@ -48,7 +42,7 @@ public func matchError(_ error: T) -> Predicate { matches = true } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } @@ -58,9 +52,7 @@ public func matchError(_ errorType: T.Type) -> Predicate { return Predicate.define { actualExpression in let actualError = try actualExpression.evaluate() - let failureMessage = FailureMessage() - setFailureMessageForError( - failureMessage, + let message = messageForError( postfixMessageVerb: "match", actualError: actualError, errorType: errorType @@ -71,6 +63,6 @@ public func matchError(_ errorType: T.Type) -> Predicate { matches = true } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift index abcafa9..cba4d33 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift @@ -9,7 +9,7 @@ /// Use the Matcher protocol instead of this type to accept custom matchers as /// input parameters. /// @see allPass for an example that uses accepts other matchers as input. -@available(*, deprecated, message: "Use to Predicate instead") +@available(*, deprecated, message: "Use Predicate instead") public struct MatcherFunc: Matcher { public let matcher: (Expression, FailureMessage) throws -> Bool @@ -28,6 +28,7 @@ public struct MatcherFunc: Matcher { /// Compatibility layer to new Matcher API. Converts an old-style matcher to a new one. /// Note: You should definitely spend the time to convert to the new api as soon as possible /// since this struct type is deprecated. + @available(*, deprecated, message: "Use Predicate directly instead") public var predicate: Predicate { return Predicate.fromDeprecatedMatcher(self) } @@ -44,7 +45,7 @@ public struct MatcherFunc: Matcher { /// Use the Matcher protocol instead of this type to accept custom matchers as /// input parameters. /// @see allPass for an example that uses accepts other matchers as input. -@available(*, deprecated, message: "Use to Predicate instead") +@available(*, deprecated, message: "Use Predicate instead") public struct NonNilMatcherFunc: Matcher { public let matcher: (Expression, FailureMessage) throws -> Bool @@ -79,6 +80,7 @@ public struct NonNilMatcherFunc: Matcher { /// Compatibility layer to new Matcher API. Converts an old-style matcher to a new one. /// Note: You should definitely spend the time to convert to the new api as soon as possible /// since this struct type is deprecated. + @available(*, deprecated, message: "Use Predicate directly instead") public var predicate: Predicate { return Predicate.fromDeprecatedMatcher(self) } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift index 38bb297..720ced0 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift @@ -12,19 +12,20 @@ public protocol Matcher { func doesNotMatch(_ actualExpression: Expression, failureMessage: FailureMessage) throws -> Bool } +@available(*, deprecated) extension Matcher { var predicate: Predicate { return Predicate.fromDeprecatedMatcher(self) } var toClosure: (Expression, FailureMessage, Bool) throws -> Bool { - return ({ expr, msg, expectedResult in + return { expr, msg, expectedResult in if expectedResult { return try self.matches(expr, failureMessage: msg) } else { return try self.doesNotMatch(expr, failureMessage: msg) } - }) + } } } @@ -128,20 +129,14 @@ extension NSDate: TestOutputStringConvertible { } } +#if canImport(Darwin) /// Protocol for types to support beLessThan(), beLessThanOrEqualTo(), /// beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers. /// /// Types that conform to Swift's Comparable protocol will work implicitly too -#if canImport(Darwin) @objc public protocol NMBComparable { func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult } -#else -// This should become obsolete once Corelibs Foundation adds Comparable conformance to NSNumber -public protocol NMBComparable { - func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult -} -#endif extension NSNumber: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { @@ -155,3 +150,4 @@ extension NSString: NMBComparable { return compare(otherObject as! String) } } +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift index 7d3e44c..cf20186 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift @@ -1,48 +1,115 @@ +#if canImport(Foundation) import Foundation internal class NotificationCollector { private(set) var observedNotifications: [Notification] private let notificationCenter: NotificationCenter - #if canImport(Darwin) - private var token: AnyObject? - #else - private var token: NSObjectProtocol? - #endif + private let names: Set + private var tokens: [NSObjectProtocol] - required init(notificationCenter: NotificationCenter) { + required init(notificationCenter: NotificationCenter, names: Set = []) { self.notificationCenter = notificationCenter self.observedNotifications = [] + self.names = names + self.tokens = [] } func startObserving() { - // swiftlint:disable:next line_length - self.token = self.notificationCenter.addObserver(forName: nil, object: nil, queue: nil) { [weak self] notification in - // linux-swift gets confused by .append(n) - self?.observedNotifications.append(notification) + func addObserver(forName name: Notification.Name?) -> NSObjectProtocol { + return notificationCenter.addObserver(forName: name, object: nil, queue: nil) { [weak self] notification in + // linux-swift gets confused by .append(n) + self?.observedNotifications.append(notification) + } + } + + if names.isEmpty { + tokens.append(addObserver(forName: nil)) + } else { + names.forEach { name in + tokens.append(addObserver(forName: name)) + } } } deinit { - #if canImport(Darwin) - if let token = self.token { - self.notificationCenter.removeObserver(token) - } - #else - if let token = self.token as? AnyObject { - self.notificationCenter.removeObserver(token) - } - #endif + tokens.forEach { token in + notificationCenter.removeObserver(token) + } } } private let mainThread = pthread_self() +private func _postNotifications( + _ predicate: Predicate<[Notification]>, + from center: NotificationCenter, + names: Set = [] +) -> Predicate { + _ = mainThread // Force lazy-loading of this value + let collector = NotificationCollector(notificationCenter: center, names: names) + collector.startObserving() + var once: Bool = false + + return Predicate { actualExpression in + let collectorNotificationsExpression = Expression( + memoizedExpression: { _ in + return collector.observedNotifications + }, + location: actualExpression.location, + withoutCaching: true + ) + + assert(pthread_equal(mainThread, pthread_self()) != 0, "Only expecting closure to be evaluated on main thread.") + if !once { + once = true + _ = try actualExpression.evaluate() + } + + let actualValue: String + if collector.observedNotifications.isEmpty { + actualValue = "no notifications" + } else { + actualValue = "<\(stringify(collector.observedNotifications))>" + } + + var result = try predicate.satisfies(collectorNotificationsExpression) + result.message = result.message.replacedExpectation { message in + return .expectedCustomValueTo(message.expectedMessage, actual: actualValue) + } + return result + } +} + +public func postNotifications( + _ predicate: Predicate<[Notification]>, + from center: NotificationCenter = .default +) -> Predicate { + _postNotifications(predicate, from: center) +} + +@available(*, deprecated, renamed: "postNotifications(_:from:)") +public func postNotifications( + _ predicate: Predicate<[Notification]>, + fromNotificationCenter center: NotificationCenter +) -> Predicate { + postNotifications(predicate, from: center) +} + +#if os(macOS) +public func postDistributedNotifications( + _ predicate: Predicate<[Notification]>, + from center: DistributedNotificationCenter = .default(), + names: Set +) -> Predicate { + _postNotifications(predicate, from: center, names: names) +} +#endif + +@available(*, deprecated, message: "Use Predicate instead") public func postNotifications( _ notificationsMatcher: T, - fromNotificationCenter center: NotificationCenter = .default) - -> Predicate - where T: Matcher, T.ValueType == [Notification] -{ + from center: NotificationCenter = .default +) -> Predicate where T: Matcher, T.ValueType == [Notification] { _ = mainThread // Force lazy-loading of this value let collector = NotificationCollector(notificationCenter: center) collector.startObserving() @@ -69,3 +136,12 @@ public func postNotifications( return PredicateResult(bool: match, message: failureMessage.toExpectationMessage()) } } + +@available(*, deprecated, renamed: "postNotifications(_:from:)") +public func postNotifications( + _ notificationsMatcher: T, + fromNotificationCenter center: NotificationCenter +) -> Predicate where T: Matcher, T.ValueType == [Notification] { + return postNotifications(notificationsMatcher, from: center) +} +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift index 2604411..fa0128f 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift @@ -1,6 +1,5 @@ // New Matcher API // -import Foundation /// A Predicate is part of the new matcher API that provides assertions to expectations. /// @@ -45,17 +44,17 @@ extension Predicate { /// Defines a predicate with a default message that can be returned in the closure /// Also ensures the predicate's actual value cannot pass with `nil` given. - public static func define(_ msg: String, matcher: @escaping (Expression, ExpectationMessage) throws -> PredicateResult) -> Predicate { + public static func define(_ message: String = "match", matcher: @escaping (Expression, ExpectationMessage) throws -> PredicateResult) -> Predicate { return Predicate { actual in - return try matcher(actual, .expectedActualValueTo(msg)) + return try matcher(actual, .expectedActualValueTo(message)) }.requireNonNil } /// Defines a predicate with a default message that can be returned in the closure /// Unlike `define`, this allows nil values to succeed if the given closure chooses to. - public static func defineNilable(_ msg: String, matcher: @escaping (Expression, ExpectationMessage) throws -> PredicateResult) -> Predicate { + public static func defineNilable(_ message: String = "match", matcher: @escaping (Expression, ExpectationMessage) throws -> PredicateResult) -> Predicate { return Predicate { actual in - return try matcher(actual, .expectedActualValueTo(msg)) + return try matcher(actual, .expectedActualValueTo(message)) } } } @@ -65,9 +64,9 @@ extension Predicate { /// error message. /// /// Also ensures the predicate's actual value cannot pass with `nil` given. - public static func simple(_ msg: String, matcher: @escaping (Expression) throws -> PredicateStatus) -> Predicate { + public static func simple(_ message: String = "match", matcher: @escaping (Expression) throws -> PredicateStatus) -> Predicate { return Predicate { actual in - return PredicateResult(status: try matcher(actual), message: .expectedActualValueTo(msg)) + return PredicateResult(status: try matcher(actual), message: .expectedActualValueTo(message)) }.requireNonNil } @@ -75,9 +74,9 @@ extension Predicate { /// error message. /// /// Unlike `simple`, this allows nil values to succeed if the given closure chooses to. - public static func simpleNilable(_ msg: String, matcher: @escaping (Expression) throws -> PredicateStatus) -> Predicate { + public static func simpleNilable(_ message: String = "match", matcher: @escaping (Expression) throws -> PredicateStatus) -> Predicate { return Predicate { actual in - return PredicateResult(status: try matcher(actual), message: .expectedActualValueTo(msg)) + return PredicateResult(status: try matcher(actual), message: .expectedActualValueTo(message)) } } } @@ -166,32 +165,41 @@ public enum PredicateStatus { } } -// Backwards compatibility until Old Matcher API removal -extension Predicate: Matcher { - /// Compatibility layer for old Matcher API, deprecated - public static func fromDeprecatedFullClosure(_ matcher: @escaping (Expression, FailureMessage, Bool) throws -> Bool) -> Predicate { +extension Predicate { + /// Compatibility layer for old Matcher API, deprecated. + /// Emulates the MatcherFunc API + internal static func _fromDeprecatedClosure(_ matcher: @escaping (Expression, FailureMessage) throws -> Bool) -> Predicate { + // swiftlint:disable:previous identifier_name return Predicate { actual in let failureMessage = FailureMessage() - let result = try matcher(actual, failureMessage, true) + let result = try matcher(actual, failureMessage) return PredicateResult( status: PredicateStatus(bool: result), message: failureMessage.toExpectationMessage() ) } } +} - /// Compatibility layer for old Matcher API, deprecated. - /// Emulates the MatcherFunc API - public static func fromDeprecatedClosure(_ matcher: @escaping (Expression, FailureMessage) throws -> Bool) -> Predicate { +// Backwards compatibility until Old Matcher API removal +@available(*, deprecated, message: "Use Predicate directly instead") +extension Predicate: Matcher { + /// Compatibility layer for old Matcher API, deprecated + public static func fromDeprecatedFullClosure(_ matcher: @escaping (Expression, FailureMessage, Bool) throws -> Bool) -> Predicate { return Predicate { actual in let failureMessage = FailureMessage() - let result = try matcher(actual, failureMessage) + let result = try matcher(actual, failureMessage, true) return PredicateResult( status: PredicateStatus(bool: result), message: failureMessage.toExpectationMessage() ) } + } + /// Compatibility layer for old Matcher API, deprecated. + /// Emulates the MatcherFunc API + public static func fromDeprecatedClosure(_ matcher: @escaping (Expression, FailureMessage) throws -> Bool) -> Predicate { + return _fromDeprecatedClosure(matcher) } /// Compatibility layer for old Matcher API, deprecated. @@ -243,6 +251,8 @@ extension Predicate { } #if canImport(Darwin) +import class Foundation.NSObject + public typealias PredicateBlock = (_ actualExpression: Expression) throws -> NMBPredicateResult public class NMBPredicate: NSObject { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift index f44c810..7c1b2b2 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift @@ -1,7 +1,8 @@ -import Foundation - -// This matcher requires the Objective-C, and being built by Xcode rather than the Swift Package Manager +// This matcher requires the Objective-C, and being built by Xcode rather than the Swift Package Manager #if canImport(Darwin) && !SWIFT_PACKAGE +import class Foundation.NSObject +import class Foundation.NSDictionary +import class Foundation.NSException /// A Nimble matcher that succeeds when the actual expression raises an /// exception with the specified name, reason, and/or userInfo. @@ -12,78 +13,97 @@ import Foundation /// /// nil arguments indicates that the matcher should not attempt to match against /// that parameter. -public func raiseException( - named: String? = nil, +public func raiseException( + named: NSExceptionName? = nil, reason: String? = nil, userInfo: NSDictionary? = nil, - closure: ((NSException) -> Void)? = nil) -> Predicate { - return Predicate { actualExpression in - var exception: NSException? - let capture = NMBExceptionCapture(handler: ({ e in - exception = e - }), finally: nil) - - do { - try capture.tryBlockThrows { - _ = try actualExpression.evaluate() - } - } catch { - return PredicateResult(status: .fail, message: .fail("unexpected error thrown: <\(error)>")) - } + closure: ((NSException) -> Void)? = nil +) -> Predicate { + return raiseException(named: named?.rawValue, reason: reason, userInfo: userInfo, closure: closure) +} - let failureMessage = FailureMessage() - setFailureMessageForException( - failureMessage, - exception: exception, - named: named, - reason: reason, - userInfo: userInfo, - closure: closure - ) +/// A Nimble matcher that succeeds when the actual expression raises an +/// exception with the specified name, reason, and/or userInfo. +/// +/// Alternatively, you can pass a closure to do any arbitrary custom matching +/// to the raised exception. The closure only gets called when an exception +/// is raised. +/// +/// nil arguments indicates that the matcher should not attempt to match against +/// that parameter. +public func raiseException( + named: String?, + reason: String? = nil, + userInfo: NSDictionary? = nil, + closure: ((NSException) -> Void)? = nil +) -> Predicate { + return Predicate { actualExpression in + var exception: NSException? + let capture = NMBExceptionCapture(handler: ({ e in + exception = e + }), finally: nil) - let matches = exceptionMatchesNonNilFieldsOrClosure( - exception, - named: named, - reason: reason, - userInfo: userInfo, - closure: closure - ) - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + do { + try capture.tryBlockThrows { + _ = try actualExpression.evaluate() + } + } catch { + return PredicateResult(status: .fail, message: .fail("unexpected error thrown: <\(error)>")) } + + let message = messageForException( + exception: exception, + named: named, + reason: reason, + userInfo: userInfo, + closure: closure + ) + + let matches = exceptionMatchesNonNilFieldsOrClosure( + exception, + named: named, + reason: reason, + userInfo: userInfo, + closure: closure + ) + return PredicateResult(bool: matches, message: message) + } } -// swiftlint:disable:next function_parameter_count -internal func setFailureMessageForException( - _ failureMessage: FailureMessage, +internal func messageForException( exception: NSException?, named: String?, reason: String?, userInfo: NSDictionary?, - closure: ((NSException) -> Void)?) { - failureMessage.postfixMessage = "raise exception" + closure: ((NSException) -> Void)? +) -> ExpectationMessage { + var rawMessage: String = "raise exception" - if let named = named { - failureMessage.postfixMessage += " with name <\(named)>" - } - if let reason = reason { - failureMessage.postfixMessage += " with reason <\(reason)>" - } - if let userInfo = userInfo { - failureMessage.postfixMessage += " with userInfo <\(userInfo)>" - } - if closure != nil { - failureMessage.postfixMessage += " that satisfies block" - } - if named == nil && reason == nil && userInfo == nil && closure == nil { - failureMessage.postfixMessage = "raise any exception" - } + if let named = named { + rawMessage += " with name <\(named)>" + } + if let reason = reason { + rawMessage += " with reason <\(reason)>" + } + if let userInfo = userInfo { + rawMessage += " with userInfo <\(userInfo)>" + } + if closure != nil { + rawMessage += " that satisfies block" + } + if named == nil && reason == nil && userInfo == nil && closure == nil { + rawMessage = "raise any exception" + } - if let exception = exception { - // swiftlint:disable:next line_length - failureMessage.actualValue = "\(String(describing: type(of: exception))) { name=\(exception.name), reason='\(stringify(exception.reason))', userInfo=\(stringify(exception.userInfo)) }" - } else { - failureMessage.actualValue = "no exception" - } + let actual: String + if let exception = exception { + // swiftlint:disable:next line_length + actual = "\(String(describing: type(of: exception))) { name=\(exception.name), reason='\(stringify(exception.reason))', userInfo=\(stringify(exception.userInfo)) }" + } else { + actual = "no exception" + } + + return .expectedCustomValueTo(rawMessage, actual: actual) } internal func exceptionMatchesNonNilFieldsOrClosure( @@ -121,90 +141,82 @@ internal func exceptionMatchesNonNilFieldsOrClosure( return matches } -public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { - // swiftlint:disable identifier_name - internal var _name: String? - internal var _reason: String? - internal var _userInfo: NSDictionary? - internal var _block: ((NSException) -> Void)? - // swiftlint:enable identifier_name +public class NMBObjCRaiseExceptionPredicate: NMBPredicate { + private let _name: String? + private let _reason: String? + private let _userInfo: NSDictionary? + private let _block: ((NSException) -> Void)? - internal init(name: String?, reason: String?, userInfo: NSDictionary?, block: ((NSException) -> Void)?) { + fileprivate init(name: String?, reason: String?, userInfo: NSDictionary?, block: ((NSException) -> Void)?) { _name = name _reason = reason _userInfo = userInfo _block = block - } - @objc public func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { - let block: () -> Any? = ({ _ = actualBlock(); return nil }) - let expr = Expression(expression: block, location: location) - - do { - return try raiseException( - named: _name, - reason: _reason, - userInfo: _userInfo, - closure: _block - ).matches(expr, failureMessage: failureMessage) - } catch let error { - failureMessage.stringValue = "unexpected error thrown: <\(error)>" - return false + let predicate: Predicate = raiseException( + named: name, + reason: reason, + userInfo: userInfo, + closure: block + ) + let predicateBlock: PredicateBlock = { actualExpression in + return try predicate.satisfies(actualExpression).toObjectiveC() } + super.init(predicate: predicateBlock) } - @objc public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { - return !matches(actualBlock, failureMessage: failureMessage, location: location) - } - - @objc public var named: (_ name: String) -> NMBObjCRaiseExceptionMatcher { - return ({ name in - return NMBObjCRaiseExceptionMatcher( + @objc public var named: (_ name: String) -> NMBObjCRaiseExceptionPredicate { + let (reason, userInfo, block) = (_reason, _userInfo, _block) + return { name in + return NMBObjCRaiseExceptionPredicate( name: name, - reason: self._reason, - userInfo: self._userInfo, - block: self._block + reason: reason, + userInfo: userInfo, + block: block ) - }) + } } - @objc public var reason: (_ reason: String?) -> NMBObjCRaiseExceptionMatcher { - return ({ reason in - return NMBObjCRaiseExceptionMatcher( - name: self._name, + @objc public var reason: (_ reason: String?) -> NMBObjCRaiseExceptionPredicate { + let (name, userInfo, block) = (_name, _userInfo, _block) + return { reason in + return NMBObjCRaiseExceptionPredicate( + name: name, reason: reason, - userInfo: self._userInfo, - block: self._block + userInfo: userInfo, + block: block ) - }) + } } - @objc public var userInfo: (_ userInfo: NSDictionary?) -> NMBObjCRaiseExceptionMatcher { - return ({ userInfo in - return NMBObjCRaiseExceptionMatcher( - name: self._name, - reason: self._reason, + @objc public var userInfo: (_ userInfo: NSDictionary?) -> NMBObjCRaiseExceptionPredicate { + let (name, reason, block) = (_name, _reason, _block) + return { userInfo in + return NMBObjCRaiseExceptionPredicate( + name: name, + reason: reason, userInfo: userInfo, - block: self._block + block: block ) - }) + } } - @objc public var satisfyingBlock: (_ block: ((NSException) -> Void)?) -> NMBObjCRaiseExceptionMatcher { - return ({ block in - return NMBObjCRaiseExceptionMatcher( - name: self._name, - reason: self._reason, - userInfo: self._userInfo, + @objc public var satisfyingBlock: (_ block: ((NSException) -> Void)?) -> NMBObjCRaiseExceptionPredicate { + let (name, reason, userInfo) = (_name, _reason, _userInfo) + return { block in + return NMBObjCRaiseExceptionPredicate( + name: name, + reason: reason, + userInfo: userInfo, block: block ) - }) + } } } -extension NMBObjCMatcher { - @objc public class func raiseExceptionMatcher() -> NMBObjCRaiseExceptionMatcher { - return NMBObjCRaiseExceptionMatcher(name: nil, reason: nil, userInfo: nil, block: nil) +extension NMBPredicate { + @objc public class func raiseExceptionMatcher() -> NMBObjCRaiseExceptionPredicate { + return NMBObjCRaiseExceptionPredicate(name: nil, reason: nil, userInfo: nil, block: nil) } } #endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift index da3ea9a..7fbeeef 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift @@ -1,7 +1,12 @@ -import Foundation +/// A Nimble matcher that succeeds when the actual value matches with all of the matchers +/// provided in the variable list of matchers. +public func satisfyAllOf(_ predicates: Predicate...) -> Predicate { + return satisfyAllOf(predicates) +} /// A Nimble matcher that succeeds when the actual value matches with all of the matchers /// provided in the variable list of matchers. +@available(*, deprecated, message: "Use Predicate instead") public func satisfyAllOf(_ matchers: U...) -> Predicate where U: Matcher, U.ValueType == T { return satisfyAllOf(matchers.map { $0.predicate }) @@ -23,7 +28,7 @@ internal func satisfyAllOf(_ predicates: [Predicate]) -> Predicate { if let actualValue = try actualExpression.evaluate() { msg = .expectedCustomValueTo( "match all of: " + postfixMessages.joined(separator: ", and "), - "\(actualValue)" + actual: "\(actualValue)" ) } else { msg = .expectedActualValueTo( @@ -40,7 +45,9 @@ public func && (left: Predicate, right: Predicate) -> Predicate { } #if canImport(Darwin) -extension NMBObjCMatcher { +import class Foundation.NSObject + +extension NMBPredicate { @objc public class func satisfyAllOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate { return NMBPredicate { actualExpression in if matchers.isEmpty { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift index 6724956..44615dc 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift @@ -1,7 +1,12 @@ -import Foundation +/// A Nimble matcher that succeeds when the actual value matches with any of the matchers +/// provided in the variable list of matchers. +public func satisfyAnyOf(_ predicates: Predicate...) -> Predicate { + return satisfyAnyOf(predicates) +} /// A Nimble matcher that succeeds when the actual value matches with any of the matchers /// provided in the variable list of matchers. +@available(*, deprecated, message: "Use Predicate instead") public func satisfyAnyOf(_ matchers: U...) -> Predicate where U: Matcher, U.ValueType == T { return satisfyAnyOf(matchers.map { $0.predicate }) @@ -23,7 +28,7 @@ internal func satisfyAnyOf(_ predicates: [Predicate]) -> Predicate { if let actualValue = try actualExpression.evaluate() { msg = .expectedCustomValueTo( "match one of: " + postfixMessages.joined(separator: ", or "), - "\(actualValue)" + actual: "\(actualValue)" ) } else { msg = .expectedActualValueTo( @@ -39,16 +44,20 @@ public func || (left: Predicate, right: Predicate) -> Predicate { return satisfyAnyOf(left, right) } +@available(*, deprecated, message: "Use Predicate instead") public func || (left: NonNilMatcherFunc, right: NonNilMatcherFunc) -> Predicate { return satisfyAnyOf(left, right) } +@available(*, deprecated, message: "Use Predicate instead") public func || (left: MatcherFunc, right: MatcherFunc) -> Predicate { return satisfyAnyOf(left, right) } #if canImport(Darwin) -extension NMBObjCMatcher { +import class Foundation.NSObject + +extension NMBPredicate { @objc public class func satisfyAnyOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate { return NMBPredicate { actualExpression in if matchers.isEmpty { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift index 53d9191..5bbe96b 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift @@ -1,8 +1,12 @@ -import Foundation +#if canImport(CwlPreconditionTesting) && (os(macOS) || os(iOS)) +import CwlPreconditionTesting +#elseif canImport(CwlPosixPreconditionTesting) +import CwlPosixPreconditionTesting +#endif -public func throwAssertion() -> Predicate { +public func throwAssertion() -> Predicate { return Predicate { actualExpression in - #if arch(x86_64) && canImport(Darwin) && !SWIFT_PACKAGE + #if arch(x86_64) && canImport(Darwin) let message = ExpectationMessage.expectedTo("throw an assertion") var actualError: Error? @@ -24,7 +28,7 @@ public func throwAssertion() -> Predicate { } #endif do { - try actualExpression.evaluate() + _ = try actualExpression.evaluate() } catch { actualError = error } @@ -38,10 +42,6 @@ public func throwAssertion() -> Predicate { } else { return PredicateResult(bool: caughtException != nil, message: message) } - #elseif SWIFT_PACKAGE - fatalError("The throwAssertion Nimble matcher does not currently support Swift CLI." + - " You can silence this error by placing the test case inside an #if !SWIFT_PACKAGE" + - " conditional statement") #else fatalError("The throwAssertion Nimble matcher can only run on x86_64 platforms with " + "Objective-C (e.g. macOS, iPhone 5s or later simulators). You can silence this error " + diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift index d294ba3..d5ac732 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift @@ -1,5 +1,3 @@ -import Foundation - /// A Nimble matcher that succeeds when the actual expression throws an /// error of the specified type or from the specified case. /// @@ -11,7 +9,7 @@ import Foundation /// /// nil arguments indicates that the matcher should not attempt to match against /// that parameter. -public func throwError() -> Predicate { +public func throwError() -> Predicate { return Predicate { actualExpression in var actualError: Error? do { @@ -21,9 +19,15 @@ public func throwError() -> Predicate { } if let actualError = actualError { - return PredicateResult(bool: true, message: .expectedCustomValueTo("throw any error", "<\(actualError)>")) + return PredicateResult( + bool: true, + message: .expectedCustomValueTo("throw any error", actual: "<\(actualError)>") + ) } else { - return PredicateResult(bool: false, message: .expectedCustomValueTo("throw any error", "no error")) + return PredicateResult( + bool: false, + message: .expectedCustomValueTo("throw any error", actual: "no error") + ) } } } @@ -39,7 +43,7 @@ public func throwError() -> Predicate { /// /// nil arguments indicates that the matcher should not attempt to match against /// that parameter. -public func throwError(_ error: T, closure: ((Error) -> Void)? = nil) -> Predicate { +public func throwError(_ error: T, closure: ((Error) -> Void)? = nil) -> Predicate { return Predicate { actualExpression in var actualError: Error? do { @@ -48,9 +52,7 @@ public func throwError(_ error: T, closure: ((Error) -> Void)? = nil) actualError = error } - let failureMessage = FailureMessage() - setFailureMessageForError( - failureMessage, + let message = messageForError( actualError: actualError, error: error, errorType: nil, @@ -72,7 +74,7 @@ public func throwError(_ error: T, closure: ((Error) -> Void)? = nil) } } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } @@ -87,7 +89,7 @@ public func throwError(_ error: T, closure: ((Error) -> Void)? = nil) /// /// nil arguments indicates that the matcher should not attempt to match against /// that parameter. -public func throwError(_ error: T, closure: ((T) -> Void)? = nil) -> Predicate { +public func throwError(_ error: T, closure: ((T) -> Void)? = nil) -> Predicate { return Predicate { actualExpression in var actualError: Error? do { @@ -96,9 +98,7 @@ public func throwError(_ error: T, closure: ((T) -> Void)? actualError = error } - let failureMessage = FailureMessage() - setFailureMessageForError( - failureMessage, + let message = messageForError( actualError: actualError, error: error, errorType: nil, @@ -120,7 +120,7 @@ public func throwError(_ error: T, closure: ((T) -> Void)? } } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } @@ -135,9 +135,10 @@ public func throwError(_ error: T, closure: ((T) -> Void)? /// /// nil arguments indicates that the matcher should not attempt to match against /// that parameter. -public func throwError( +public func throwError( errorType: T.Type, - closure: ((T) -> Void)? = nil) -> Predicate { + closure: ((T) -> Void)? = nil +) -> Predicate { return Predicate { actualExpression in var actualError: Error? do { @@ -146,9 +147,7 @@ public func throwError( actualError = error } - let failureMessage = FailureMessage() - setFailureMessageForError( - failureMessage, + let message = messageForError( actualError: actualError, error: nil, errorType: errorType, @@ -187,7 +186,7 @@ public func throwError( } } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } @@ -198,7 +197,7 @@ public func throwError( /// values of the existential type `Error` in the closure. /// /// The closure only gets called when an error was thrown. -public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate { +public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate { return Predicate { actualExpression in var actualError: Error? do { @@ -207,8 +206,7 @@ public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate { actualError = error } - let failureMessage = FailureMessage() - setFailureMessageForError(failureMessage, actualError: actualError, closure: closure) + let message = messageForError(actualError: actualError, closure: closure) var matches = false if let actualError = actualError { @@ -223,7 +221,7 @@ public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate { } } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } @@ -234,7 +232,7 @@ public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate { /// values of the existential type `Error` in the closure. /// /// The closure only gets called when an error was thrown. -public func throwError(closure: @escaping ((T) -> Void)) -> Predicate { +public func throwError(closure: @escaping ((T) -> Void)) -> Predicate { return Predicate { actualExpression in var actualError: Error? do { @@ -243,8 +241,7 @@ public func throwError(closure: @escaping ((T) -> Void)) -> Predicate< actualError = error } - let failureMessage = FailureMessage() - setFailureMessageForError(failureMessage, actualError: actualError, closure: closure) + let message = messageForError(actualError: actualError, closure: closure) var matches = false if let actualError = actualError as? T { @@ -259,6 +256,6 @@ public func throwError(closure: @escaping ((T) -> Void)) -> Predicate< } } - return PredicateResult(bool: matches, message: failureMessage.toExpectationMessage()) + return PredicateResult(bool: matches, message: message) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift index 01369bb..0b52ee9 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift @@ -25,12 +25,12 @@ public func succeed() -> Predicate<() -> ToSucceedResult> { case .succeeded: return PredicateResult( bool: true, - message: .expectedCustomValueTo("succeed", "") + message: .expectedCustomValueTo("succeed", actual: "") ) case .failed(let reason): return PredicateResult( bool: false, - message: .expectedCustomValueTo("succeed", " because <\(reason)>") + message: .expectedCustomValueTo("succeed", actual: " because <\(reason)>") ) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Nimble.h b/Example/Pods/Nimble/Sources/Nimble/Nimble.h index 2bbc693..d975a72 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Nimble.h +++ b/Example/Pods/Nimble/Sources/Nimble/Nimble.h @@ -3,10 +3,9 @@ #import "NMBStringify.h" #import "DSL.h" -#if TARGET_OS_TV - #import "CwlPreconditionTesting_POSIX.h" -#else - #import "CwlPreconditionTesting.h" +#if TARGET_OS_OSX || TARGET_OS_IOS + #import "CwlMachBadInstructionHandler.h" + #import "CwlCatchException.h" #endif FOUNDATION_EXPORT double NimbleVersionNumber; diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Await.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Await.swift index 276f618..ce1b823 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Await.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/Await.swift @@ -2,10 +2,6 @@ import CoreFoundation import Dispatch import Foundation -#if canImport(CDispatch) - import CDispatch -#endif - private let timeoutLeeway = DispatchTimeInterval.milliseconds(1) private let pollLeeway = DispatchTimeInterval.milliseconds(1) @@ -32,11 +28,7 @@ internal class AssertionWaitLock: WaitLock { func acquireWaitingLock(_ fnName: String, file: FileString, line: UInt) { let info = WaitingInfo(name: fnName, file: file, lineNumber: line) - #if canImport(Darwin) - let isMainThread = Thread.isMainThread - #else - let isMainThread = _CFIsMainThread() - #endif + let isMainThread = Thread.isMainThread nimblePrecondition( isMainThread, "InvalidNimbleAPIUsage", @@ -102,7 +94,7 @@ internal enum AwaitResult { /// Holds the resulting value from an asynchronous expectation. /// This class is thread-safe at receiving an "response" to this promise. -internal class AwaitPromise { +internal final class AwaitPromise { private(set) internal var asyncResult: AwaitResult = .incomplete private var signal: DispatchSemaphore @@ -156,7 +148,7 @@ internal class AwaitPromiseBuilder { self.trigger = trigger } - func timeout(_ timeoutInterval: TimeInterval, forcefullyAbortTimeout: TimeInterval) -> Self { + func timeout(_ timeoutInterval: DispatchTimeInterval, forcefullyAbortTimeout: DispatchTimeInterval) -> Self { // = Discussion = // // There's a lot of technical decisions here that is useful to elaborate on. This is @@ -261,11 +253,7 @@ internal class AwaitPromiseBuilder { self.trigger.timeoutSource.resume() while self.promise.asyncResult.isIncomplete() { // Stopping the run loop does not work unless we run only 1 mode - #if (swift(>=4.2) && canImport(Darwin)) || compiler(>=5.0) _ = RunLoop.current.run(mode: .default, before: .distantFuture) - #else - _ = RunLoop.current.run(mode: .defaultRunLoopMode, before: .distantFuture) - #endif } self.trigger.timeoutSource.cancel() @@ -305,11 +293,19 @@ internal class Awaiter { let timeoutSource = createTimerSource(timeoutQueue) var completionCount = 0 let trigger = AwaitTrigger(timeoutSource: timeoutSource, actionSource: nil) { - try closure { + try closure { result in completionCount += 1 if completionCount < 2 { - if promise.resolveResult(.completed($0)) { - CFRunLoopStop(CFRunLoopGetMain()) + func completeBlock() { + if promise.resolveResult(.completed(result)) { + CFRunLoopStop(CFRunLoopGetMain()) + } + } + + if Thread.isMainThread { + completeBlock() + } else { + DispatchQueue.main.async { completeBlock() } } } else { fail("waitUntil(..) expects its completion closure to be only called once", @@ -325,12 +321,12 @@ internal class Awaiter { trigger: trigger) } - func poll(_ pollInterval: TimeInterval, closure: @escaping () throws -> T?) -> AwaitPromiseBuilder { + func poll(_ pollInterval: DispatchTimeInterval, closure: @escaping () throws -> T?) -> AwaitPromiseBuilder { let promise = AwaitPromise() let timeoutSource = createTimerSource(timeoutQueue) let asyncSource = createTimerSource(asyncQueue) let trigger = AwaitTrigger(timeoutSource: timeoutSource, actionSource: asyncSource) { - let interval = DispatchTimeInterval.nanoseconds(Int(pollInterval * TimeInterval(NSEC_PER_SEC))) + let interval = pollInterval asyncSource.schedule(deadline: .now(), repeating: interval, leeway: pollLeeway) asyncSource.setEventHandler { do { @@ -357,8 +353,8 @@ internal class Awaiter { } internal func pollBlock( - pollInterval: TimeInterval, - timeoutInterval: TimeInterval, + pollInterval: DispatchTimeInterval, + timeoutInterval: DispatchTimeInterval, file: FileString, line: UInt, fnName: String = #function, @@ -369,7 +365,7 @@ internal func pollBlock( return true } return nil - }.timeout(timeoutInterval, forcefullyAbortTimeout: timeoutInterval / 2.0).wait(fnName, file: file, line: line) + }.timeout(timeoutInterval, forcefullyAbortTimeout: timeoutInterval.divided).wait(fnName, file: file, line: line) return result } diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/DispatchTimeInterval.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/DispatchTimeInterval.swift new file mode 100644 index 0000000..a4b1d65 --- /dev/null +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/DispatchTimeInterval.swift @@ -0,0 +1,41 @@ +import Dispatch + +#if canImport(CDispatch) +import CDispatch +#endif + +extension DispatchTimeInterval { + // ** Note: We cannot simply divide the time interval because DispatchTimeInterval associated value type is Int + var divided: DispatchTimeInterval { + switch self { + case let .seconds(val): return val < 2 ? .milliseconds(Int(Float(val)/2*1000)) : .seconds(val/2) + case let .milliseconds(val): return .milliseconds(val/2) + case let .microseconds(val): return .microseconds(val/2) + case let .nanoseconds(val): return .nanoseconds(val/2) + case .never: return .never + @unknown default: fatalError("Unknown DispatchTimeInterval value") + } + } + + var description: String { + switch self { + case let .seconds(val): return val == 1 ? "\(Float(val)) second" : "\(Float(val)) seconds" + case let .milliseconds(val): return "\(Float(val)/1_000) seconds" + case let .microseconds(val): return "\(Float(val)/1_000_000) seconds" + case let .nanoseconds(val): return "\(Float(val)/1_000_000_000) seconds" + default: fatalError("Unknown DispatchTimeInterval value") + } + } +} + +#if canImport(Foundation) +import typealias Foundation.TimeInterval + +extension TimeInterval { + var dispatchInterval: DispatchTimeInterval { + let microseconds = Int64(self * TimeInterval(USEC_PER_SEC)) + // perhaps use nanoseconds, though would more often be > Int.max + return microseconds < Int.max ? .microseconds(Int(microseconds)) : .seconds(Int(self)) + } +} +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift index 074cb20..4c3e434 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift @@ -1,33 +1,34 @@ -import Foundation - // Generic -internal func setFailureMessageForError( - _ failureMessage: FailureMessage, +internal func messageForError( postfixMessageVerb: String = "throw", actualError: Error?, error: T? = nil, errorType: T.Type? = nil, - closure: ((T) -> Void)? = nil) { - failureMessage.postfixMessage = "\(postfixMessageVerb) error" + closure: ((T) -> Void)? = nil +) -> ExpectationMessage { + var rawMessage = "\(postfixMessageVerb) error" if let error = error { - failureMessage.postfixMessage += " <\(error)>" + rawMessage += " <\(error)>" } else if errorType != nil || closure != nil { - failureMessage.postfixMessage += " from type <\(T.self)>" + rawMessage += " from type <\(T.self)>" } if closure != nil { - failureMessage.postfixMessage += " that satisfies block" + rawMessage += " that satisfies block" } if error == nil && errorType == nil && closure == nil { - failureMessage.postfixMessage = "\(postfixMessageVerb) any error" + rawMessage = "\(postfixMessageVerb) any error" } + let actual: String if let actualError = actualError { - failureMessage.actualValue = "<\(actualError)>" + actual = "<\(actualError)>" } else { - failureMessage.actualValue = "no error" + actual = "no error" } + + return .expectedCustomValueTo(rawMessage, actual: actual) } internal func errorMatchesExpectedError( @@ -39,21 +40,24 @@ internal func errorMatchesExpectedError( // Non-generic -internal func setFailureMessageForError( - _ failureMessage: FailureMessage, +internal func messageForError( actualError: Error?, - closure: ((Error) -> Void)?) { - failureMessage.postfixMessage = "throw error" + closure: ((Error) -> Void)? +) -> ExpectationMessage { + var rawMessage = "throw error" if closure != nil { - failureMessage.postfixMessage += " that satisfies block" + rawMessage += " that satisfies block" } else { - failureMessage.postfixMessage = "throw any error" + rawMessage = "throw any error" } + let actual: String if let actualError = actualError { - failureMessage.actualValue = "<\(actualError)>" + actual = "<\(actualError)>" } else { - failureMessage.actualValue = "no error" + actual = "no error" } + + return .expectedCustomValueTo(rawMessage, actual: actual) } diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Functional.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Functional.swift deleted file mode 100644 index c87af76..0000000 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Functional.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation - -#if !swift(>=4.2) -extension Sequence { - internal func allSatisfy(_ predicate: (Element) throws -> Bool) rethrows -> Bool { - for item in self { - if try !predicate(item) { - return false - } - } - return true - } -} -#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift index 4ab18d2..88e84bb 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift @@ -1,12 +1,7 @@ import Foundation internal func identityAsString(_ value: Any?) -> String { - let anyObject: AnyObject? -#if os(Linux) && !swift(>=4.1.50) - anyObject = value as? AnyObject -#else - anyObject = value as AnyObject? -#endif + let anyObject = value as AnyObject? if let value = anyObject { return NSString(format: "<%p>", unsafeBitCast(value, to: Int.self)).description } else { @@ -45,32 +40,24 @@ extension Float: TestOutputStringConvertible { } extension NSNumber: TestOutputStringConvertible { - // This is using `NSString(format:)` instead of - // `String(format:)` because the latter somehow breaks - // the travis CI build on linux. public var testDescription: String { let description = self.description if description.contains(".") { - // Travis linux swiftpm build doesn't like casting String to NSString, - // which is why this annoying nested initializer thing is here. - // Maybe this will change in a future snapshot. - let decimalPlaces = NSString(string: NSString(string: description) - .components(separatedBy: ".")[1]) - - // SeeAlso: https://bugs.swift.org/browse/SR-1464 - switch decimalPlaces.length { + let decimalPlaces = description.split(separator: ".")[1] + switch decimalPlaces.count { case 1: - return NSString(format: "%0.1f", self.doubleValue).description + return String(format: "%0.1f", doubleValue) case 2: - return NSString(format: "%0.2f", self.doubleValue).description + return String(format: "%0.2f", doubleValue) case 3: - return NSString(format: "%0.3f", self.doubleValue).description + return String(format: "%0.3f", doubleValue) default: - return NSString(format: "%0.4f", self.doubleValue).description + return String(format: "%0.4f", doubleValue) } } - return self.description + + return description } } @@ -85,7 +72,7 @@ extension AnySequence: TestOutputStringConvertible { public var testDescription: String { let generator = self.makeIterator() var strings = [String]() - var value: AnySequence.Iterator.Element? + var value: AnySequence.Element? repeat { value = generator.next() @@ -121,13 +108,7 @@ extension String: TestOutputStringConvertible { extension Data: TestOutputStringConvertible { public var testDescription: String { - #if os(Linux) - // swiftlint:disable:next todo - // FIXME: Swift on Linux triggers a segfault when calling NSData's hash() (last checked on 03-11-16) - return "Data" - #else - return "Data" - #endif + return "Data" } } diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h index 9170541..9ae06a4 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h @@ -1,9 +1,9 @@ #import @class NMBExpectation; -@class NMBObjCBeCloseToMatcher; -@class NMBObjCRaiseExceptionMatcher; -@protocol NMBMatcher; +@class NMBPredicate; +@class NMBObjCBeCloseToPredicate; +@class NMBObjCRaiseExceptionPredicate; NS_ASSUME_NONNULL_BEGIN @@ -66,16 +66,16 @@ NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(void), NSStrin #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - id NMB_equal(TYPE expectedValue) { \ + NMBPredicate *NMB_equal(TYPE expectedValue) { \ return NMB_equal((EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(id equal(TYPE expectedValue), NMB_equal(expectedValue)); + NIMBLE_SHORT_OVERLOADED(NMBPredicate *equal(TYPE expectedValue), NMB_equal(expectedValue)); NIMBLE_EXPORT NIMBLE_OVERLOADABLE - id NMB_equal(__nullable id expectedValue); + NMBPredicate *NMB_equal(__nullable id expectedValue); - NIMBLE_SHORT_OVERLOADED(id equal(__nullable id expectedValue), + NIMBLE_SHORT_OVERLOADED(NMBPredicate *equal(__nullable id expectedValue), NMB_equal(expectedValue)); // overloaded dispatch for nils - expect(nil) @@ -101,17 +101,17 @@ NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(void), NSStrin #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - id NMB_haveCount(TYPE expectedValue) { \ + NMBPredicate *NMB_haveCount(TYPE expectedValue) { \ return NMB_haveCount((EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(id haveCount(TYPE expectedValue), \ + NIMBLE_SHORT_OVERLOADED(NMBPredicate *haveCount(TYPE expectedValue), \ NMB_haveCount(expectedValue)); NIMBLE_EXPORT NIMBLE_OVERLOADABLE - id NMB_haveCount(id expectedValue); + NMBPredicate *NMB_haveCount(id expectedValue); - NIMBLE_SHORT_OVERLOADED(id haveCount(id expectedValue), + NIMBLE_SHORT_OVERLOADED(NMBPredicate *haveCount(id expectedValue), NMB_haveCount(expectedValue)); DEFINE_OVERLOAD(long, @(expectedValue)) @@ -127,14 +127,14 @@ NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(void), NSStrin #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - NMBObjCBeCloseToMatcher *NMB_beCloseTo(TYPE expectedValue) { \ + NMBObjCBeCloseToPredicate *NMB_beCloseTo(TYPE expectedValue) { \ return NMB_beCloseTo((NSNumber *)(EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(NMBObjCBeCloseToMatcher *beCloseTo(TYPE expectedValue), \ + NIMBLE_SHORT_OVERLOADED(NMBObjCBeCloseToPredicate *beCloseTo(TYPE expectedValue), \ NMB_beCloseTo(expectedValue)); - NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBObjCBeCloseToMatcher *NMB_beCloseTo(NSNumber *expectedValue); - NIMBLE_SHORT_OVERLOADED(NMBObjCBeCloseToMatcher *beCloseTo(NSNumber *expectedValue), + NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBObjCBeCloseToPredicate *NMB_beCloseTo(NSNumber *expectedValue); + NIMBLE_SHORT_OVERLOADED(NMBObjCBeCloseToPredicate *beCloseTo(NSNumber *expectedValue), NMB_beCloseTo(expectedValue)); // it would be better to only overload float & double, but zero becomes ambigious @@ -152,33 +152,33 @@ NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(void), NSStrin #undef DEFINE_OVERLOAD -NIMBLE_EXPORT id NMB_beAnInstanceOf(Class expectedClass); -NIMBLE_EXPORT_INLINE id beAnInstanceOf(Class expectedClass) { +NIMBLE_EXPORT NMBPredicate *NMB_beAnInstanceOf(Class expectedClass); +NIMBLE_EXPORT_INLINE NMBPredicate *beAnInstanceOf(Class expectedClass) { return NMB_beAnInstanceOf(expectedClass); } -NIMBLE_EXPORT id NMB_beAKindOf(Class expectedClass); -NIMBLE_EXPORT_INLINE id beAKindOf(Class expectedClass) { +NIMBLE_EXPORT NMBPredicate *NMB_beAKindOf(Class expectedClass); +NIMBLE_EXPORT_INLINE NMBPredicate *beAKindOf(Class expectedClass) { return NMB_beAKindOf(expectedClass); } -NIMBLE_EXPORT id NMB_beginWith(id itemElementOrSubstring); -NIMBLE_EXPORT_INLINE id beginWith(id itemElementOrSubstring) { +NIMBLE_EXPORT NMBPredicate *NMB_beginWith(id itemElementOrSubstring); +NIMBLE_EXPORT_INLINE NMBPredicate *beginWith(id itemElementOrSubstring) { return NMB_beginWith(itemElementOrSubstring); } #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - id NMB_beGreaterThan(TYPE expectedValue) { \ + NMBPredicate *NMB_beGreaterThan(TYPE expectedValue) { \ return NMB_beGreaterThan((EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(id beGreaterThan(TYPE expectedValue), NMB_beGreaterThan(expectedValue)); + NIMBLE_SHORT_OVERLOADED(NMBPredicate *beGreaterThan(TYPE expectedValue), NMB_beGreaterThan(expectedValue)); NIMBLE_EXPORT NIMBLE_OVERLOADABLE - id NMB_beGreaterThan(NSNumber *expectedValue); + NMBPredicate *NMB_beGreaterThan(NSNumber *expectedValue); NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE - id beGreaterThan(NSNumber *expectedValue) { + NMBPredicate *beGreaterThan(NSNumber *expectedValue) { return NMB_beGreaterThan(expectedValue); } @@ -197,17 +197,17 @@ NIMBLE_EXPORT_INLINE id beginWith(id itemElementOrSubstring) { #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - id NMB_beGreaterThanOrEqualTo(TYPE expectedValue) { \ + NMBPredicate *NMB_beGreaterThanOrEqualTo(TYPE expectedValue) { \ return NMB_beGreaterThanOrEqualTo((EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(id beGreaterThanOrEqualTo(TYPE expectedValue), \ + NIMBLE_SHORT_OVERLOADED(NMBPredicate *beGreaterThanOrEqualTo(TYPE expectedValue), \ NMB_beGreaterThanOrEqualTo(expectedValue)); NIMBLE_EXPORT NIMBLE_OVERLOADABLE - id NMB_beGreaterThanOrEqualTo(NSNumber *expectedValue); + NMBPredicate *NMB_beGreaterThanOrEqualTo(NSNumber *expectedValue); NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE - id beGreaterThanOrEqualTo(NSNumber *expectedValue) { + NMBPredicate *beGreaterThanOrEqualTo(NSNumber *expectedValue) { return NMB_beGreaterThanOrEqualTo(expectedValue); } @@ -225,28 +225,28 @@ NIMBLE_EXPORT_INLINE id beginWith(id itemElementOrSubstring) { #undef DEFINE_OVERLOAD -NIMBLE_EXPORT id NMB_beIdenticalTo(id expectedInstance); -NIMBLE_SHORT(id beIdenticalTo(id expectedInstance), +NIMBLE_EXPORT NMBPredicate *NMB_beIdenticalTo(id expectedInstance); +NIMBLE_SHORT(NMBPredicate *beIdenticalTo(id expectedInstance), NMB_beIdenticalTo(expectedInstance)); -NIMBLE_EXPORT id NMB_be(id expectedInstance); -NIMBLE_SHORT(id be(id expectedInstance), +NIMBLE_EXPORT NMBPredicate *NMB_be(id expectedInstance); +NIMBLE_SHORT(NMBPredicate *be(id expectedInstance), NMB_be(expectedInstance)); #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - id NMB_beLessThan(TYPE expectedValue) { \ + NMBPredicate *NMB_beLessThan(TYPE expectedValue) { \ return NMB_beLessThan((EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(id beLessThan(TYPE expectedValue), \ + NIMBLE_SHORT_OVERLOADED(NMBPredicate *beLessThan(TYPE expectedValue), \ NMB_beLessThan(expectedValue)); NIMBLE_EXPORT NIMBLE_OVERLOADABLE - id NMB_beLessThan(NSNumber *expectedValue); + NMBPredicate *NMB_beLessThan(NSNumber *expectedValue); NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE - id beLessThan(NSNumber *expectedValue) { + NMBPredicate *beLessThan(NSNumber *expectedValue) { return NMB_beLessThan(expectedValue); } @@ -266,18 +266,18 @@ NIMBLE_SHORT(id be(id expectedInstance), #define DEFINE_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - id NMB_beLessThanOrEqualTo(TYPE expectedValue) { \ + NMBPredicate *NMB_beLessThanOrEqualTo(TYPE expectedValue) { \ return NMB_beLessThanOrEqualTo((EXPR)); \ } \ - NIMBLE_SHORT_OVERLOADED(id beLessThanOrEqualTo(TYPE expectedValue), \ + NIMBLE_SHORT_OVERLOADED(NMBPredicate *beLessThanOrEqualTo(TYPE expectedValue), \ NMB_beLessThanOrEqualTo(expectedValue)); NIMBLE_EXPORT NIMBLE_OVERLOADABLE - id NMB_beLessThanOrEqualTo(NSNumber *expectedValue); + NMBPredicate *NMB_beLessThanOrEqualTo(NSNumber *expectedValue); NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE - id beLessThanOrEqualTo(NSNumber *expectedValue) { + NMBPredicate *beLessThanOrEqualTo(NSNumber *expectedValue) { return NMB_beLessThanOrEqualTo(expectedValue); } @@ -294,63 +294,63 @@ NIMBLE_SHORT(id be(id expectedInstance), #undef DEFINE_OVERLOAD -NIMBLE_EXPORT id NMB_beTruthy(void); -NIMBLE_SHORT(id beTruthy(void), +NIMBLE_EXPORT NMBPredicate *NMB_beTruthy(void); +NIMBLE_SHORT(NMBPredicate *beTruthy(void), NMB_beTruthy()); -NIMBLE_EXPORT id NMB_beFalsy(void); -NIMBLE_SHORT(id beFalsy(void), +NIMBLE_EXPORT NMBPredicate *NMB_beFalsy(void); +NIMBLE_SHORT(NMBPredicate *beFalsy(void), NMB_beFalsy()); -NIMBLE_EXPORT id NMB_beTrue(void); -NIMBLE_SHORT(id beTrue(void), +NIMBLE_EXPORT NMBPredicate *NMB_beTrue(void); +NIMBLE_SHORT(NMBPredicate *beTrue(void), NMB_beTrue()); -NIMBLE_EXPORT id NMB_beFalse(void); -NIMBLE_SHORT(id beFalse(void), +NIMBLE_EXPORT NMBPredicate *NMB_beFalse(void); +NIMBLE_SHORT(NMBPredicate *beFalse(void), NMB_beFalse()); -NIMBLE_EXPORT id NMB_beNil(void); -NIMBLE_SHORT(id beNil(void), +NIMBLE_EXPORT NMBPredicate *NMB_beNil(void); +NIMBLE_SHORT(NMBPredicate *beNil(void), NMB_beNil()); -NIMBLE_EXPORT id NMB_beEmpty(void); -NIMBLE_SHORT(id beEmpty(void), +NIMBLE_EXPORT NMBPredicate *NMB_beEmpty(void); +NIMBLE_SHORT(NMBPredicate *beEmpty(void), NMB_beEmpty()); -NIMBLE_EXPORT id NMB_containWithNilTermination(id itemOrSubstring, ...) NS_REQUIRES_NIL_TERMINATION; +NIMBLE_EXPORT NMBPredicate *NMB_containWithNilTermination(id itemOrSubstring, ...) NS_REQUIRES_NIL_TERMINATION; #define NMB_contain(...) NMB_containWithNilTermination(__VA_ARGS__, nil) #ifndef NIMBLE_DISABLE_SHORT_SYNTAX #define contain(...) NMB_contain(__VA_ARGS__) #endif -NIMBLE_EXPORT id NMB_containElementSatisfying(BOOL(^predicate)(id)); -NIMBLE_SHORT(id containElementSatisfying(BOOL(^predicate)(id)), +NIMBLE_EXPORT NMBPredicate *NMB_containElementSatisfying(BOOL(^predicate)(id)); +NIMBLE_SHORT(NMBPredicate *containElementSatisfying(BOOL(^predicate)(id)), NMB_containElementSatisfying(predicate)); -NIMBLE_EXPORT id NMB_endWith(id itemElementOrSubstring); -NIMBLE_SHORT(id endWith(id itemElementOrSubstring), +NIMBLE_EXPORT NMBPredicate *NMB_endWith(id itemElementOrSubstring); +NIMBLE_SHORT(NMBPredicate *endWith(id itemElementOrSubstring), NMB_endWith(itemElementOrSubstring)); -NIMBLE_EXPORT NMBObjCRaiseExceptionMatcher *NMB_raiseException(void); -NIMBLE_SHORT(NMBObjCRaiseExceptionMatcher *raiseException(void), +NIMBLE_EXPORT NMBObjCRaiseExceptionPredicate *NMB_raiseException(void); +NIMBLE_SHORT(NMBObjCRaiseExceptionPredicate *raiseException(void), NMB_raiseException()); -NIMBLE_EXPORT id NMB_match(id expectedValue); -NIMBLE_SHORT(id match(id expectedValue), +NIMBLE_EXPORT NMBPredicate *NMB_match(id expectedValue); +NIMBLE_SHORT(NMBPredicate *match(id expectedValue), NMB_match(expectedValue)); -NIMBLE_EXPORT id NMB_allPass(id matcher); -NIMBLE_SHORT(id allPass(id matcher), +NIMBLE_EXPORT NMBPredicate *NMB_allPass(id matcher); +NIMBLE_SHORT(NMBPredicate *allPass(id matcher), NMB_allPass(matcher)); -NIMBLE_EXPORT id NMB_satisfyAnyOfWithMatchers(id matchers); +NIMBLE_EXPORT NMBPredicate *NMB_satisfyAnyOfWithMatchers(id matchers); #define NMB_satisfyAnyOf(...) NMB_satisfyAnyOfWithMatchers(@[__VA_ARGS__]) #ifndef NIMBLE_DISABLE_SHORT_SYNTAX #define satisfyAnyOf(...) NMB_satisfyAnyOf(__VA_ARGS__) #endif -NIMBLE_EXPORT id NMB_satisfyAllOfWithMatchers(id matchers); +NIMBLE_EXPORT NMBPredicate *NMB_satisfyAllOfWithMatchers(id matchers); #define NMB_satisfyAllOf(...) NMB_satisfyAllOfWithMatchers(@[__VA_ARGS__]) #ifndef NIMBLE_DISABLE_SHORT_SYNTAX #define satisfyAllOf(...) NMB_satisfyAllOf(__VA_ARGS__) diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m index 670415b..6f7572f 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m @@ -28,71 +28,71 @@ NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger return [NMBExpectation failWithMessage:msg file:file line:line]; } -NIMBLE_EXPORT id NMB_beAnInstanceOf(Class expectedClass) { - return [NMBObjCMatcher beAnInstanceOfMatcher:expectedClass]; +NIMBLE_EXPORT NMBPredicate *NMB_beAnInstanceOf(Class expectedClass) { + return [NMBPredicate beAnInstanceOfMatcher:expectedClass]; } -NIMBLE_EXPORT id NMB_beAKindOf(Class expectedClass) { - return [NMBObjCMatcher beAKindOfMatcher:expectedClass]; +NIMBLE_EXPORT NMBPredicate *NMB_beAKindOf(Class expectedClass) { + return [NMBPredicate beAKindOfMatcher:expectedClass]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBObjCBeCloseToMatcher *NMB_beCloseTo(NSNumber *expectedValue) { - return [NMBObjCMatcher beCloseToMatcher:expectedValue within:0.001]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBObjCBeCloseToPredicate *NMB_beCloseTo(NSNumber *expectedValue) { + return [NMBPredicate beCloseToMatcher:expectedValue within:0.001]; } -NIMBLE_EXPORT id NMB_beginWith(id itemElementOrSubstring) { - return [NMBObjCMatcher beginWithMatcher:itemElementOrSubstring]; +NIMBLE_EXPORT NMBPredicate *NMB_beginWith(id itemElementOrSubstring) { + return [NMBPredicate beginWithMatcher:itemElementOrSubstring]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE id NMB_beGreaterThan(NSNumber *expectedValue) { - return [NMBObjCMatcher beGreaterThanMatcher:expectedValue]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBPredicate *NMB_beGreaterThan(NSNumber *expectedValue) { + return [NMBPredicate beGreaterThanMatcher:expectedValue]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE id NMB_beGreaterThanOrEqualTo(NSNumber *expectedValue) { - return [NMBObjCMatcher beGreaterThanOrEqualToMatcher:expectedValue]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBPredicate *NMB_beGreaterThanOrEqualTo(NSNumber *expectedValue) { + return [NMBPredicate beGreaterThanOrEqualToMatcher:expectedValue]; } -NIMBLE_EXPORT id NMB_beIdenticalTo(id expectedInstance) { - return [NMBObjCMatcher beIdenticalToMatcher:expectedInstance]; +NIMBLE_EXPORT NMBPredicate *NMB_beIdenticalTo(id expectedInstance) { + return [NMBPredicate beIdenticalToMatcher:expectedInstance]; } -NIMBLE_EXPORT id NMB_be(id expectedInstance) { - return [NMBObjCMatcher beIdenticalToMatcher:expectedInstance]; +NIMBLE_EXPORT NMBPredicate *NMB_be(id expectedInstance) { + return [NMBPredicate beIdenticalToMatcher:expectedInstance]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE id NMB_beLessThan(NSNumber *expectedValue) { - return [NMBObjCMatcher beLessThanMatcher:expectedValue]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBPredicate *NMB_beLessThan(NSNumber *expectedValue) { + return [NMBPredicate beLessThanMatcher:expectedValue]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE id NMB_beLessThanOrEqualTo(NSNumber *expectedValue) { - return [NMBObjCMatcher beLessThanOrEqualToMatcher:expectedValue]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBPredicate *NMB_beLessThanOrEqualTo(NSNumber *expectedValue) { + return [NMBPredicate beLessThanOrEqualToMatcher:expectedValue]; } -NIMBLE_EXPORT id NMB_beTruthy() { - return [NMBObjCMatcher beTruthyMatcher]; +NIMBLE_EXPORT NMBPredicate *NMB_beTruthy() { + return [NMBPredicate beTruthyMatcher]; } -NIMBLE_EXPORT id NMB_beFalsy() { - return [NMBObjCMatcher beFalsyMatcher]; +NIMBLE_EXPORT NMBPredicate *NMB_beFalsy() { + return [NMBPredicate beFalsyMatcher]; } -NIMBLE_EXPORT id NMB_beTrue() { - return [NMBObjCMatcher beTrueMatcher]; +NIMBLE_EXPORT NMBPredicate *NMB_beTrue() { + return [NMBPredicate beTrueMatcher]; } -NIMBLE_EXPORT id NMB_beFalse() { - return [NMBObjCMatcher beFalseMatcher]; +NIMBLE_EXPORT NMBPredicate *NMB_beFalse() { + return [NMBPredicate beFalseMatcher]; } -NIMBLE_EXPORT id NMB_beNil() { - return [NMBObjCMatcher beNilMatcher]; +NIMBLE_EXPORT NMBPredicate *NMB_beNil() { + return [NMBPredicate beNilMatcher]; } -NIMBLE_EXPORT id NMB_beEmpty() { - return [NMBObjCMatcher beEmptyMatcher]; +NIMBLE_EXPORT NMBPredicate *NMB_beEmpty() { + return [NMBPredicate beEmptyMatcher]; } -NIMBLE_EXPORT id NMB_containWithNilTermination(id itemOrSubstring, ...) { +NIMBLE_EXPORT NMBPredicate *NMB_containWithNilTermination(id itemOrSubstring, ...) { NSMutableArray *itemOrSubstringArray = [NSMutableArray array]; if (itemOrSubstring) { @@ -107,43 +107,43 @@ NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger va_end(args); } - return [NMBObjCMatcher containMatcher:itemOrSubstringArray]; + return [NMBPredicate containMatcher:itemOrSubstringArray]; } -NIMBLE_EXPORT id NMB_containElementSatisfying(BOOL(^predicate)(id)) { - return [NMBObjCMatcher containElementSatisfyingMatcher:predicate]; +NIMBLE_EXPORT NMBPredicate *NMB_containElementSatisfying(BOOL(^predicate)(id)) { + return [NMBPredicate containElementSatisfyingMatcher:predicate]; } -NIMBLE_EXPORT id NMB_endWith(id itemElementOrSubstring) { - return [NMBObjCMatcher endWithMatcher:itemElementOrSubstring]; +NIMBLE_EXPORT NMBPredicate *NMB_endWith(id itemElementOrSubstring) { + return [NMBPredicate endWithMatcher:itemElementOrSubstring]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE id NMB_equal(__nullable id expectedValue) { - return [NMBObjCMatcher equalMatcher:expectedValue]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBPredicate *NMB_equal(__nullable id expectedValue) { + return [NMBPredicate equalMatcher:expectedValue]; } -NIMBLE_EXPORT NIMBLE_OVERLOADABLE id NMB_haveCount(id expectedValue) { - return [NMBObjCMatcher haveCountMatcher:expectedValue]; +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBPredicate *NMB_haveCount(id expectedValue) { + return [NMBPredicate haveCountMatcher:expectedValue]; } -NIMBLE_EXPORT id NMB_match(id expectedValue) { - return [NMBObjCMatcher matchMatcher:expectedValue]; +NIMBLE_EXPORT NMBPredicate *NMB_match(id expectedValue) { + return [NMBPredicate matchMatcher:expectedValue]; } -NIMBLE_EXPORT id NMB_allPass(id expectedValue) { - return [NMBObjCMatcher allPassMatcher:expectedValue]; +NIMBLE_EXPORT NMBPredicate *NMB_allPass(id expectedValue) { + return [NMBPredicate allPassMatcher:expectedValue]; } -NIMBLE_EXPORT id NMB_satisfyAnyOfWithMatchers(id matchers) { - return [NMBObjCMatcher satisfyAnyOfMatcher:matchers]; +NIMBLE_EXPORT NMBPredicate *NMB_satisfyAnyOfWithMatchers(id matchers) { + return [NMBPredicate satisfyAnyOfMatcher:matchers]; } -NIMBLE_EXPORT id NMB_satisfyAllOfWithMatchers(id matchers) { - return [NMBObjCMatcher satisfyAllOfMatcher:matchers]; +NIMBLE_EXPORT NMBPredicate *NMB_satisfyAllOfWithMatchers(id matchers) { + return [NMBPredicate satisfyAllOfMatcher:matchers]; } -NIMBLE_EXPORT NMBObjCRaiseExceptionMatcher *NMB_raiseException() { - return [NMBObjCMatcher raiseExceptionMatcher]; +NIMBLE_EXPORT NMBObjCRaiseExceptionPredicate *NMB_raiseException() { + return [NMBPredicate raiseExceptionMatcher]; } NIMBLE_EXPORT NMBWaitUntilTimeoutBlock NMB_waitUntilTimeoutBuilder(NSString *file, NSUInteger line) { diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m b/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m index fa5030a..3c1110b 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m @@ -1,5 +1,4 @@ #import -#import #if __has_include("Nimble-Swift.h") #import "Nimble-Swift.h" @@ -7,77 +6,12 @@ #import #endif -#pragma mark - Method Swizzling - -/// Swaps the implementations between two instance methods. -/// -/// @param class The class containing `originalSelector`. -/// @param originalSelector Original method to replace. -/// @param replacementSelector Replacement method. -void swizzleSelectors(Class class, SEL originalSelector, SEL replacementSelector) { - Method originalMethod = class_getInstanceMethod(class, originalSelector); - Method replacementMethod = class_getInstanceMethod(class, replacementSelector); - - BOOL didAddMethod = - class_addMethod(class, - originalSelector, - method_getImplementation(replacementMethod), - method_getTypeEncoding(replacementMethod)); - - if (didAddMethod) { - class_replaceMethod(class, - replacementSelector, - method_getImplementation(originalMethod), - method_getTypeEncoding(originalMethod)); - } else { - method_exchangeImplementations(originalMethod, replacementMethod); - } -} - #pragma mark - Private -@interface XCTestObservationCenter (Private) -- (void)_addLegacyTestObserver:(id)observer; -@end - @implementation XCTestObservationCenter (Register) -/// Uses objc method swizzling to register `CurrentTestCaseTracker` as a test observer. This is necessary -/// because Xcode 7.3 introduced timing issues where if a custom `XCTestObservation` is registered too early -/// it suppresses all console output (generated by `XCTestLog`), breaking any tools that depend on this output. -/// This approach waits to register our custom test observer until XCTest adds its first "legacy" observer, -/// falling back to registering after the first normal observer if this private method ever changes. + (void)load { - if (class_getInstanceMethod([self class], @selector(_addLegacyTestObserver:))) { - // Swizzle -_addLegacyTestObserver: - swizzleSelectors([self class], @selector(_addLegacyTestObserver:), @selector(NMB_original__addLegacyTestObserver:)); - } else { - // Swizzle -addTestObserver:, only if -_addLegacyTestObserver: is not implemented - swizzleSelectors([self class], @selector(addTestObserver:), @selector(NMB_original_addTestObserver:)); - } -} - -#pragma mark - Replacement Methods - -/// Registers `CurrentTestCaseTracker` as a test observer after `XCTestLog` has been added. -- (void)NMB_original__addLegacyTestObserver:(id)observer { - [self NMB_original__addLegacyTestObserver:observer]; - - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - [self addTestObserver:[CurrentTestCaseTracker sharedInstance]]; - }); -} - -/// Registers `CurrentTestCaseTracker` as a test observer after `XCTestLog` has been added. -/// This method is only used if `-_addLegacyTestObserver:` is not impelemented. (added in Xcode 7.3) -- (void)NMB_original_addTestObserver:(id)observer { - [self NMB_original_addTestObserver:observer]; - - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - [self NMB_original_addTestObserver:[CurrentTestCaseTracker sharedInstance]]; - }); + [[XCTestObservationCenter sharedTestObservationCenter] addTestObserver:[CurrentTestCaseTracker sharedInstance]]; } @end diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 8cf2c6f..196d310 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,167 +7,168 @@ objects = { /* Begin PBXBuildFile section */ - 011CAC6A74AAEEAF9F54E817D1A9FD33 /* QuickTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D8B351CD4ECC7BA22ECDDFCCA87FC9 /* QuickTestSuite.swift */; }; - 01692FC85BC6ECB122F1380ECBBA6EF5 /* String+C99ExtendedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CAC3D888B57533CFF853DF1EE4B09B /* String+C99ExtendedIdentifier.swift */; }; - 01A100AE3D2AF7A7D6A6BF1A91A4EDF3 /* SuiteHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4EE851FEE7978F898806AC8D49D3D6 /* SuiteHooks.swift */; }; - 02A1AAA49758A955770775CD409D8635 /* CwlCatchException.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0CE467A996D8D4EBDDAC47F3EBF151 /* CwlCatchException.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 02D0F8ADBDEE4EA9C9E54FA44AB96104 /* TileCoordsRegion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E2E118681343EE34FFAAAB010092898 /* TileCoordsRegion.swift */; }; - 05376A2B4A599FB919C25922E08EF492 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E3A9467C89EE9FFCB3BA6538A2A26 /* Filter.swift */; }; - 0892D14FE7A3452423E9129D7917664B /* MatchError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53199BC2B238A45F0049A1015F8A550A /* MatchError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 08C2DA09EAAD7DFF0E929E7B44BE9A7A /* MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7679EEB9D42F00FAB0D7BFF878BE973F /* MD5.swift */; }; - 0C78BF11377F17C8F5B8CD7604269361 /* OHHTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = BF32412D641E634D93C1A0ACA8136770 /* OHHTTPStubsMethodSwizzling.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 13791F91C39F408FDD0DC652B1D7CADE /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F61D5DA66B063EB7612679691E71D8E /* UIKit.framework */; }; - 13D2A4D59DD9612E1AA7F3182A342162 /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = B8FECB6D64AD648E284AD355612B498B /* mach_excServer.c */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 141E895949E33F72731B18B57F7C43D0 /* MKTileOverlayPath+MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC3E90C117C8066A9FFF25C7FC927B8 /* MKTileOverlayPath+MapCache.swift */; }; - 165F2A6DF189151CDBCA366DD275ABEA /* OHHTTPStubs-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F85830AF537C52FF3ADFE8707CBD714C /* OHHTTPStubs-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 192A3F8BEC1A99FD8712D3E09724D72C /* FailureMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39B6549173364643994D9DFF8C638779 /* FailureMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 19BA8AF46D9CC49E3E2CEDCAF6354442 /* CwlPreconditionTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F4D12195B41610314F11E1C078CC2E /* CwlPreconditionTesting.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1B4D25D41B2CE138D184DD18A534ADB2 /* ExampleHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A6CA59A4AA8B8F52527BFF2F7EBD78 /* ExampleHooks.swift */; }; - 1B4F048FF9AAF1741501A7E0ABDFB7D8 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1DACCD4C05DCC1439B6544C45794934 /* MapKit.framework */; }; - 1E5C4F9EB261B75BECC921A303CA3AA6 /* ErrorUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34663960400566EF930386958B02783C /* ErrorUtility.swift */; }; - 208F9DADCC8F01AAC14247BF0E54C863 /* ExampleGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED616F0F8ECB5246F8C77E4801D2C2F3 /* ExampleGroup.swift */; }; - 221ED892E5138A00F3CDF540E914519D /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4375272808E92B06D8C5B507D02344EE /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22284BFEB9D94716FFA56F62D34AB040 /* MapCache-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1733E028DCCD164B9FCDF2D26867A7AB /* MapCache-dummy.m */; }; - 234849AD309265FD107C74357FC8C0CF /* DSL+Wait.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10A5C33702031BDD460D4DB8C7F2C46A /* DSL+Wait.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 2391FFD3230B40E2348B5257D6296BBB /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5EDAECD9536A2DED4A68EE5B2BDB2AC /* BeGreaterThanOrEqualTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 26B9FEAB3DE0C8B91709D53571752A3B /* MatcherFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2909C149B79363BA2C0DACBD42906F21 /* MatcherFunc.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 26BFBD738BB96C6C730D4DC96D47A107 /* QuickConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C99B88350DC9DE9643120E6A2079CE /* QuickConfiguration.m */; }; - 276071E9DBAAA08BBBD569288E026156 /* OHHTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 22DE8F4275F435E33B71AE648F2C0C04 /* OHHTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 279182A0ADEBF168DDA358DA2DEC5F74 /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 13FC466ED8E79B6C9C6D5E75DD44443D /* OHPathHelpers.m */; }; - 2B350015B9F7546D0769649EE12D7D1A /* NimbleXCTestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657057D20738B4215112B2CD52F26045 /* NimbleXCTestHandler.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 2BE5D1B1D8986048A3B0E3D73B9EE158 /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = CB58FBA2EFDB29215B5DC1C5DF5B82F2 /* XCTestSuite+QuickTestSuiteBuilder.m */; }; - 2F73CCD99F13564207C549DF9C80FA18 /* MapCacheConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69B62A0A743EA6F9AB97C75F9A576E6 /* MapCacheConfig.swift */; }; - 30D34E2F749B66B677A48B38D00C8225 /* OHHTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 653EDC6189A83B318FCCBE6C8F890B19 /* OHHTTPStubsMethodSwizzling.m */; }; - 3262B230B938C8D6522790093FEAF69D /* EndWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD83EAA2F28D4F3A57F6B97B89C3D9E /* EndWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 330E8E4A6596ED625E9B34C94CC4136E /* Await.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B06E76B3637C5A622B3C2CD41B999B /* Await.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 3460FEA0CEADB05D3B56C2E1CAF9590C /* ElementsEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4E94020B70B031BFFEB9590D86193F0 /* ElementsEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 34EA8D74C57BC1A6AC8C0A5B5267E56C /* QuickConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 6503EF0C0284B7AA6A4E8F1BE88399A4 /* QuickConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 35ADFD7C4A24B1FE7E150BB4FE477E12 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = B36A214EBB134A6C72435DBD9C033F2E /* OHHTTPStubs+NSURLSessionConfiguration.m */; }; + 018228C4760DF4F8B80630BC9ACCB39E /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF7D509711876CD17A79E3C8ED2A2F6 /* DSL.swift */; }; + 02DD7FC6A855D0675EA8B3BE66C99BBB /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82294359767EE9AD2352AEE40D68B55A /* XCTest.framework */; }; + 038EC28EC00D757505F0932ABB15D518 /* CwlMachBadInstructionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEA53E2B655A0AA7F88171475A4BDB9 /* CwlMachBadInstructionHandler.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0803D3A5C37AB1E7A7D327DC326C3F7F /* AdapterProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D59637D26DD58060CD295D3AA88097F /* AdapterProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0A0D5425DC364F19FF9FC4C2DDBA4990 /* DSL+Wait.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC7677630ED6708FB432B577CF69709E /* DSL+Wait.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0A855031B215AE008389192579F9F680 /* MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DDE878A048D00EA16C9CA3717D1AD0E /* MapCache.swift */; }; + 0ADEC83846CB2257DD5F96459B335622 /* ExpectationMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F409F76C645289A90ED67E5E88B9BF /* ExpectationMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0B6C72C5CE197E5D1FC5BAF2B38CD18D /* CwlDarwinDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A582FB16FED57126BD6C85098D0AC8 /* CwlDarwinDefinitions.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0C78BF11377F17C8F5B8CD7604269361 /* OHHTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = FB495ABB8619029FBD04B53DB594494E /* OHHTTPStubsMethodSwizzling.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 10C8810E574F925B5CD3449B6DBE6EC0 /* Quick.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D569A7587D3132C83D71EA3122E79 /* Quick.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 10D8EC65B5BD4AEE3934DED2BE508793 /* Nimble-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DCF98E97A53ADCB9F820637E64E3B30 /* Nimble-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 114DFB67D17BD7BEF25CE042228C9D17 /* CwlBadInstructionException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC8A7BE1F047F0BE4495AE3AD4A3104 /* CwlBadInstructionException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 14ECE81218F5F5C9BEF00819A7C078EC /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929FDF3B9F330913C29B04BB8A3CF6E5 /* Closures.swift */; }; + 163C2D9C86D8AA40817453CC2F41F5BE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02050620335361A56185640A7C02C436 /* Foundation.framework */; }; + 165F2A6DF189151CDBCA366DD275ABEA /* OHHTTPStubs-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1272EB46FD274A9857ED9C8B4B48C571 /* OHHTTPStubs-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1A7668F50FBD77A351AD34A740622F12 /* Stringers.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3D282CEDCAA17EB9EE4D5AAB38CCE1D /* Stringers.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 1A8DF79F5EF3D69864A84173E7C9810E /* QCKDSL.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CA3A3E0E96246DDAC8AC0A65BCAD55 /* QCKDSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 209F98BB7B328893FB64BA0393B4BD57 /* HooksPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E56B21C8A1F843E190BFB1BCFFA480A /* HooksPhase.swift */; }; + 22B5B4ED0824E7BAF2091AAD6238A73F /* QuickSpecBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F5E634D1E51988CACC28B111DA493E /* QuickSpecBase.m */; }; + 230B95D35E0D844194E7D60EA53375F9 /* CwlMachBadInstructionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = B4F38021A56C8ACADBCEA370CBA3C7FC /* CwlMachBadInstructionHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 23B1189E6BC5DFFE64CA88632EDE11BB /* NMBObjCMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED5C085867D588040B23092CD9A75DF /* NMBObjCMatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 26655D8B7ABBC59035AF80295D2E8187 /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F378B0DFB68CB25C9833E5A4FD1C6B /* BeIdenticalTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 2756AC1E77E2B6810DB80EEFE8E8850D /* String+DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71C88BAAA8CE8D030AAA3AB2DDB5935C /* String+DiskCache.swift */; }; + 275F3EABB03768D6AB675F2452A3AE23 /* MatchError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 730269C4B278DF751B426E8D7695833C /* MatchError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 276071E9DBAAA08BBBD569288E026156 /* OHHTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E23C5027F49CCB1115A5709A9AD4B38 /* OHHTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 279182A0ADEBF168DDA358DA2DEC5F74 /* OHPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = D7512AB11D29274C41F20A2CDEEC80E1 /* OHPathHelpers.m */; }; + 2A3F1E2C701876668EBF1FE1A7825995 /* ThrowError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 106629AF70FD65D2F0352301129D4CA6 /* ThrowError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 2BFBDAFBEB69F68DC79A4A644C8C7838 /* CachedTileOverlayRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1803A6161AC020CCAEF38C78944D9F12 /* CachedTileOverlayRenderer.swift */; }; + 2D01CFC489EE16DB6F945D84C4E0CD04 /* Nimble-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B584EAD56D24B2900714A7BC9313910 /* Nimble-dummy.m */; }; + 2F0B5199CDB717CA9F680579900ABF15 /* QuickSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E5C292BBE3983BA541F6F502FAFA9B /* QuickSpec.m */; }; + 30D34E2F749B66B677A48B38D00C8225 /* OHHTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 178DBFBC5B886FCF8AD20199ED05638E /* OHHTTPStubsMethodSwizzling.m */; }; + 327B838EF661BC49AC99190873F5DD95 /* BeVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B512D03B99EDFE8179BD7E9CB392332 /* BeVoid.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 35ADFD7C4A24B1FE7E150BB4FE477E12 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A98F1C6EAEF1DB8C2B623EDC23CD0C8D /* OHHTTPStubs+NSURLSessionConfiguration.m */; }; 373DAA7CB7D98C53F934742296424534 /* Pods-MapCache_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E3321C36D6F54404B66845C742B0469 /* Pods-MapCache_Tests-dummy.m */; }; - 39133A7716CEDEB690A7DA9D12C45C4D /* CwlDarwinDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C08A53F7C453E738AAE2F448663B3E0 /* CwlDarwinDefinitions.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 3BD0C370BBCEBDEA68B8EDBD969370EB /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 99DD65142038A8494A13FC6CB5363AE8 /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 403F837F9B4AC86C901D238D847A767A /* QuickSpecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E1E9FEE48CDEAFC92782BD1EA33E4F4F /* QuickSpecBase.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 4203EF96811AE514D64AE069311B1575 /* AllPass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 824F6F91CF7BF57BA6B38A2249570631 /* AllPass.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 42F76698690916E0407F51610D829412 /* BeGreaterThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE46063D85FB14613BE20CD608AB7D6 /* BeGreaterThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 44C9470137EF941955A1FDCE71D68C26 /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E74FD125DB45D6D2AF372FC7DDE90C1 /* MatcherProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 46B90B2CF2EB97B38C43A31E9A5478C2 /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F1278DE6131B5156740A3ACC90CF8DD /* PostNotification.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 46BDEBF35D99D2CC53EF72DFC5BDCDCC /* BeLessThanOrEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = C295A07F23D938CD7464968410EFA016 /* BeLessThanOrEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 49B9B36EE5BE596CDD85BFE6121808E5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */; }; - 4E737D040955550EACFE774A383EB4A2 /* World+DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D2327A427B2BD8F721B522AEB74E972 /* World+DSL.swift */; }; - 52AB6461CAA9481D24835F3E48301FC6 /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F4F3C8DA66BF27F83E03EF36C668356 /* BeIdenticalTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 52F39956B5C121F4F73C82DB4E96F0FE /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B87F6DE6F4C2B34E5C045885C248366 /* OHHTTPStubs.m */; }; - 5578F928AEFA8B2B7CC542033590DFD6 /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEC34BA82C26E63F2F1261DDE47101A /* Match.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 567AAC2BA1F12C08838DD4472283C5CC /* CachedTileOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA84894A0ED4B49C202F674179FD3F1 /* CachedTileOverlay.swift */; }; - 58AC9FD84C77CACB085234373B549612 /* FileManager+DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693B3FD22026DAE1C1DC1A2054701A45 /* FileManager+DiskCache.swift */; }; - 5B6F70DDD4C63CF6ED95291BCB633494 /* ContainElementSatisfying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A04E42E0B79CBCE659E1D3BB39EC854 /* ContainElementSatisfying.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 3759C6A46C530C10CE2D39F08261239A /* Expectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F85512C9D5229F7B826990A1455BEB /* Expectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 39382B0A1EF090D15BA6C89FC3DCB099 /* QuickTestObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC11741F26FEB163D678EAF2A98BBC9 /* QuickTestObservation.swift */; }; + 3B85C195B5EC040E5C16B8451E2DC9EB /* NMBExceptionCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 06B38F22EECC62B6041AEB8D5E08B625 /* NMBExceptionCapture.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 3D6A581E79FD9EAC1A948D8BC53F1EB0 /* QuickConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBDB0F1031B401AE43BD18107B31B78 /* QuickConfiguration.swift */; }; + 3D76CD4A04044B00D7AB752D91A24EEC /* MatcherFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE44AD545A0AD9E46C85A4A7103F0445 /* MatcherFunc.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 3DBEFDA275364CBBC008E9CA7222DED0 /* CwlCatchException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3FB2D85D9D01F78D44D114C4B1377F /* CwlCatchException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 42ECC5EB8F2C661D9AC6B5DFED33D799 /* MapCache-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = A19BD5D9046748796D75D5766CE0DBE7 /* MapCache-dummy.m */; }; + 43B4841966D44AF9953A92B76CCC9B78 /* TileRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B59BB8FE6AAEC642B72D78830BB2D31 /* TileRange.swift */; }; + 43EB6D8B2DF972A7629EB87CD4CEFC77 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BAE66D7AB547D0C58A58CB7720CE397 /* Predicate.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 44F78A9C4B73BB615F9F0EAE1548A20F /* CwlCatchBadInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FCD508375053E5BC27BC68949BD5039 /* CwlCatchBadInstruction.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 49B9B36EE5BE596CDD85BFE6121808E5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02050620335361A56185640A7C02C436 /* Foundation.framework */; }; + 4ADE5FC9505A3BF7DF17AF9756585116 /* QCKDSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DA8F308C587174E1B274B1A312E5B6A /* QCKDSL.m */; }; + 4E1DBC9FF76D6AD924D1356260438074 /* QuickSelectedTestSuiteBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC4277FB682EE3412AF11B5E81534A35 /* QuickSelectedTestSuiteBuilder.swift */; }; + 5004989FF230763FBA51808AA9EE49AD /* BeAKindOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 654230CDD658658331C4CA7AAD297477 /* BeAKindOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 512AAF465EE936155DD9BBA92368928E /* Quick-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D3DACFB2D43676794CFBF3FD2FD622DF /* Quick-dummy.m */; }; + 52C19F8F7C365A559FC9A2C686F9CED4 /* Nimble.h in Headers */ = {isa = PBXBuildFile; fileRef = 818B430A00D451996F2C9725D03B73CE /* Nimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 52F39956B5C121F4F73C82DB4E96F0FE /* OHHTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = A423C1F49445714ECAF5E43ABF9D02DA /* OHHTTPStubs.m */; }; + 543A0F1350859A17BDBC32632492CB1C /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0212B6DB2B1431C27307988A7C314ED8 /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 54822D8662A32DE339917DF78A580DFD /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF8F464FDDD2BB156123DB78F57182D /* Match.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 55461DBF31A3076A832C0B3AB1390ADB /* CachedTileOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E184A869A365D0FE2C92AB87C3DBB90 /* CachedTileOverlay.swift */; }; + 58A884856B7E64EE3C204D9EDAA14045 /* Behavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB00BD3D8785D8265316C10FBC19A1B9 /* Behavior.swift */; }; + 5956BEDC9BBE97111789E571025AD511 /* LoadTileMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E8780A40B650D259D801A1E6C9204E1 /* LoadTileMode.swift */; }; + 599BD5FE9D1D2B17E8733D32B413EA8A /* NMBStringify.m in Sources */ = {isa = PBXBuildFile; fileRef = 671AC82E7E722B6916C84C0332122DD8 /* NMBStringify.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 59BF9ABA8BB14E0E4E345D13AB6D49FB /* ExampleMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9AE9D4A804577E2230C14811C7EC4F /* ExampleMetadata.swift */; }; 5F4100A3827EB8F39E09646DFA9BBBD8 /* Pods-MapCache_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 519F19D843259B908DDEACD20037BF62 /* Pods-MapCache_Example-dummy.m */; }; - 5FFC8254039A54540761DC5656615630 /* QCKDSL.m in Sources */ = {isa = PBXBuildFile; fileRef = A1A7B07025EC9B0167C9A4CE201FAFCD /* QCKDSL.m */; }; - 602E3758C0EF64AF6B7FCEA05BF5B9B9 /* Expectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C216496AEA73B6952A8F346E69886DD2 /* Expectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 603A2FC60B90F1279D399DAF8104201F /* Callsite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3766413BF40711BC7A1AA11E7A322CC5 /* Callsite.swift */; }; - 63B7ECA666221B5EE437EFE136434959 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62B693BD2EFC82DE2F0BC929DAABC288 /* DSL.swift */; }; - 64E26D7D025AC4462DFA8BA66B38C9D8 /* HaveCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 395EE898C52B91BE11E3466E6F9AEAEE /* HaveCount.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 6555C9FEB29EA5DC75C9086D8B14BCCD /* OHHTTPStubsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = F00AC50894CC6BD867D65958F5042900 /* OHHTTPStubsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 6700FDE77D0692E8BA594EEF8F07CE67 /* ZoomRangeIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509716C457E029391E7C1C2857F8B2D /* ZoomRangeIterator.swift */; }; - 6880A2FACB91C2C25B777945144044B6 /* RegionDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 391E75F827CE440BF45D68C45D06B1FF /* RegionDownloader.swift */; }; - 6DC1EBB1F53CA78AFBCFE94F6EC9BA64 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */; }; - 6FBD30E4450F8719EBF0C09E706C524E /* TileRangeIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 880966A95B74A3A1BCC56C7C9DC18611 /* TileRangeIterator.swift */; }; - 7034D0B6AE91D924AB27F6B828C79EB8 /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 922FB358BAEB5DCF70AA829172AB78A3 /* Closures.swift */; }; - 712E987D79829DC53E38FC6DA1B17CFB /* QuickSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 01DFEABA038B8351117FE2EABD976FAA /* QuickSpec.m */; }; - 72FB8CEABF346A37D54CC08647489A98 /* ThrowAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A31B1C61BE8BE362841B618BDA39E2 /* ThrowAssertion.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 77CE1B5168BF432E0D20721DA475A057 /* TileCoords.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACDB135FBF2FB01FE571816A595F97B7 /* TileCoords.swift */; }; - 786F87E50A2F92B2B04B98FED840BFD9 /* MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71EE69460C450C6E74C2FA36BB3DBCB9 /* MapCache.swift */; }; - 78A51B7FCC1DFB888AAA254529013C12 /* BeginWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54A3BFFC02ED1452E04ECE01D5788221 /* BeginWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 7AC93EB6DCDA9226165D5BC354FE7BC6 /* DSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 8206E705C0B3119435E144BC9D2DAB5D /* DSL.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 7BCC1E21AD0581F508C189CA6CDBF923 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */; }; - 7DAC86DCBC36C10F43FA5FEB819B7BF1 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52C6AC8EC49C0EBD55696528F4EBFBF6 /* Functional.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 7E4558FD855653A4754B3DAE9C9073A8 /* ZoomRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = C660C368275EEDA27F49D2B2D50CF9F7 /* ZoomRange.swift */; }; - 7F7C4C9A4BE3A22087F992806F1C90E0 /* OHHTTPStubs-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = EE753723EFC2EAC03249D40367D471D2 /* OHHTTPStubs-dummy.m */; }; - 806B9040D79A3DC58FB56EAC16FE19BF /* Stringers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72D12EEA6BDAC4FD3863B037310814D8 /* Stringers.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 81D983B9013D8525DC5858313298D992 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */; }; - 81FED3E061FA39538B0AA3092F6F380B /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 911B06044A3BF3D67D9028BBD2BAAE76 /* Example.swift */; }; - 878F0474D84D790D1268F9AC54B51E53 /* MapCache-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E2CE1DD503DF38ECB994877A61BE504A /* MapCache-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 88F403109D33F993ACD635A3D01134BC /* NSBundle+CurrentTestBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF54A01F553F29F621F98E0D9BB2758C /* NSBundle+CurrentTestBundle.swift */; }; - 895A9F4B2520089C00D083C7 /* CachedTileOverlayRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 895A9F4A2520089C00D083C7 /* CachedTileOverlayRenderer.swift */; }; - 895A9F4D2520192900D083C7 /* MKZoomScale+MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 895A9F4C2520192900D083C7 /* MKZoomScale+MapCache.swift */; }; - 895A9F512520BB8C00D083C7 /* ZoomableTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 895A9F502520BB8C00D083C7 /* ZoomableTile.swift */; }; - 89EE4D6DBDB79963D65AA1E67B543B6D /* CwlCatchBadInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7CB0B46A4D179D569B8020B5A44B7BF /* CwlCatchBadInstruction.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 8A0EF19254BAC5DF0885D1FBA345E016 /* CwlMachBadInstructionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D0A957877D1F903A5830268A2C05B2C0 /* CwlMachBadInstructionHandler.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 8D17749611AB0C8BD51C068749D8DF68 /* NMBExceptionCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A7484A26D426C2F034B0B7A7BD4FC0 /* NMBExceptionCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8D543DAD9A6C0B8BF8A5DB38AD876677 /* SatisfyAnyOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2994E4039A35F30F17709D727B378F45 /* SatisfyAnyOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 8D75EC8969EA46FBD6E1BED7791A3C37 /* BeLogical.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54BD76F593BB743EF028F3CC3883C3FB /* BeLogical.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 93AE33B3526FF4B6085B508ED89A3A35 /* RegionDownloaderDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5350C92CF49E06B7B814DE5B37093ECB /* RegionDownloaderDelegate.swift */; }; - 94DA3131D64B3D904BE28E72F1871065 /* BeAKindOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D53F7368DD619907C312123D341E0CE /* BeAKindOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 99E8019F4689A514DAC6AA40AFF7352E /* NMBObjCMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B66B3F014D7F8670742F8D470B24C7A /* NMBObjCMatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9B9714C476F416AD7FD803EA1184D113 /* BeLessThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = F62DEF5218239987D32EA8B3DF4381F2 /* BeLessThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9BB2E6C13B25C0157C4BECFC9F8DF489 /* URL+FileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F07844CF025D839A93AD0927ABFBD7C /* URL+FileName.swift */; }; - 9BB5E9B6487FE95C710687B484C17161 /* Nimble.h in Headers */ = {isa = PBXBuildFile; fileRef = 507FDDF7452EDA32B25AD50023A485E1 /* Nimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9BB78DC33523C76095B1D95D5CEF44CA /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = E71A1548CB7EC426E3D18AC1185B1506 /* OHHTTPStubs.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C460BA614D4B1D314A252C4C5CE1D87 /* BeAnInstanceOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2F201F8ABF0AEAC28E4DCB47E8AF6A4 /* BeAnInstanceOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9DA1AE386458782592D9B662E7A3B700 /* URL+DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E58721E81408E6B0DFF0D7540AB7713 /* URL+DiskCache.swift */; }; - 9E4E9672D32604544117F33983E2968B /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FB30407B2F0B8A654B76336D235B108 /* Log.swift */; }; - 9F70369EF71BD9ABAFF687AF532CC20D /* CwlMachBadInstructionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C679E71A657586E07385AA3C2AF776 /* CwlMachBadInstructionHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A173703877A14EBF47A8A4FF41F7DBE6 /* QuickSelectedTestSuiteBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D9DAA8E3F95D3E2F76CA2E4A8DA68BC /* QuickSelectedTestSuiteBuilder.swift */; }; - A36E722E97F456C32398D76A577CC8FB /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E8B394B35BA2E26C13D22FCB8E16DB9 /* NSURLRequest+HTTPBodyTesting.m */; }; + 610D686198B3BBB3906FD2DC859BAEA6 /* ContainElementSatisfying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 951BEED39E1DF158C737D0791C786909 /* ContainElementSatisfying.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 611D6583FD95ECA1B8D97DAEC6995725 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02050620335361A56185640A7C02C436 /* Foundation.framework */; }; + 626A3DE1DAE9310FF840DDD2AD2A2C9B /* BeNil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 313AD1CE7DBF24FA8FD0B3F3D10C16D1 /* BeNil.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6555C9FEB29EA5DC75C9086D8B14BCCD /* OHHTTPStubsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 932406D4E1DF3C6114B740469A2ECBF1 /* OHHTTPStubsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 65D41C8FDA768DF81796B22875979AF2 /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 375738AFF6A1C050FC2B6FEF5BF56DC4 /* PostNotification.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6BBE446491DB1CBD8C4EC0A54660565E /* BeGreaterThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = D354320757F66E58A5579C219768D904 /* BeGreaterThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6D6FEE5DE48C29438DBD66D1066453D5 /* EndWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4E3E41A747F4AB8566CF792D948AC0D /* EndWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6DC1EBB1F53CA78AFBCFE94F6EC9BA64 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02050620335361A56185640A7C02C436 /* Foundation.framework */; }; + 7536DD99ACEDE673713161E597B7B447 /* ExampleHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 877F6084753C9B0AD662FFAB2671A0FC /* ExampleHooks.swift */; }; + 76E7C7CDAA543C791A714B991F595F2B /* QuickSpecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 379A18659913E7C5C99ABAB30E115F2C /* QuickSpecBase.h */; settings = {ATTRIBUTES = (Project, ); }; }; + 77485EFA0FAF7EBBF5085756212C0FB2 /* MapCache-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D078D3F1D714D55E420BFC39BA5F59D /* MapCache-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7756FA7ED7F556FE496573BC9EB2FD8F /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD2ED142C64BBBA2BE127A101EAD09 /* SourceLocation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 77701F5CA6F8DB9091F8B9B8420FEC23 /* ToSucceed.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA1364021B61B6779249DF84B4A95A1B /* ToSucceed.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 79945940AD580338225CD02DE971036B /* BeLessThanOrEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BB91811F31EE9130D854CD1C9AACC8 /* BeLessThanOrEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 7CE6049975894E447F2D4071C74F6F8F /* Callsite.swift in Sources */ = {isa = PBXBuildFile; fileRef = C414D16995B3E69D1E9EE9510F6183F3 /* Callsite.swift */; }; + 7EAF5AB5544E93C6DAB005DABBE88479 /* MapCacheConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BC3413CFEAB587CDA04B43A62A87F62 /* MapCacheConfig.swift */; }; + 7EB28FEC3D0ABA1A2A6CFE57C400F74D /* QuickSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 778A19D566C9FDCE75F613ECFFC8F65B /* QuickSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7F7C4C9A4BE3A22087F992806F1C90E0 /* OHHTTPStubs-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AE985901449644D09E9F2658ED8CE8 /* OHHTTPStubs-dummy.m */; }; + 81D983B9013D8525DC5858313298D992 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02050620335361A56185640A7C02C436 /* Foundation.framework */; }; + 887AF8C809D60140319DE71D6427F370 /* NSBundle+CurrentTestBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFD7A0660C75672B92ED47D486C39318 /* NSBundle+CurrentTestBundle.swift */; }; + 88EBBD12DB036ACCF5847176C2073344 /* URL+DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7D8A0C4CDB3D855A990975F2741BCAB /* URL+DiskCache.swift */; }; + 89414D5228B7117D80C9412389FC400B /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 74E684295FC726DEA754DB314A0D6B1A /* mach_excServer.c */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8983FE0BC9271728ABB395DF206431AB /* HaveCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA01F188F89CEE1F1BA6EF012273B31 /* HaveCount.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8992CD3A1E62B1BC79D5A8D287F7CD42 /* TileCoords.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05895B6A84D2574C62B5F20E4193F4F9 /* TileCoords.swift */; }; + 89DFED261F449E70AF9DB5FE5ADF7DAA /* CwlCatchException.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CBDDF07A68ED9A8935158163D7DE566 /* CwlCatchException.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8A2DDA2570D63EA79E63B3711BFDDDBA /* NMBExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1707FA50A33DA503520807B9BE0D1DA /* NMBExpectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8DB2AB6A900F8B759671367838B2BDC2 /* MKZoomScale+MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0E00CD23B6D208A0BDC42A0AFBDE5B /* MKZoomScale+MapCache.swift */; }; + 8E4A2F4A1EF16B63817A516CC2743619 /* Quick-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 4293857848F9EB31813D13DFC509E912 /* Quick-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8E6C52E521C7213CC27000CEDF156F8F /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE9A326EB306300343B2D1842C97D352 /* RaisesException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9231B70907F130F31CF5717C502B780C /* ExampleGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7B1F7360FAABF0E220F2ECFC7F3DE3A /* ExampleGroup.swift */; }; + 9231C59F68ED4A9A5EA944224F71C954 /* BeginWithPrefix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4254C540A7400F0424C8BC1D5F2C46B0 /* BeginWithPrefix.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 94A71871F05740B4F124E87BE47FB2DB /* TileRangeIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84A8CB314832DECF2440F056ED008E4 /* TileRangeIterator.swift */; }; + 94B18F2CFF543F6B2E43E84630C337E2 /* SuiteHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89001E0BAF80B8B9E75AB1627596D905 /* SuiteHooks.swift */; }; + 97764844A8C438827D068D3B36E30797 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90F9BBCB3C84830D987B0A541ABF26D8 /* Log.swift */; }; + 988CFD7CD7B73314742EEFBF0AC5617B /* DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D33487DA081D790A9D9B55EA9CDCC /* DiskCache.swift */; }; + 9BB78DC33523C76095B1D95D5CEF44CA /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = C459BE8DFC0FC715F57C85E818ECAF57 /* OHHTTPStubs.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C96123C115327FBDCF2F3F7432348CC /* XCTestObservationCenter+Register.m in Sources */ = {isa = PBXBuildFile; fileRef = F8521BC982C001EC7011982256FA3C7E /* XCTestObservationCenter+Register.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9DF8F4034624C4D4B6130B377ACBCCA5 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35450B70EB56065624E377B75EE8D35 /* Async.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9E874C00792FA983399C03EC00AE326D /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = D070F8A978F25B5C3E57C5C8869AEAF3 /* XCTestSuite+QuickTestSuiteBuilder.m */; }; + 9FB5F3B3AAF3103848313FACD0CACBCD /* QuickConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 676FBE1A9835D018A658E201831FEE64 /* QuickConfiguration.m */; }; + A24D882940B3F56F39B475022048C973 /* ZoomableTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6E63D7E5C4BA2B03E24C2F394A74577 /* ZoomableTile.swift */; }; + A35159AD5A7A49BA9093F29B63DBD30D /* String+C99ExtendedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBBD933A1394BA217CEED50207FCE05 /* String+C99ExtendedIdentifier.swift */; }; + A36E722E97F456C32398D76A577CC8FB /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = AD14C524AEBCF7962A0536758DA758C1 /* NSURLRequest+HTTPBodyTesting.m */; }; + A3CD90F92E7E63331CDD6D45BDF98CC1 /* DispatchTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F001325EA32FBDCD7E2554E90313D16 /* DispatchTimeInterval.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; A45E6307D6F6DEDDE44A3C0C5FBCA943 /* Pods-MapCache_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BD493DB7E9740E359DA72AA44864828 /* Pods-MapCache_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A55433663AE83E51EB96C54950361247 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */; }; - A8D0EB830EE43169528E1D181CB2DDBE /* TileRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6E6CA3C5BD20FB67E7D4323C1B8D599 /* TileRange.swift */; }; - A9996A6303084D17B9C439CB132A1F69 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E689B6B9DFFCF4F83BB830F7EAFE48 /* DSL.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - A9BF211D24462D531E278F2AE317AEA4 /* Quick.h in Headers */ = {isa = PBXBuildFile; fileRef = 735D06736FD9C79A4F9232CA1417D1C7 /* Quick.h */; settings = {ATTRIBUTES = (Public, ); }; }; - AD13D4018B31C1AB08A5BEE54E9FBF05 /* DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 652FE8CFA26C49E0D14E90A1DEAB3CF1 /* DiskCache.swift */; }; - AD69407E2FA1D39A9E09248052F2D81B /* ExpectationMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1880E766E464AD0B6ED5AFC4B62E0908 /* ExpectationMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - AE191084C68BDF1A2878978CCFBF29E2 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648712EF908CF6AF67480B59D3A8D00C /* Configuration.swift */; }; - B2A65EEDB5D5EC246EA68E10964FF7B3 /* ThrowError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71A99273767469EF6AF2FB44F8F4D5C7 /* ThrowError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B4058A2AA8486E9879F113E6F67B9679 /* AdapterProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41B6AE4618F2A2292FDA4C30660FD484 /* AdapterProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B5AEEFF5F31AC069BD96E8104301AD4D /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C1092AB770999A27768BADA699E54E4 /* World.swift */; }; - B6CC23C6C288F4EB9EDD3A06F1F5F094 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDE0A82E960B7EB7D5901106C84996F /* Predicate.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B71070160CF07EFA99ED0445B0D191E7 /* Nimble-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC245C843DB0600AFC6378E16A4A96F /* Nimble-dummy.m */; }; - B7662703AF8D3FFFCB0070C50FEDCC58 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24DA9DF6F0005B8E2A739F1BE3781EAC /* Errors.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B7977833FE910D5DB829DCCC6EA3D104 /* Quick-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 41B76475CF79311864EE2C9AC3C5FECF /* Quick-dummy.m */; }; - B79FC6E46F642C3FC74B3E6D9175B1AB /* SatisfyAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = B98E887DF9C68D15B0940E1DBE494FEA /* SatisfyAllOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B7E45C4365BE7112D6D4D84544D840B8 /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8692EA1A6C52FBBD0E2B4F28CDAE188E /* OHHTTPStubsResponse.m */; }; - B9397BD911F09C73BC598D60DC04C1A7 /* Behavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE3F3D4A53B4D6FFDE4E7B942DD3E552 /* Behavior.swift */; }; - BCC838993C29682C5BAEBAEEE8374714 /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1FB7F3A8D89DC02BC80AC7F0508982C /* OHHTTPStubsSwift.swift */; }; - BD379F95293A811D8E591CAC8E9FF410 /* Quick-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE5FAA16B3F3E5E74852A98EBF9B301 /* Quick-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BF1FF48ABA96425848A8139D129E9028 /* MapCacheProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2486E71282E0351A88C40C2204E0525 /* MapCacheProtocol.swift */; }; - C051C0411627BD5FCDA031782EB1F716 /* DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = ACC40BBED2F4EF8D6FA3ADDA2598395A /* DSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C0A372B2CC7CFB555904F780C4363E56 /* String+DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96C1C546EB3876A4EC84313410FE23FC /* String+DiskCache.swift */; }; - C0C98C8C7D07E1598F20EE2F0539197D /* NMBExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD616A6818F3ECCB7D00FB8E2D610F84 /* NMBExpectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C43FC4EFD9E762C454E4168953475A55 /* HooksPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A90724E0D506F14E76BC8939CD5A2DB /* HooksPhase.swift */; }; - C60C3ED1EDC2A1F16FFBE40563712276 /* NSURLRequest+HTTPBodyTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8C1D628275ABF472571DA614C1E071 /* NSURLRequest+HTTPBodyTesting.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C6A86479B1236153B50C59E9ACB07D0D /* QuickSpecBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BD18C83B0338D3140BEEC9AD00D3B77 /* QuickSpecBase.m */; }; - C903AEFEEB4E73644A03FB8285543107 /* BeEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9558C3392958FEF6451C867A954D3624 /* BeEmpty.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C912897D77798A90873A3DAD8A4BDC50 /* QCKDSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 91C0F36CD0A75417BCF69ED4A90E61D4 /* QCKDSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C979EEB0159A65246F6BD2C906A8ADB7 /* BeVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = B197AFED90D8344E24FBE7EA5DC6FEB8 /* BeVoid.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C99BBC3F70E056CB6A3CC0516318939D /* AssertionDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7006B9DE95C20575C8104D556FD82F64 /* AssertionDispatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - CA27256DC58202C86D5DE65F56FB4F19 /* OHPathHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F43E68EAAE9C9543D3B81CDA03083A9 /* OHPathHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CAACEBB97A7D23E6782B47A805DFED81 /* CwlCatchException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46962C940649D631BD5FB3D78AF65580 /* CwlCatchException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - CD6B1F146B0E157FE5B9CAFFAE77A5B5 /* Nimble-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 12C63023E61CF58EA0D8522F6DB486BB /* Nimble-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CEE8D31A4E76BB7B350BF2A7175D4BC2 /* NMBExceptionCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 51B77DE700D095FB89CD68F9E54EDC70 /* NMBExceptionCapture.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - CF9218FF56D8EE43681150A3E1635C9A /* ToSucceed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A3F3244B4D14F0F6B6CF66A073953CE /* ToSucceed.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D34D0540ADCBF163575B6B5444B1AAF6 /* Contain.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F108D2A74FAB4ABA6D25FB80BF0A79 /* Contain.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D755642ECA73CFE2E4C31CDD0DFBA42E /* QuickSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = D13A30260CB105567BFA5CA03B5F63F5 /* QuickSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D9CFB8E5E354D7BE61D092259779F437 /* Equal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69D64FE31821C028D03F21EE032A6FF9 /* Equal.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D9D6150D329A87CBB415FD349F0C50FD /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C29CAD75DA4C75D8CC7A2573578C7DA /* SourceLocation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DB84342A0C0DEABBF7F729DE55225D82 /* XCTestObservationCenter+Register.m in Sources */ = {isa = PBXBuildFile; fileRef = C74B7479708267FB169BBF01B8920C90 /* XCTestObservationCenter+Register.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DCD198D49C0A198A09525B7688EE3BC9 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF0CE3ABA703D86133F5A8B94A3E628 /* Async.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - E0EAC85F7ACFAD998B14FCE66144000E /* NMBStringify.h in Headers */ = {isa = PBXBuildFile; fileRef = D7132EDF91FF6AF730AB87172465F5AA /* NMBStringify.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E458AAE1AE9E2250F29806E5633B1860 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11C6C324A756BDE10FCE734B7DE7C139 /* Expression.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - E6FB3E5C9B3B8C3FC24616F2D0CC0184 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E195B947F8E022DA5B95511401FB8BCC /* CFNetwork.framework */; }; - EC7EF3D5778783BD93EBC6F82016ADA9 /* BeNil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B8EC736F60632EAEC416C67C5E5389 /* BeNil.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - ECCA1FA570A912E8CDB54EB843F1D030 /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE4BFCD6A51238AB986817F919AA2016 /* NimbleEnvironment.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - EFB9CC9267297D8104141A4046AAD14E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */; }; - F22487D25FC98EFAA279FD39C7225D9A /* MKMapView+MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CD8958658AE5D54E60F4656CA957AA9 /* MKMapView+MapCache.swift */; }; - F310B21703A7BC438A09DDB96670583F /* AssertionRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90D6C8439AFD1DF0C31C19BD170579D4 /* AssertionRecorder.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F3E92983B774801A81A5EB48AA1B2C30 /* LoadTileMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A27FA715B02735A7598DA75D285AC6D3 /* LoadTileMode.swift */; }; - F4877B3857C780DCDB7F413A03F95600 /* BeCloseTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D8355401EBFC7E98C10A3C9F7B268A /* BeCloseTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F78E35D04F09485FA5DFA72FE1AD5AB2 /* NMBStringify.m in Sources */ = {isa = PBXBuildFile; fileRef = 211D3C5C8A6138EDF0F150D704FE72B0 /* NMBStringify.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A590E76A80283B9FB9A3AB36E021723F /* AssertionDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991B74211A9204244463F0891054A96B /* AssertionDispatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A6CE2E672C8EB4DF57485428AFD64A3C /* URL+FileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F9619CDEF4F3C1A0979714DD3803991 /* URL+FileName.swift */; }; + A7F5B07BF96955EFDC9106335235EDB2 /* QuickTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F073D4CBB522835C5500DE9263BB94E1 /* QuickTestSuite.swift */; }; + A85403E9F906C2E74B26DFB29F83C484 /* AllPass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78ED18ECB4CE94F11CBADEC017103BE7 /* AllPass.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + AA30AF4811BF289F891D60B772ABC7F6 /* Equal.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F3E919D290987CFAECE25B24178055 /* Equal.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + AD3F3DEA678B9C0A1C4F0EF79BFB7505 /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12F023D0B00EB7BD5EE7CCA35230555 /* MatcherProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + AF2BC5CE9E9C800699861D8BF2A22AC8 /* MapCacheProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A78A89B3E80FEB98C18E1DF7818856B /* MapCacheProtocol.swift */; }; + AF400669D1D3B159A0E17AADDCF4E2AF /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA73F9ABFC32B574929D4A7F521B7F6E /* MapKit.framework */; }; + AF60C00928A7AFE04E374B620EEA5F49 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5EEAA1DD3F86A1C0C70B46826571801 /* Filter.swift */; }; + B3A14E7D18C64299488164C04FD75E83 /* BeEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DF72DB6249B4F56DFC3C3D0F3056D2 /* BeEmpty.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B48508EB39EE315F5A00429EEA69DD63 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ED0FE9236F1CAE618F72A1D0DCC892B /* Configuration.swift */; }; + B4990E8D4FFAEF51DA68F7B195158FF8 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = E32820BCDD9A589384B4DB22A248FAF3 /* DSL.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B791BCADC64C0308254FE6BEE9ADBFBA /* BeginWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F7EA2C3BB55C73409E71F62853A8A4 /* BeginWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B7A132AB2E3920D99510C0A7C9DC6A3C /* NimbleXCTestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FDB1926373EBA468A94CE37C448CB8E /* NimbleXCTestHandler.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B7E45C4365BE7112D6D4D84544D840B8 /* OHHTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = AEAB1F0948E0B4A948609CFD56D9F7E1 /* OHHTTPStubsResponse.m */; }; + BAE453A15CC93D9864577A1FEDE4E0E7 /* Contain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 360E84A46E42BCFB18831D7F3613B8D3 /* Contain.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + BB2624D57AD7CBB874FBCB2CCDEB86AF /* ZoomRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840234133F19EC22A5F421C16E65F96C /* ZoomRange.swift */; }; + BCC838993C29682C5BAEBAEEE8374714 /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01BC0C12BFC9461920C5012C844FD0C /* OHHTTPStubsSwift.swift */; }; + BE3B4B7C1DEF344A90A5A8E5A411724A /* MKTileOverlayPath+MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 163A11930572926FC2B7E58893ECC26E /* MKTileOverlayPath+MapCache.swift */; }; + BE56C54CD29F23A1C631645390E8569D /* ErrorUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3F4B4B8AFEBC5EB163BCD46AEB6677 /* ErrorUtility.swift */; }; + BFEBC90223F66B0FF770B92B1C670BCF /* QuickConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE7F251754A213E127BEF87CDDC0066 /* QuickConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C52FB32088F23958D2D96F67B0A30AA3 /* BeCloseTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72BCF5BACAE12906A061C0882DCF95A /* BeCloseTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + C55EAB2A06FE8D7F06B19B04103A8732 /* RegionDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46F98D9192BFEB469DF1634C78D85E0D /* RegionDownloader.swift */; }; + C60C3ED1EDC2A1F16FFBE40563712276 /* NSURLRequest+HTTPBodyTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A9E7A288343A8DFA3F71AC3012B3F39 /* NSURLRequest+HTTPBodyTesting.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C96C1A7F6894C38A5BB0EF16A41C2A1B /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = C1203509141AE5E9FFDC7541AF05EF2D /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C9C4379FEC8CED22396E95A1F0A2624C /* MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612F544562D2709285747F57CA0F0064 /* MD5.swift */; }; + C9E716023868A97D2F5B19934D93045E /* World+DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = C795D74CD9A3E4D4718EDA8F72AFD60C /* World+DSL.swift */; }; + CA27256DC58202C86D5DE65F56FB4F19 /* OHPathHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 359A341E9A91396315FBC06D5E34A503 /* OHPathHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; }; + CC87EF1E8E515447BCFCBC6F019EE057 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D3813FBA71C055DD569D635AE1C099D /* Expression.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + CED07149A5087B86617CD542A475B3C2 /* ZoomRangeIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F0E55EF9B47362995A14527175870D7 /* ZoomRangeIterator.swift */; }; + D175D29A5DB6B6ECFF966BC035985AB4 /* BeAnInstanceOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86EE3DA33C79D566526AF252F22B6E92 /* BeAnInstanceOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D2C041844A0EB4EB2E8C7B9DAA748EEB /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55AF7391D64643383F74C7A205868F8E /* Example.swift */; }; + D6C7E3D6B8C5D7C73664FEAC6F37EFB4 /* SatisfyAnyOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03E42FC64984A32E9B5D2F842B42E25 /* SatisfyAnyOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D7F330FD8821513B4878BA0CD769F64E /* BeLessThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB53F6709C3EED9FFE831DEDBB360A8 /* BeLessThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D9280F42D370B7A50BE491101C79E80E /* DSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 56C651CE9650C090EA2965D3646DAA4B /* DSL.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DC1A7C98613B411576BC3474CBD69EC2 /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791DE21DA91D6F29F6687ECD62EA6FB9 /* BeGreaterThanOrEqualTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DCCBBA9E39573DD44831535086342FD8 /* FileManager+DiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AB8FE0304FBDFFD6D650AC7B1BD3D0 /* FileManager+DiskCache.swift */; }; + DD9B2D62BC7B8527A6CC05D2737674B4 /* Await.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80B0213FE033CAF6DBD0C280D66CE48F /* Await.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DE3657A6A7DAF55EDDC583D060CEA51C /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 795B462193EBE8925080B296C53B5EC5 /* Errors.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DF40457B66380958B843F26597F99E8B /* NMBStringify.h in Headers */ = {isa = PBXBuildFile; fileRef = 8985456D5A9FAD4E2F673A0939A82581 /* NMBStringify.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E1B3B56A2B3791E9363D8E5CEFB31B49 /* FailureMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E074C5D8E5F4E01C9B1E35A2B516AF /* FailureMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E5420ACB746E9206169606C5C9352E50 /* ThrowAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF0A3A47724D16281FCDD50828CE148 /* ThrowAssertion.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E58AAF6616E9391EB04F8D239D17DCCF /* MKMapView+MapCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = C127A341E44E6C42A5CDEE3CFF95F80D /* MKMapView+MapCache.swift */; }; + E6919764B414357B20730085E46D021F /* BeLogical.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC33D39E55EDA16673F640D1A70557B /* BeLogical.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E6FB3E5C9B3B8C3FC24616F2D0CC0184 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D08DDB48DF4D1E8FA2482934B30F7CF /* CFNetwork.framework */; }; + E9B55E6C43FB7AB6DD2823698F782B87 /* DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8EBA2948E86735B919AD56668EDAA6 /* DSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EBF0D67208D37255308A31F00DD4198F /* NMBExceptionCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C0B0FF8D7E18968C31E823BA4225FCF /* NMBExceptionCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F01995755687FA91F51A15ED8FD9D125 /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247A52FE97D9C04AAE2DE1C4ACC8361C /* World.swift */; }; + F0929D1E0ABB52207BAE6CD8E9A12387 /* TileCoordsRegion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46672F603F982F341F9E9196046B65C4 /* TileCoordsRegion.swift */; }; + F32BD8F634D9F82B0EE791262FEFC59C /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 066F6F4C9A193CA0D7957636B740258E /* NimbleEnvironment.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F37E5D553251C1080C36A9C64ACA219C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02050620335361A56185640A7C02C436 /* Foundation.framework */; }; + F4980302BB992AECA18EB5CD294A8069 /* SatisfyAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F586987961FF1F9780633FC3DE4C7FE /* SatisfyAllOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F6B5D5E3FCD639EE750DE6F2ED6FF4FD /* ElementsEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F4F2B1F048A2EFB87FD5F8440068EDC /* ElementsEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; F7F1CE07F30CE57333B105A11EC664E5 /* Pods-MapCache_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B5CEF88D3C3708634DDD8AD10AEF4FC /* Pods-MapCache_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F83CA1780F5D9C6432CE9D7248D9B35A /* Compatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = F0CF97A3735B53AA465C2845C068AFEB /* Compatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F9E85548BF1EF8C5035BAF92233C34B6 /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6579D2619AC8D3D023B34BA4FC56B0B /* RaisesException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - FBBE9D9A2D1C31E86BEABF94B224C4EE /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D2CDC2B3C9E5E38B425904019C0AB98 /* XCTest.framework */; }; - FBD83FEF1CE5B319531FB6E5FFB4F22C /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = B4D8E99D7468D22A7051E13B20BD6531 /* OHHTTPStubsResponse+JSON.m */; }; - FF4C06BD3EF989D203359A47EAA0A287 /* ExampleMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ED64A605FB721F40DA193A7D501D7CE /* ExampleMetadata.swift */; }; - FF920E965F1CA016FF302DE8C92C5122 /* CwlBadInstructionException.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7E52BA193C9B63C25CCF6225A10A5CB /* CwlBadInstructionException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F83CA1780F5D9C6432CE9D7248D9B35A /* Compatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 63D9392730024C9C1DD6872692D1C590 /* Compatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FAF2D94B80ADF206BDE14D4FB5C70939 /* AssertionRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86BB725AD13DBE78EC993A939F13D2A8 /* AssertionRecorder.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + FBD83FEF1CE5B319531FB6E5FFB4F22C /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 73B5C96F73A150F05BA5269117D30F07 /* OHHTTPStubsResponse+JSON.m */; }; + FDC3291ADDDFF7AF558972ED5ED3361B /* RegionDownloaderDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93AFEAF23F080EC2D79874D97B5FBDB /* RegionDownloaderDelegate.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -209,199 +210,324 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 013EE4849980A17D60BD1CA736137B69 /* Nimble-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Nimble-Info.plist"; sourceTree = ""; }; - 01DFEABA038B8351117FE2EABD976FAA /* QuickSpec.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpec.m; path = Sources/QuickObjectiveC/QuickSpec.m; sourceTree = ""; }; - 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 01CC01DDC8C9FEDB271F0628976ADF7A /* jazzy.js */ = {isa = PBXFileReference; includeInIndex = 1; name = jazzy.js; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/js/jazzy.js; sourceTree = ""; }; + 02050620335361A56185640A7C02C436 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 0212B6DB2B1431C27307988A7C314ED8 /* mach_excServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mach_excServer.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h; sourceTree = ""; }; + 024F77411190AF4E760D234AE6E3F2C1 /* dash.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = dash.png; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/img/dash.png; sourceTree = ""; }; + 02F378B0DFB68CB25C9833E5A4FD1C6B /* BeIdenticalTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeIdenticalTo.swift; path = Sources/Nimble/Matchers/BeIdenticalTo.swift; sourceTree = ""; }; + 046AE629552BFADF1206744AA8838420 /* MKZoomScale.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MKZoomScale.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/MKZoomScale.html; sourceTree = ""; }; + 056D27853DF17A97C23812BC8EA2593F /* OHHTTPStubs-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubs-prefix.pch"; sourceTree = ""; }; + 05895B6A84D2574C62B5F20E4193F4F9 /* TileCoords.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileCoords.swift; path = MapCache/Classes/TileCoords.swift; sourceTree = ""; }; + 066F6F4C9A193CA0D7957636B740258E /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; + 06B38F22EECC62B6041AEB8D5E08B625 /* NMBExceptionCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBExceptionCapture.m; path = Sources/NimbleObjectiveC/NMBExceptionCapture.m; sourceTree = ""; }; + 06F7EA2C3BB55C73409E71F62853A8A4 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; + 085682E10B93FBF95B65CA4C5BF1D1F6 /* BytesSequence.html */ = {isa = PBXFileReference; includeInIndex = 1; name = BytesSequence.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/BytesSequence.html; sourceTree = ""; }; 087DFFEFA5E431E1C3EEC0FEB6D022A7 /* Pods-MapCache_Example-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MapCache_Example-Info.plist"; sourceTree = ""; }; - 0BD18C83B0338D3140BEEC9AD00D3B77 /* QuickSpecBase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpecBase.m; path = Sources/QuickSpecBase/QuickSpecBase.m; sourceTree = ""; }; - 0C08A53F7C453E738AAE2F448663B3E0 /* CwlDarwinDefinitions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlDarwinDefinitions.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift; sourceTree = ""; }; - 0D631E9908483F9525A6B3F36F16CC61 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0A3F198F626821383F4C4ADC94D40F42 /* Int.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Int.html; path = docs/Extensions/Int.html; sourceTree = ""; }; + 0D55AC0CD8C4836F869C0B8AE7DD217A /* jazzy.js */ = {isa = PBXFileReference; includeInIndex = 1; name = jazzy.js; path = docs/js/jazzy.js; sourceTree = ""; }; + 0D631E9908483F9525A6B3F36F16CC61 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Quick.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0D9792A0C457F6F429A39E294A33C7E9 /* Pods-MapCache_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MapCache_Example-frameworks.sh"; sourceTree = ""; }; - 0D9DAA8E3F95D3E2F76CA2E4A8DA68BC /* QuickSelectedTestSuiteBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickSelectedTestSuiteBuilder.swift; path = Sources/Quick/QuickSelectedTestSuiteBuilder.swift; sourceTree = ""; }; + 0DC11741F26FEB163D678EAF2A98BBC9 /* QuickTestObservation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestObservation.swift; path = Sources/Quick/QuickTestObservation.swift; sourceTree = ""; }; 0E3321C36D6F54404B66845C742B0469 /* Pods-MapCache_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MapCache_Tests-dummy.m"; sourceTree = ""; }; - 10A5C33702031BDD460D4DB8C7F2C46A /* DSL+Wait.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DSL+Wait.swift"; path = "Sources/Nimble/DSL+Wait.swift"; sourceTree = ""; }; - 115747451E3769DDB80BB07379405375 /* MapCache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MapCache.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 11C6C324A756BDE10FCE734B7DE7C139 /* Expression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expression.swift; path = Sources/Nimble/Expression.swift; sourceTree = ""; }; - 12C63023E61CF58EA0D8522F6DB486BB /* Nimble-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-umbrella.h"; sourceTree = ""; }; - 13FC466ED8E79B6C9C6D5E75DD44443D /* OHPathHelpers.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHPathHelpers.m; path = OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m; sourceTree = ""; }; - 1733E028DCCD164B9FCDF2D26867A7AB /* MapCache-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MapCache-dummy.m"; sourceTree = ""; }; - 17E33041B314FA837A3CAEB9DF3CDE9F /* OHHTTPStubs.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OHHTTPStubs.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1880E766E464AD0B6ED5AFC4B62E0908 /* ExpectationMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpectationMessage.swift; path = Sources/Nimble/ExpectationMessage.swift; sourceTree = ""; }; - 1AD83EAA2F28D4F3A57F6B97B89C3D9E /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; + 0E3580128D900AB1EC46587183EE58F4 /* MKTileOverlayPath.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MKTileOverlayPath.html; path = docs/Extensions/MKTileOverlayPath.html; sourceTree = ""; }; + 0EB10702CBBC5F3AE8FDD75A3013B5E1 /* lunr.min.js */ = {isa = PBXFileReference; includeInIndex = 1; name = lunr.min.js; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/js/lunr.min.js; sourceTree = ""; }; + 0F9619CDEF4F3C1A0979714DD3803991 /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; + 0FCD508375053E5BC27BC68949BD5039 /* CwlCatchBadInstruction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstruction.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift; sourceTree = ""; }; + 106629AF70FD65D2F0352301129D4CA6 /* ThrowError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowError.swift; path = Sources/Nimble/Matchers/ThrowError.swift; sourceTree = ""; }; + 115747451E3769DDB80BB07379405375 /* MapCache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MapCache.framework; path = MapCache.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1272EB46FD274A9857ED9C8B4B48C571 /* OHHTTPStubs-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubs-umbrella.h"; sourceTree = ""; }; + 12BBAB6795B1588E0CF0B45AD3C4021E /* LatitudeError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = LatitudeError.html; path = docs/Enums/LatitudeError.html; sourceTree = ""; }; + 1300A810219BC226680515397FCA1509 /* undocumented.json */ = {isa = PBXFileReference; includeInIndex = 1; name = undocumented.json; path = docs/undocumented.json; sourceTree = ""; }; + 15C6D79BFCB71DD0B8341D0F4F8A9A2F /* MapCache.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCache.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/MapCache.html; sourceTree = ""; }; + 163A11930572926FC2B7E58893ECC26E /* MKTileOverlayPath+MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "MKTileOverlayPath+MapCache.swift"; path = "MapCache/Classes/MKTileOverlayPath+MapCache.swift"; sourceTree = ""; }; + 17289CF181606AA1826AC4BE24353461 /* OHHTTPStubs.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = OHHTTPStubs.modulemap; sourceTree = ""; }; + 178DBFBC5B886FCF8AD20199ED05638E /* OHHTTPStubsMethodSwizzling.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubsMethodSwizzling.m; path = OHHTTPStubs/Sources/NSURLSession/OHHTTPStubsMethodSwizzling.m; sourceTree = ""; }; + 17E33041B314FA837A3CAEB9DF3CDE9F /* OHHTTPStubs.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = OHHTTPStubs.framework; path = OHHTTPStubs.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1803A6161AC020CCAEF38C78944D9F12 /* CachedTileOverlayRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CachedTileOverlayRenderer.swift; path = MapCache/Classes/CachedTileOverlayRenderer.swift; sourceTree = ""; }; + 19814C0EA6E5E99C086BFB63A964EED3 /* jazzy.search.js */ = {isa = PBXFileReference; includeInIndex = 1; name = jazzy.search.js; path = docs/js/jazzy.search.js; sourceTree = ""; }; + 19F24FA7525D629A577EB1E4ECEC7D19 /* HashBase.html */ = {isa = PBXFileReference; includeInIndex = 1; name = HashBase.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/HashBase.html; sourceTree = ""; }; + 1A78A89B3E80FEB98C18E1DF7818856B /* MapCacheProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MapCacheProtocol.swift; path = MapCache/Classes/MapCacheProtocol.swift; sourceTree = ""; }; 1B5CEF88D3C3708634DDD8AD10AEF4FC /* Pods-MapCache_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MapCache_Example-umbrella.h"; sourceTree = ""; }; + 1B5E18B7D9CBBBFA152EA499F9C2466E /* Enums.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Enums.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums.html; sourceTree = ""; }; + 1BAE66D7AB547D0C58A58CB7720CE397 /* Predicate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Predicate.swift; path = Sources/Nimble/Matchers/Predicate.swift; sourceTree = ""; }; + 1BC3413CFEAB587CDA04B43A62A87F62 /* MapCacheConfig.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MapCacheConfig.swift; path = MapCache/Classes/MapCacheConfig.swift; sourceTree = ""; }; 1BD493DB7E9740E359DA72AA44864828 /* Pods-MapCache_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MapCache_Tests-umbrella.h"; sourceTree = ""; }; - 1EDE0A82E960B7EB7D5901106C84996F /* Predicate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Predicate.swift; path = Sources/Nimble/Matchers/Predicate.swift; sourceTree = ""; }; + 1CBDDF07A68ED9A8935158163D7DE566 /* CwlCatchException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchException.m; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m; sourceTree = ""; }; + 1D3813FBA71C055DD569D635AE1C099D /* Expression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expression.swift; path = Sources/Nimble/Expression.swift; sourceTree = ""; }; + 1DA8F308C587174E1B274B1A312E5B6A /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; + 1E3F4B4B8AFEBC5EB163BCD46AEB6677 /* ErrorUtility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ErrorUtility.swift; path = Sources/Quick/ErrorUtility.swift; sourceTree = ""; }; 1F901C8F3E3EA649E68D9DE38B402834 /* Pods-MapCache_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MapCache_Tests-acknowledgements.plist"; sourceTree = ""; }; - 211D3C5C8A6138EDF0F150D704FE72B0 /* NMBStringify.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBStringify.m; path = Sources/NimbleObjectiveC/NMBStringify.m; sourceTree = ""; }; - 22DE8F4275F435E33B71AE648F2C0C04 /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "OHHTTPStubsResponse+JSON.h"; path = "OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h"; sourceTree = ""; }; + 1FA1FEE9F0F2B07CA3E3864243312B3D /* badge.svg */ = {isa = PBXFileReference; includeInIndex = 1; name = badge.svg; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/badge.svg; sourceTree = ""; }; + 1FD0D84D43EEC0A91801DA7C6D09E053 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = docs/docsets/MapCache.docset/Contents/Info.plist; sourceTree = ""; }; + 1FDB1926373EBA468A94CE37C448CB8E /* NimbleXCTestHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleXCTestHandler.swift; path = Sources/Nimble/Adapters/NimbleXCTestHandler.swift; sourceTree = ""; }; + 20C519F6ACDC4A0C875F2E3C8BF7EC19 /* TileError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileError.html; path = docs/Enums/TileError.html; sourceTree = ""; }; + 20EFA79EFA09F9E2150F7FCA74B79004 /* Classes.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Classes.html; path = docs/Classes.html; sourceTree = ""; }; + 22F5E634D1E51988CACC28B111DA493E /* QuickSpecBase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpecBase.m; path = Sources/QuickObjCRuntime/QuickSpecBase.m; sourceTree = ""; }; 23D3BCD493B00F0CE281CD049CFA4E3C /* Pods-MapCache_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MapCache_Example.debug.xcconfig"; sourceTree = ""; }; - 24DA9DF6F0005B8E2A739F1BE3781EAC /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Sources/Nimble/Utils/Errors.swift; sourceTree = ""; }; - 2909C149B79363BA2C0DACBD42906F21 /* MatcherFunc.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherFunc.swift; path = Sources/Nimble/Matchers/MatcherFunc.swift; sourceTree = ""; }; - 2994E4039A35F30F17709D727B378F45 /* SatisfyAnyOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAnyOf.swift; path = Sources/Nimble/Matchers/SatisfyAnyOf.swift; sourceTree = ""; }; - 2A4EE851FEE7978F898806AC8D49D3D6 /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; - 2B9662CA595EA7B8C02EC0983FB7EFE4 /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; - 2D2CDC2B3C9E5E38B425904019C0AB98 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - 2E8B394B35BA2E26C13D22FCB8E16DB9 /* NSURLRequest+HTTPBodyTesting.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLRequest+HTTPBodyTesting.m"; path = "OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.m"; sourceTree = ""; }; - 2F61D5DA66B063EB7612679691E71D8E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 2FA84894A0ED4B49C202F674179FD3F1 /* CachedTileOverlay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CachedTileOverlay.swift; path = MapCache/Classes/CachedTileOverlay.swift; sourceTree = ""; }; + 247A52FE97D9C04AAE2DE1C4ACC8361C /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; + 25ABC64B3B98170AD62759D33060014C /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Quick.modulemap; sourceTree = ""; }; + 25F01294024D5006C41718E4AFACAA8B /* MapCache-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "MapCache-Info.plist"; sourceTree = ""; }; + 27AB8FE0304FBDFFD6D650AC7B1BD3D0 /* FileManager+DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "FileManager+DiskCache.swift"; sourceTree = ""; }; + 2818F4C04EC2DCFEEDF78E5DDA0879D1 /* LongitudeError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = LongitudeError.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums/LongitudeError.html; sourceTree = ""; }; + 291406F8369E06DF58E8B903CD27E758 /* ZoomRange.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomRange.html; path = docs/Structs/ZoomRange.html; sourceTree = ""; }; + 2A2E7128501404B2BE17F4350E41CE6B /* ZoomableTile.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomableTile.html; path = docs/Structs/ZoomableTile.html; sourceTree = ""; }; + 2DB53F6709C3EED9FFE831DEDBB360A8 /* BeLessThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThan.swift; path = Sources/Nimble/Matchers/BeLessThan.swift; sourceTree = ""; }; + 2DBDB0F1031B401AE43BD18107B31B78 /* QuickConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickConfiguration.swift; path = Sources/Quick/Configuration/QuickConfiguration.swift; sourceTree = ""; }; + 2FF360866795F1F2EEFBF63C4B97176D /* search.json */ = {isa = PBXFileReference; includeInIndex = 1; name = search.json; path = docs/search.json; sourceTree = ""; }; + 313AD1CE7DBF24FA8FD0B3F3D10C16D1 /* BeNil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeNil.swift; path = Sources/Nimble/Matchers/BeNil.swift; sourceTree = ""; }; 3182E113ABA06EABCE9B4BEB1345052F /* Pods-MapCache_Tests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MapCache_Tests-Info.plist"; sourceTree = ""; }; - 34663960400566EF930386958B02783C /* ErrorUtility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ErrorUtility.swift; path = Sources/Quick/ErrorUtility.swift; sourceTree = ""; }; - 3766413BF40711BC7A1AA11E7A322CC5 /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; - 391E75F827CE440BF45D68C45D06B1FF /* RegionDownloader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RegionDownloader.swift; path = MapCache/Classes/RegionDownloader.swift; sourceTree = ""; }; - 395EE898C52B91BE11E3466E6F9AEAEE /* HaveCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HaveCount.swift; path = Sources/Nimble/Matchers/HaveCount.swift; sourceTree = ""; }; - 39B6549173364643994D9DFF8C638779 /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; - 3A04E42E0B79CBCE659E1D3BB39EC854 /* ContainElementSatisfying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ContainElementSatisfying.swift; path = Sources/Nimble/Matchers/ContainElementSatisfying.swift; sourceTree = ""; }; - 3A90724E0D506F14E76BC8939CD5A2DB /* HooksPhase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HooksPhase.swift; path = Sources/Quick/Hooks/HooksPhase.swift; sourceTree = ""; }; - 414EFDEA84A81A79F1B1B381C14D612D /* Pods_MapCache_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MapCache_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 41B6AE4618F2A2292FDA4C30660FD484 /* AdapterProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AdapterProtocols.swift; path = Sources/Nimble/Adapters/AdapterProtocols.swift; sourceTree = ""; }; - 41B76475CF79311864EE2C9AC3C5FECF /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; - 4375272808E92B06D8C5B507D02344EE /* CwlCatchException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchException.h; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h; sourceTree = ""; }; - 46962C940649D631BD5FB3D78AF65580 /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; - 47A7484A26D426C2F034B0B7A7BD4FC0 /* NMBExceptionCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBExceptionCapture.h; path = Sources/NimbleObjectiveC/NMBExceptionCapture.h; sourceTree = ""; }; - 48A1662B8E8DC7361A127F08C70BC0FA /* OHHTTPStubs.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = OHHTTPStubs.xcconfig; sourceTree = ""; }; - 4BE5FAA16B3F3E5E74852A98EBF9B301 /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; - 4C2E3A9467C89EE9FFCB3BA6538A2A26 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = Sources/Quick/Filter.swift; sourceTree = ""; }; - 4E5BC0414051578510095428898D77E1 /* MapCache-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "MapCache-Info.plist"; sourceTree = ""; }; - 507FDDF7452EDA32B25AD50023A485E1 /* Nimble.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Nimble.h; path = Sources/Nimble/Nimble.h; sourceTree = ""; }; + 359A341E9A91396315FBC06D5E34A503 /* OHPathHelpers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHPathHelpers.h; path = OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h; sourceTree = ""; }; + 35E5C292BBE3983BA541F6F502FAFA9B /* QuickSpec.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpec.m; path = Sources/QuickObjectiveC/QuickSpec.m; sourceTree = ""; }; + 360E84A46E42BCFB18831D7F3613B8D3 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; + 375738AFF6A1C050FC2B6FEF5BF56DC4 /* PostNotification.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PostNotification.swift; path = Sources/Nimble/Matchers/PostNotification.swift; sourceTree = ""; }; + 379A18659913E7C5C99ABAB30E115F2C /* QuickSpecBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpecBase.h; path = Sources/QuickObjCRuntime/include/QuickSpecBase.h; sourceTree = ""; }; + 3A1DB25947ADCD36350BC93C166D10C8 /* Typealiases.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Typealiases.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Typealiases.html; sourceTree = ""; }; + 3AF49077C99907596F0E49B7EC4A0F93 /* TileCoordsRegion.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileCoordsRegion.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/TileCoordsRegion.html; sourceTree = ""; }; + 3B440EDB5146513ACA316CBAAAE8A3C0 /* FileManager.html */ = {isa = PBXFileReference; includeInIndex = 1; name = FileManager.html; path = docs/Extensions/FileManager.html; sourceTree = ""; }; + 3B512D03B99EDFE8179BD7E9CB392332 /* BeVoid.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeVoid.swift; path = Sources/Nimble/Matchers/BeVoid.swift; sourceTree = ""; }; + 3D08DDB48DF4D1E8FA2482934B30F7CF /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; + 3D59637D26DD58060CD295D3AA88097F /* AdapterProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AdapterProtocols.swift; path = Sources/Nimble/Adapters/AdapterProtocols.swift; sourceTree = ""; }; + 3F001325EA32FBDCD7E2554E90313D16 /* DispatchTimeInterval.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DispatchTimeInterval.swift; path = Sources/Nimble/Utils/DispatchTimeInterval.swift; sourceTree = ""; }; + 3F4C65E946EA1106BA03C22C9F87A630 /* ZoomableTile.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomableTile.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/ZoomableTile.html; sourceTree = ""; }; + 3FF9ABF95BC12EEE0B587FD147C86927 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + 414EFDEA84A81A79F1B1B381C14D612D /* Pods_MapCache_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MapCache_Example.framework; path = "Pods-MapCache_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4254C540A7400F0424C8BC1D5F2C46B0 /* BeginWithPrefix.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWithPrefix.swift; path = Sources/Nimble/Matchers/BeginWithPrefix.swift; sourceTree = ""; }; + 425BEE2EDD27199B11A20699A5C31DAF /* Log.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Log.html; path = docs/Structs/Log.html; sourceTree = ""; }; + 4293857848F9EB31813D13DFC509E912 /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; + 4342C4A0BC822258BC60B2335152EB0D /* TileRange.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileRange.html; path = docs/Structs/TileRange.html; sourceTree = ""; }; + 43E1BD604EDE016A92A3F6588ECD0FE1 /* spinner.gif */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.gif; name = spinner.gif; path = docs/img/spinner.gif; sourceTree = ""; }; + 46672F603F982F341F9E9196046B65C4 /* TileCoordsRegion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileCoordsRegion.swift; path = MapCache/Classes/TileCoordsRegion.swift; sourceTree = ""; }; + 46D3A6336CE50F683598715BFBDA1811 /* ZoomRangeIterator.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomRangeIterator.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/ZoomRangeIterator.html; sourceTree = ""; }; + 46EFA0F3E9CF595AAF8A052346160254 /* TileRangeIterator.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileRangeIterator.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/TileRangeIterator.html; sourceTree = ""; }; + 46F98D9192BFEB469DF1634C78D85E0D /* RegionDownloader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RegionDownloader.swift; path = MapCache/Classes/RegionDownloader.swift; sourceTree = ""; }; + 471F644BE66950C94FDB8611D0B2BECF /* BytesSequence.html */ = {isa = PBXFileReference; includeInIndex = 1; name = BytesSequence.html; path = docs/Structs/BytesSequence.html; sourceTree = ""; }; + 4B3FB2D85D9D01F78D44D114C4B1377F /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; + 4F8EBA2948E86735B919AD56668EDAA6 /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; + 50DF72DB6249B4F56DFC3C3D0F3056D2 /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; 519F19D843259B908DDEACD20037BF62 /* Pods-MapCache_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MapCache_Example-dummy.m"; sourceTree = ""; }; - 51B77DE700D095FB89CD68F9E54EDC70 /* NMBExceptionCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBExceptionCapture.m; path = Sources/NimbleObjectiveC/NMBExceptionCapture.m; sourceTree = ""; }; - 51D8355401EBFC7E98C10A3C9F7B268A /* BeCloseTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeCloseTo.swift; path = Sources/Nimble/Matchers/BeCloseTo.swift; sourceTree = ""; }; - 52C6AC8EC49C0EBD55696528F4EBFBF6 /* Functional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Functional.swift; path = Sources/Nimble/Utils/Functional.swift; sourceTree = ""; }; - 53199BC2B238A45F0049A1015F8A550A /* MatchError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatchError.swift; path = Sources/Nimble/Matchers/MatchError.swift; sourceTree = ""; }; - 5350C92CF49E06B7B814DE5B37093ECB /* RegionDownloaderDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RegionDownloaderDelegate.swift; path = MapCache/Classes/RegionDownloaderDelegate.swift; sourceTree = ""; }; - 54A3BFFC02ED1452E04ECE01D5788221 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; - 54BD76F593BB743EF028F3CC3883C3FB /* BeLogical.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLogical.swift; path = Sources/Nimble/Matchers/BeLogical.swift; sourceTree = ""; }; - 54C99B88350DC9DE9643120E6A2079CE /* QuickConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickConfiguration.m; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.m; sourceTree = ""; }; - 56D8B351CD4ECC7BA22ECDDFCCA87FC9 /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; - 58C679E71A657586E07385AA3C2AF776 /* CwlMachBadInstructionHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlMachBadInstructionHandler.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h; sourceTree = ""; }; - 5A3F3244B4D14F0F6B6CF66A073953CE /* ToSucceed.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToSucceed.swift; path = Sources/Nimble/Matchers/ToSucceed.swift; sourceTree = ""; }; - 5B66B3F014D7F8670742F8D470B24C7A /* NMBObjCMatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBObjCMatcher.swift; path = Sources/Nimble/Adapters/NMBObjCMatcher.swift; sourceTree = ""; }; - 5C8C1D628275ABF472571DA614C1E071 /* NSURLRequest+HTTPBodyTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLRequest+HTTPBodyTesting.h"; path = "OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.h"; sourceTree = ""; }; - 5D2327A427B2BD8F721B522AEB74E972 /* World+DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "World+DSL.swift"; path = "Sources/Quick/DSL/World+DSL.swift"; sourceTree = ""; }; - 5E58721E81408E6B0DFF0D7540AB7713 /* URL+DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "URL+DiskCache.swift"; sourceTree = ""; }; - 5EFB24964BA4EB933CC5E8F82C1FE61A /* Nimble.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Nimble.xcconfig; sourceTree = ""; }; - 5F07844CF025D839A93AD0927ABFBD7C /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; - 5F1278DE6131B5156740A3ACC90CF8DD /* PostNotification.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PostNotification.swift; path = Sources/Nimble/Matchers/PostNotification.swift; sourceTree = ""; }; - 62B693BD2EFC82DE2F0BC929DAABC288 /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Quick/DSL/DSL.swift; sourceTree = ""; }; - 648712EF908CF6AF67480B59D3A8D00C /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = Sources/Quick/Configuration/Configuration.swift; sourceTree = ""; }; - 6503EF0C0284B7AA6A4E8F1BE88399A4 /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; - 652FE8CFA26C49E0D14E90A1DEAB3CF1 /* DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DiskCache.swift; sourceTree = ""; }; - 653EDC6189A83B318FCCBE6C8F890B19 /* OHHTTPStubsMethodSwizzling.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubsMethodSwizzling.m; path = OHHTTPStubs/Sources/NSURLSession/OHHTTPStubsMethodSwizzling.m; sourceTree = ""; }; - 657057D20738B4215112B2CD52F26045 /* NimbleXCTestHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleXCTestHandler.swift; path = Sources/Nimble/Adapters/NimbleXCTestHandler.swift; sourceTree = ""; }; - 693B3FD22026DAE1C1DC1A2054701A45 /* FileManager+DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "FileManager+DiskCache.swift"; sourceTree = ""; }; - 69D64FE31821C028D03F21EE032A6FF9 /* Equal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Equal.swift; path = Sources/Nimble/Matchers/Equal.swift; sourceTree = ""; }; - 6A7CC84F51C79C8AD3C0F6C507E7C82B /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Quick.modulemap; sourceTree = ""; }; + 542B09F79CA383781F1EFCF4E57EB3E2 /* RegionDownloader.html */ = {isa = PBXFileReference; includeInIndex = 1; name = RegionDownloader.html; path = docs/Classes/RegionDownloader.html; sourceTree = ""; }; + 54D768FC7886C8E82A08DA6149D1EEAD /* FileManager.html */ = {isa = PBXFileReference; includeInIndex = 1; name = FileManager.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/FileManager.html; sourceTree = ""; }; + 551CB3DF50B51A44C5FDFAC107DA80B3 /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Nimble.modulemap; sourceTree = ""; }; + 55AF7391D64643383F74C7A205868F8E /* Example.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Example.swift; path = Sources/Quick/Example.swift; sourceTree = ""; }; + 55E17646EAFC968EB23362F3B98D459A /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 5642B8397B364978E466DB01569B5890 /* Structs.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Structs.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs.html; sourceTree = ""; }; + 56C651CE9650C090EA2965D3646DAA4B /* DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DSL.m; path = Sources/NimbleObjectiveC/DSL.m; sourceTree = ""; }; + 5DCF98E97A53ADCB9F820637E64E3B30 /* Nimble-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-umbrella.h"; sourceTree = ""; }; + 5DFBD3406765B998B480B8F8F07F3CD2 /* LoadTileMode.html */ = {isa = PBXFileReference; includeInIndex = 1; name = LoadTileMode.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums/LoadTileMode.html; sourceTree = ""; }; + 5E56B21C8A1F843E190BFB1BCFFA480A /* HooksPhase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HooksPhase.swift; path = Sources/Quick/Hooks/HooksPhase.swift; sourceTree = ""; }; + 5F0E55EF9B47362995A14527175870D7 /* ZoomRangeIterator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZoomRangeIterator.swift; path = MapCache/Classes/ZoomRangeIterator.swift; sourceTree = ""; }; + 60C1147BD9E40C3FF35D16882C7CE015 /* jquery.min.js */ = {isa = PBXFileReference; includeInIndex = 1; name = jquery.min.js; path = docs/js/jquery.min.js; sourceTree = ""; }; + 612F544562D2709285747F57CA0F0064 /* MD5.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MD5.swift; sourceTree = ""; }; + 61DC57F199AB3EA15A20853E219A97DB /* Enums.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Enums.html; path = docs/Enums.html; sourceTree = ""; }; + 62396F73090CA6793106A27778F57B3A /* LatitudeError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = LatitudeError.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums/LatitudeError.html; sourceTree = ""; }; + 63D9392730024C9C1DD6872692D1C590 /* Compatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Compatibility.h; path = OHHTTPStubs/Sources/Compatibility.h; sourceTree = ""; }; + 64FF983284EB51DA2419C48B63C53461 /* MapCache.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MapCache.xcconfig; sourceTree = ""; }; + 654230CDD658658331C4CA7AAD297477 /* BeAKindOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAKindOf.swift; path = Sources/Nimble/Matchers/BeAKindOf.swift; sourceTree = ""; }; + 65F56D2ECF6723E977CC85B463E4BC15 /* OHHTTPStubs-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "OHHTTPStubs-Info.plist"; sourceTree = ""; }; + 671AC82E7E722B6916C84C0332122DD8 /* NMBStringify.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBStringify.m; path = Sources/NimbleObjectiveC/NMBStringify.m; sourceTree = ""; }; + 676FBE1A9835D018A658E201831FEE64 /* QuickConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickConfiguration.m; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.m; sourceTree = ""; }; + 68A691C150A9BF45401F8A48E8D18137 /* CachedTileOverlay.html */ = {isa = PBXFileReference; includeInIndex = 1; name = CachedTileOverlay.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/CachedTileOverlay.html; sourceTree = ""; }; + 6A416EC7D92C7F5C06D1F1A731E1AD3B /* typeahead.jquery.js */ = {isa = PBXFileReference; includeInIndex = 1; name = typeahead.jquery.js; path = docs/js/typeahead.jquery.js; sourceTree = ""; }; + 6B584EAD56D24B2900714A7BC9313910 /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; + 6BA066129BD01BA43AE93D3A82FB0AD6 /* URL.html */ = {isa = PBXFileReference; includeInIndex = 1; name = URL.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/URL.html; sourceTree = ""; }; + 6C31C9D9EB5A62CDCCFC61A45BB2CF91 /* Extensions.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Extensions.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions.html; sourceTree = ""; }; + 6CC80904A3C0E5DA0A4C9C4C85802515 /* MKTileOverlayPath.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MKTileOverlayPath.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/MKTileOverlayPath.html; sourceTree = ""; }; + 6D08E2B2471AD910F5B2456FDBDA48B1 /* MapCache.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = MapCache.modulemap; sourceTree = ""; }; + 6D1A5F5B2B354F14C08E4F67BD265127 /* String.html */ = {isa = PBXFileReference; includeInIndex = 1; name = String.html; path = docs/Extensions/String.html; sourceTree = ""; }; + 6DC7E9B95A98BEC3F10B58FC3D8DEDD9 /* ZoomRange.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomRange.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/ZoomRange.html; sourceTree = ""; }; + 6DDE878A048D00EA16C9CA3717D1AD0E /* MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MapCache.swift; path = MapCache/Classes/MapCache.swift; sourceTree = ""; }; + 6E184A869A365D0FE2C92AB87C3DBB90 /* CachedTileOverlay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CachedTileOverlay.swift; path = MapCache/Classes/CachedTileOverlay.swift; sourceTree = ""; }; 6E1913DEDAC5D9F029914D34535DA2F4 /* Pods-MapCache_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MapCache_Tests-acknowledgements.markdown"; sourceTree = ""; }; - 6E74FD125DB45D6D2AF372FC7DDE90C1 /* MatcherProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherProtocols.swift; path = Sources/Nimble/Matchers/MatcherProtocols.swift; sourceTree = ""; }; - 6EC245C843DB0600AFC6378E16A4A96F /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; - 6F43E68EAAE9C9543D3B81CDA03083A9 /* OHPathHelpers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHPathHelpers.h; path = OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h; sourceTree = ""; }; - 7006B9DE95C20575C8104D556FD82F64 /* AssertionDispatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionDispatcher.swift; path = Sources/Nimble/Adapters/AssertionDispatcher.swift; sourceTree = ""; }; - 71A99273767469EF6AF2FB44F8F4D5C7 /* ThrowError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowError.swift; path = Sources/Nimble/Matchers/ThrowError.swift; sourceTree = ""; }; - 71EE69460C450C6E74C2FA36BB3DBCB9 /* MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MapCache.swift; path = MapCache/Classes/MapCache.swift; sourceTree = ""; }; - 72D12EEA6BDAC4FD3863B037310814D8 /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; - 735D06736FD9C79A4F9232CA1417D1C7 /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; - 7417F9F7D2958F28B87B8B6C2DB5367D /* MapCache.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MapCache.xcconfig; sourceTree = ""; }; - 75B8EC736F60632EAEC416C67C5E5389 /* BeNil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeNil.swift; path = Sources/Nimble/Matchers/BeNil.swift; sourceTree = ""; }; + 6ED0FE9236F1CAE618F72A1D0DCC892B /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = Sources/Quick/Configuration/Configuration.swift; sourceTree = ""; }; + 6F69B508EFDA4BE5C8E095C8F499FC34 /* Functions.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Functions.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Functions.html; sourceTree = ""; }; + 71C88BAAA8CE8D030AAA3AB2DDB5935C /* String+DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "String+DiskCache.swift"; sourceTree = ""; }; + 72BED7B0EAD6246912CA4D5BBA94E346 /* Protocols.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Protocols.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Protocols.html; sourceTree = ""; }; + 730269C4B278DF751B426E8D7695833C /* MatchError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatchError.swift; path = Sources/Nimble/Matchers/MatchError.swift; sourceTree = ""; }; + 7398FEEC1BD462709E631A3212AEB294 /* Quick.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Quick.xcconfig; sourceTree = ""; }; + 73B5C96F73A150F05BA5269117D30F07 /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubsResponse+JSON.m"; path = "OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m"; sourceTree = ""; }; + 74E684295FC726DEA754DB314A0D6B1A /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; 75BC5DCDAA9DA816051EC50473CE8C17 /* Pods-MapCache_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MapCache_Tests.release.xcconfig"; sourceTree = ""; }; - 7679EEB9D42F00FAB0D7BFF878BE973F /* MD5.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MD5.swift; sourceTree = ""; }; + 7639BB14FBBD03FD53C9C874E663C5FF /* MapCache-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MapCache-prefix.pch"; sourceTree = ""; }; + 76B0A3728AAC24AC7F162D6195A77FB4 /* MKZoomScale.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MKZoomScale.html; path = docs/Extensions/MKZoomScale.html; sourceTree = ""; }; + 778A19D566C9FDCE75F613ECFFC8F65B /* QuickSpec.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpec.h; path = Sources/QuickObjectiveC/QuickSpec.h; sourceTree = ""; }; + 78ED18ECB4CE94F11CBADEC017103BE7 /* AllPass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllPass.swift; path = Sources/Nimble/Matchers/AllPass.swift; sourceTree = ""; }; + 791DE21DA91D6F29F6687ECD62EA6FB9 /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; + 795B462193EBE8925080B296C53B5EC5 /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Sources/Nimble/Utils/Errors.swift; sourceTree = ""; }; 79662D907EF598C7C3018B9CFDC45312 /* Pods-MapCache_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MapCache_Example-acknowledgements.plist"; sourceTree = ""; }; - 7B87F6DE6F4C2B34E5C045885C248366 /* OHHTTPStubs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubs.m; path = OHHTTPStubs/Sources/OHHTTPStubs.m; sourceTree = ""; }; - 8206E705C0B3119435E144BC9D2DAB5D /* DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DSL.m; path = Sources/NimbleObjectiveC/DSL.m; sourceTree = ""; }; - 824F6F91CF7BF57BA6B38A2249570631 /* AllPass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllPass.swift; path = Sources/Nimble/Matchers/AllPass.swift; sourceTree = ""; }; - 82A31B1C61BE8BE362841B618BDA39E2 /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; - 8692EA1A6C52FBBD0E2B4F28CDAE188E /* OHHTTPStubsResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubsResponse.m; path = OHHTTPStubs/Sources/OHHTTPStubsResponse.m; sourceTree = ""; }; - 880966A95B74A3A1BCC56C7C9DC18611 /* TileRangeIterator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileRangeIterator.swift; path = MapCache/Classes/TileRangeIterator.swift; sourceTree = ""; }; + 7A9E7A288343A8DFA3F71AC3012B3F39 /* NSURLRequest+HTTPBodyTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLRequest+HTTPBodyTesting.h"; path = "OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.h"; sourceTree = ""; }; + 7AC474C0B407EBE83265324D5653CB6F /* MapCacheProtocol.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCacheProtocol.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Protocols/MapCacheProtocol.html; sourceTree = ""; }; + 7B59BB8FE6AAEC642B72D78830BB2D31 /* TileRange.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileRange.swift; path = MapCache/Classes/TileRange.swift; sourceTree = ""; }; + 7BBBD933A1394BA217CEED50207FCE05 /* String+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+C99ExtendedIdentifier.swift"; path = "Sources/Quick/String+C99ExtendedIdentifier.swift"; sourceTree = ""; }; + 7C0B0FF8D7E18968C31E823BA4225FCF /* NMBExceptionCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBExceptionCapture.h; path = Sources/NimbleObjectiveC/NMBExceptionCapture.h; sourceTree = ""; }; + 7CF8F464FDDD2BB156123DB78F57182D /* Match.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Match.swift; path = Sources/Nimble/Matchers/Match.swift; sourceTree = ""; }; + 7E23C5027F49CCB1115A5709A9AD4B38 /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "OHHTTPStubsResponse+JSON.h"; path = "OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h"; sourceTree = ""; }; + 80024FBF49DBE02CE6F1C859D70F2214 /* docSet.dsidx */ = {isa = PBXFileReference; includeInIndex = 1; name = docSet.dsidx; path = docs/docsets/MapCache.docset/Contents/Resources/docSet.dsidx; sourceTree = ""; }; + 802E9A2EB7F3F6B65F8E932837CDC989 /* TileCoords.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileCoords.html; path = docs/Classes/TileCoords.html; sourceTree = ""; }; + 80B0213FE033CAF6DBD0C280D66CE48F /* Await.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Await.swift; path = Sources/Nimble/Utils/Await.swift; sourceTree = ""; }; + 8181122B9C3B3742977B54445B93D26A /* Log.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Log.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/Log.html; sourceTree = ""; }; + 818B430A00D451996F2C9725D03B73CE /* Nimble.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Nimble.h; path = Sources/Nimble/Nimble.h; sourceTree = ""; }; + 82294359767EE9AD2352AEE40D68B55A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 827A26E23D634BD77435399F4FC4F09F /* lunr.min.js */ = {isa = PBXFileReference; includeInIndex = 1; name = lunr.min.js; path = docs/js/lunr.min.js; sourceTree = ""; }; + 840234133F19EC22A5F421C16E65F96C /* ZoomRange.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZoomRange.swift; path = MapCache/Classes/ZoomRange.swift; sourceTree = ""; }; + 84638E179DF00985521B63EEB0012B37 /* MKMapView.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MKMapView.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/MKMapView.html; sourceTree = ""; }; + 86BB725AD13DBE78EC993A939F13D2A8 /* AssertionRecorder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionRecorder.swift; path = Sources/Nimble/Adapters/AssertionRecorder.swift; sourceTree = ""; }; + 86EE3DA33C79D566526AF252F22B6E92 /* BeAnInstanceOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAnInstanceOf.swift; path = Sources/Nimble/Matchers/BeAnInstanceOf.swift; sourceTree = ""; }; + 877F6084753C9B0AD662FFAB2671A0FC /* ExampleHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleHooks.swift; path = Sources/Quick/Hooks/ExampleHooks.swift; sourceTree = ""; }; 8828460C0663892385C2368BC6BD3085 /* Pods-MapCache_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MapCache_Tests-frameworks.sh"; sourceTree = ""; }; - 895A9F4A2520089C00D083C7 /* CachedTileOverlayRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CachedTileOverlayRenderer.swift; path = MapCache/Classes/CachedTileOverlayRenderer.swift; sourceTree = ""; }; - 895A9F4C2520192900D083C7 /* MKZoomScale+MapCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "MKZoomScale+MapCache.swift"; path = "MapCache/Classes/MKZoomScale+MapCache.swift"; sourceTree = ""; }; - 895A9F502520BB8C00D083C7 /* ZoomableTile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ZoomableTile.swift; path = MapCache/Classes/ZoomableTile.swift; sourceTree = ""; }; - 8C1092AB770999A27768BADA699E54E4 /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; - 8C29CAD75DA4C75D8CC7A2573578C7DA /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; - 8FB30407B2F0B8A654B76336D235B108 /* Log.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Log.swift; path = MapCache/Classes/Log.swift; sourceTree = ""; }; - 9068DEBB0DB97EDDDF064E8B38FF760C /* OHHTTPStubs-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubs-prefix.pch"; sourceTree = ""; }; - 90D6C8439AFD1DF0C31C19BD170579D4 /* AssertionRecorder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionRecorder.swift; path = Sources/Nimble/Adapters/AssertionRecorder.swift; sourceTree = ""; }; - 911B06044A3BF3D67D9028BBD2BAAE76 /* Example.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Example.swift; path = Sources/Quick/Example.swift; sourceTree = ""; }; - 91C0F36CD0A75417BCF69ED4A90E61D4 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; - 922FB358BAEB5DCF70AA829172AB78A3 /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; - 9558C3392958FEF6451C867A954D3624 /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; - 96C1C546EB3876A4EC84313410FE23FC /* String+DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "String+DiskCache.swift"; sourceTree = ""; }; - 99DD65142038A8494A13FC6CB5363AE8 /* mach_excServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mach_excServer.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h; sourceTree = ""; }; - 9AE46063D85FB14613BE20CD608AB7D6 /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; - 9CD8958658AE5D54E60F4656CA957AA9 /* MKMapView+MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "MKMapView+MapCache.swift"; path = "MapCache/Classes/MKMapView+MapCache.swift"; sourceTree = ""; }; - 9D53F7368DD619907C312123D341E0CE /* BeAKindOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAKindOf.swift; path = Sources/Nimble/Matchers/BeAKindOf.swift; sourceTree = ""; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 9DEC34BA82C26E63F2F1261DDE47101A /* Match.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Match.swift; path = Sources/Nimble/Matchers/Match.swift; sourceTree = ""; }; - 9E2E118681343EE34FFAAAB010092898 /* TileCoordsRegion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileCoordsRegion.swift; path = MapCache/Classes/TileCoordsRegion.swift; sourceTree = ""; }; - 9ED64A605FB721F40DA193A7D501D7CE /* ExampleMetadata.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleMetadata.swift; path = Sources/Quick/ExampleMetadata.swift; sourceTree = ""; }; - 9F4F3C8DA66BF27F83E03EF36C668356 /* BeIdenticalTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeIdenticalTo.swift; path = Sources/Nimble/Matchers/BeIdenticalTo.swift; sourceTree = ""; }; - A1A7B07025EC9B0167C9A4CE201FAFCD /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; - A27FA715B02735A7598DA75D285AC6D3 /* LoadTileMode.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LoadTileMode.swift; path = MapCache/Classes/LoadTileMode.swift; sourceTree = ""; }; + 89001E0BAF80B8B9E75AB1627596D905 /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; + 8985456D5A9FAD4E2F673A0939A82581 /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; + 8C522762B935C227D5001482883F11CF /* Quick-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Quick-Info.plist"; sourceTree = ""; }; + 8CC8A7BE1F047F0BE4495AE3AD4A3104 /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; + 8E8780A40B650D259D801A1E6C9204E1 /* LoadTileMode.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LoadTileMode.swift; path = MapCache/Classes/LoadTileMode.swift; sourceTree = ""; }; + 9086148617A951E0097698D69B1DE6F4 /* DiskCache.html */ = {isa = PBXFileReference; includeInIndex = 1; name = DiskCache.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/DiskCache.html; sourceTree = ""; }; + 90E074C5D8E5F4E01C9B1E35A2B516AF /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; + 90F9BBCB3C84830D987B0A541ABF26D8 /* Log.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Log.swift; path = MapCache/Classes/Log.swift; sourceTree = ""; }; + 929FDF3B9F330913C29B04BB8A3CF6E5 /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; + 932406D4E1DF3C6114B740469A2ECBF1 /* OHHTTPStubsResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubsResponse.h; path = OHHTTPStubs/Sources/OHHTTPStubsResponse.h; sourceTree = ""; }; + 93A94AA2CB20D8E22666749B429C99AE /* carat.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = carat.png; path = docs/img/carat.png; sourceTree = ""; }; + 943727202087480F65144722451B7DA0 /* dash.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = dash.png; path = docs/img/dash.png; sourceTree = ""; }; + 949967040481E4AF7B93441B2C253C1F /* allocatedDiskSizeForDirectory(at:).html */ = {isa = PBXFileReference; includeInIndex = 1; name = "allocatedDiskSizeForDirectory(at:).html"; path = "docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/FileManager/allocatedDiskSizeForDirectory(at:).html"; sourceTree = ""; }; + 950778978D0B992BB31A89C3E738A3B3 /* TileError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileError.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums/TileError.html; sourceTree = ""; }; + 9510043B0F4D525B257AE3F726EE74B1 /* Classes.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Classes.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes.html; sourceTree = ""; }; + 951BEED39E1DF158C737D0791C786909 /* ContainElementSatisfying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ContainElementSatisfying.swift; path = Sources/Nimble/Matchers/ContainElementSatisfying.swift; sourceTree = ""; }; + 9559C0B7C71C0FC900D082A0C7F393ED /* TileRangeError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileRangeError.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums/TileRangeError.html; sourceTree = ""; }; + 991B74211A9204244463F0891054A96B /* AssertionDispatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionDispatcher.swift; path = Sources/Nimble/Adapters/AssertionDispatcher.swift; sourceTree = ""; }; + 9A08B35D4E12C94ECFF930DF608798BA /* Extensions.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Extensions.html; path = docs/Extensions.html; sourceTree = ""; }; + 9B8CFD431B8C5DC8F10C2A7D436FB04B /* highlight.css */ = {isa = PBXFileReference; includeInIndex = 1; name = highlight.css; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/css/highlight.css; sourceTree = ""; }; + 9BD7B880C864713ED203EBB9D96FBDBB /* RegionDownloaderDelegate.html */ = {isa = PBXFileReference; includeInIndex = 1; name = RegionDownloaderDelegate.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Protocols/RegionDownloaderDelegate.html; sourceTree = ""; }; + 9D078D3F1D714D55E420BFC39BA5F59D /* MapCache-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MapCache-umbrella.h"; sourceTree = ""; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9F4F2B1F048A2EFB87FD5F8440068EDC /* ElementsEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementsEqual.swift; path = Sources/Nimble/Matchers/ElementsEqual.swift; sourceTree = ""; }; + 9F586987961FF1F9780633FC3DE4C7FE /* SatisfyAllOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAllOf.swift; path = Sources/Nimble/Matchers/SatisfyAllOf.swift; sourceTree = ""; }; + 9FC566102DFDBA768FA7C6121AD3BA4B /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; + 9FFD2C83749EBDD374EADECC5968473F /* fileSizeForDirectory(at:).html */ = {isa = PBXFileReference; includeInIndex = 1; name = "fileSizeForDirectory(at:).html"; path = "docs/Extensions/FileManager/fileSizeForDirectory(at:).html"; sourceTree = ""; }; + A19BD5D9046748796D75D5766CE0DBE7 /* MapCache-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MapCache-dummy.m"; sourceTree = ""; }; + A2AE985901449644D09E9F2658ED8CE8 /* OHHTTPStubs-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs-dummy.m"; sourceTree = ""; }; + A2FFD2266B3E62EC8ADD4B79269845FB /* LoadTileMode.html */ = {isa = PBXFileReference; includeInIndex = 1; name = LoadTileMode.html; path = docs/Enums/LoadTileMode.html; sourceTree = ""; }; + A3DCF688262C3E78B6232C6291A1A2B4 /* CachedTileOverlay.html */ = {isa = PBXFileReference; includeInIndex = 1; name = CachedTileOverlay.html; path = docs/Classes/CachedTileOverlay.html; sourceTree = ""; }; + A423C1F49445714ECAF5E43ABF9D02DA /* OHHTTPStubs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubs.m; path = OHHTTPStubs/Sources/OHHTTPStubs.m; sourceTree = ""; }; A45F40A639F932A5B509547374FB3FC6 /* Pods-MapCache_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MapCache_Tests.debug.xcconfig"; sourceTree = ""; }; - A4E94020B70B031BFFEB9590D86193F0 /* ElementsEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementsEqual.swift; path = Sources/Nimble/Matchers/ElementsEqual.swift; sourceTree = ""; }; - A6E6CA3C5BD20FB67E7D4323C1B8D599 /* TileRange.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileRange.swift; path = MapCache/Classes/TileRange.swift; sourceTree = ""; }; - A7E689B6B9DFFCF4F83BB830F7EAFE48 /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Nimble/DSL.swift; sourceTree = ""; }; - A7EA45263FAAD6504F20D16DC86697EB /* MapCache.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = MapCache.modulemap; sourceTree = ""; }; - AAC3E90C117C8066A9FFF25C7FC927B8 /* MKTileOverlayPath+MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "MKTileOverlayPath+MapCache.swift"; path = "MapCache/Classes/MKTileOverlayPath+MapCache.swift"; sourceTree = ""; }; - ACC40BBED2F4EF8D6FA3ADDA2598395A /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; - ACDB135FBF2FB01FE571816A595F97B7 /* TileCoords.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileCoords.swift; path = MapCache/Classes/TileCoords.swift; sourceTree = ""; }; - AF37B8CBB7C429C95B65E4D89A4773DE /* OHHTTPStubs-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "OHHTTPStubs-Info.plist"; sourceTree = ""; }; - B197AFED90D8344E24FBE7EA5DC6FEB8 /* BeVoid.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeVoid.swift; path = Sources/Nimble/Matchers/BeVoid.swift; sourceTree = ""; }; - B1FB7F3A8D89DC02BC80AC7F0508982C /* OHHTTPStubsSwift.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OHHTTPStubsSwift.swift; path = OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift; sourceTree = ""; }; - B36A214EBB134A6C72435DBD9C033F2E /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubs+NSURLSessionConfiguration.m"; path = "OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = ""; }; - B4D8E99D7468D22A7051E13B20BD6531 /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubsResponse+JSON.m"; path = "OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m"; sourceTree = ""; }; - B509716C457E029391E7C1C2857F8B2D /* ZoomRangeIterator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZoomRangeIterator.swift; path = MapCache/Classes/ZoomRangeIterator.swift; sourceTree = ""; }; - B6579D2619AC8D3D023B34BA4FC56B0B /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; - B7A6CA59A4AA8B8F52527BFF2F7EBD78 /* ExampleHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleHooks.swift; path = Sources/Quick/Hooks/ExampleHooks.swift; sourceTree = ""; }; - B8FECB6D64AD648E284AD355612B498B /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; - B98E887DF9C68D15B0940E1DBE494FEA /* SatisfyAllOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAllOf.swift; path = Sources/Nimble/Matchers/SatisfyAllOf.swift; sourceTree = ""; }; - BAE263041362D074978BB3B577DF0A05 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BF32412D641E634D93C1A0ACA8136770 /* OHHTTPStubsMethodSwizzling.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubsMethodSwizzling.h; path = OHHTTPStubs/Sources/NSURLSession/OHHTTPStubsMethodSwizzling.h; sourceTree = ""; }; + A53D33487DA081D790A9D9B55EA9CDCC /* DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DiskCache.swift; sourceTree = ""; }; + A56C8DD20F1C0F3FEF035DE99C2930FB /* MapCache.tgz */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCache.tgz; path = docs/docsets/MapCache.tgz; sourceTree = ""; }; + A60D802B0E490971A6017D10A9B57A97 /* ZoomError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomError.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Enums/ZoomError.html; sourceTree = ""; }; + A622DB0CD5C43C1E56EF07740D22EB9D /* gh.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = gh.png; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/img/gh.png; sourceTree = ""; }; + A6E63D7E5C4BA2B03E24C2F394A74577 /* ZoomableTile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZoomableTile.swift; path = MapCache/Classes/ZoomableTile.swift; sourceTree = ""; }; + A6F409F76C645289A90ED67E5E88B9BF /* ExpectationMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpectationMessage.swift; path = Sources/Nimble/ExpectationMessage.swift; sourceTree = ""; }; + A71A4EFF8D788853325D109F6B6A5425 /* NSMutableData.html */ = {isa = PBXFileReference; includeInIndex = 1; name = NSMutableData.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/NSMutableData.html; sourceTree = ""; }; + A7359DB9F871FA611AC9035E48B03E6F /* MapCache.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = MapCache.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + A7D84DDB54216A35901D009A4D549C3C /* TileCoordsRegion.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileCoordsRegion.html; path = docs/Classes/TileCoordsRegion.html; sourceTree = ""; }; + A8D114A257D36D77A39CD63977D96411 /* Protocols.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Protocols.html; path = docs/Protocols.html; sourceTree = ""; }; + A90443FE50E2E44D48F11BE8E291C241 /* gh.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = gh.png; path = docs/img/gh.png; sourceTree = ""; }; + A98F1C6EAEF1DB8C2B623EDC23CD0C8D /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "OHHTTPStubs+NSURLSessionConfiguration.m"; path = "OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = ""; }; + AA0F38C6F934E4D9ABC2F60510125F27 /* Structs.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Structs.html; path = docs/Structs.html; sourceTree = ""; }; + AA1364021B61B6779249DF84B4A95A1B /* ToSucceed.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToSucceed.swift; path = Sources/Nimble/Matchers/ToSucceed.swift; sourceTree = ""; }; + AAA6245A8B8300B340FC865AAF2B03D7 /* search.json */ = {isa = PBXFileReference; includeInIndex = 1; name = search.json; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/search.json; sourceTree = ""; }; + AB74C0F6516CA4AC25C108887F871194 /* RegionDownloader.html */ = {isa = PBXFileReference; includeInIndex = 1; name = RegionDownloader.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/RegionDownloader.html; sourceTree = ""; }; + ACB32869CFF8333ACDDF5267F1DC5364 /* typeahead.jquery.js */ = {isa = PBXFileReference; includeInIndex = 1; name = typeahead.jquery.js; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/js/typeahead.jquery.js; sourceTree = ""; }; + AD14C524AEBCF7962A0536758DA758C1 /* NSURLRequest+HTTPBodyTesting.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLRequest+HTTPBodyTesting.m"; path = "OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.m"; sourceTree = ""; }; + AD859E75AA91B117AE969508E895DC43 /* jazzy.css */ = {isa = PBXFileReference; includeInIndex = 1; name = jazzy.css; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/css/jazzy.css; sourceTree = ""; }; + AE0D051847099C46DA310BB729019E2E /* Level.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Level.html; path = docs/Structs/Log/Level.html; sourceTree = ""; }; + AE90AE8F652F4A8CD394342A49C903E2 /* MapCacheProtocol.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCacheProtocol.html; path = docs/Protocols/MapCacheProtocol.html; sourceTree = ""; }; + AEAB1F0948E0B4A948609CFD56D9F7E1 /* OHHTTPStubsResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHHTTPStubsResponse.m; path = OHHTTPStubs/Sources/OHHTTPStubsResponse.m; sourceTree = ""; }; + AF6418202FA6DBE85CE1EE634C892FEB /* allocatedDiskSizeForDirectory(at:).html */ = {isa = PBXFileReference; includeInIndex = 1; name = "allocatedDiskSizeForDirectory(at:).html"; path = "docs/Extensions/FileManager/allocatedDiskSizeForDirectory(at:).html"; sourceTree = ""; }; + B1399B06BC39890DD4180B27BA281C3A /* CachedTileOverlayZoomRenderer.html */ = {isa = PBXFileReference; includeInIndex = 1; name = CachedTileOverlayZoomRenderer.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/CachedTileOverlayZoomRenderer.html; sourceTree = ""; }; + B20B23644FDD2BFEC2DC6EB302A6FAA9 /* fileSizeForDirectory(at:).html */ = {isa = PBXFileReference; includeInIndex = 1; name = "fileSizeForDirectory(at:).html"; path = "docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/FileManager/fileSizeForDirectory(at:).html"; sourceTree = ""; }; + B2CA3A3E0E96246DDAC8AC0A65BCAD55 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; + B35450B70EB56065624E377B75EE8D35 /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Matchers/Async.swift; sourceTree = ""; }; + B3E72146CD71A463C95A7CB1704F4758 /* MapCacheConfig.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCacheConfig.html; path = docs/Structs/MapCacheConfig.html; sourceTree = ""; }; + B489442A3E49C0085F8151F6663C38D4 /* MapCache.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCache.html; path = docs/Classes/MapCache.html; sourceTree = ""; }; + B4F38021A56C8ACADBCEA370CBA3C7FC /* CwlMachBadInstructionHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlMachBadInstructionHandler.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h; sourceTree = ""; }; + B65FD0E87ADB1AB5145A516EC23B5D9B /* Level.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Level.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/Log/Level.html; sourceTree = ""; }; + B7B1F7360FAABF0E220F2ECFC7F3DE3A /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; + B8C9F5F4CC1E9AB92A2AA8EF6D550405 /* OHHTTPStubs.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = OHHTTPStubs.xcconfig; sourceTree = ""; }; + B90DFC6D37967452281E826929B828D3 /* HashBase.html */ = {isa = PBXFileReference; includeInIndex = 1; name = HashBase.html; path = docs/Classes/HashBase.html; sourceTree = ""; }; + B93AFEAF23F080EC2D79874D97B5FBDB /* RegionDownloaderDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RegionDownloaderDelegate.swift; path = MapCache/Classes/RegionDownloaderDelegate.swift; sourceTree = ""; }; + BA73F9ABFC32B574929D4A7F521B7F6E /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; }; + BAE263041362D074978BB3B577DF0A05 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Nimble.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFA702638A02D12A14AC0BBD0828D6FB /* Pods-MapCache_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MapCache_Example-acknowledgements.markdown"; sourceTree = ""; }; - C216496AEA73B6952A8F346E69886DD2 /* Expectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expectation.swift; path = Sources/Nimble/Expectation.swift; sourceTree = ""; }; - C295A07F23D938CD7464968410EFA016 /* BeLessThanOrEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThanOrEqual.swift; path = Sources/Nimble/Matchers/BeLessThanOrEqual.swift; sourceTree = ""; }; - C3B06E76B3637C5A622B3C2CD41B999B /* Await.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Await.swift; path = Sources/Nimble/Utils/Await.swift; sourceTree = ""; }; - C660C368275EEDA27F49D2B2D50CF9F7 /* ZoomRange.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZoomRange.swift; path = MapCache/Classes/ZoomRange.swift; sourceTree = ""; }; - C69B62A0A743EA6F9AB97C75F9A576E6 /* MapCacheConfig.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MapCacheConfig.swift; path = MapCache/Classes/MapCacheConfig.swift; sourceTree = ""; }; - C74B7479708267FB169BBF01B8920C90 /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestObservationCenter+Register.m"; path = "Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m"; sourceTree = ""; }; - C7FFF8319F9E316AB7A9295D5AE2BC1E /* Quick-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Quick-Info.plist"; sourceTree = ""; }; - CB58FBA2EFDB29215B5DC1C5DF5B82F2 /* XCTestSuite+QuickTestSuiteBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestSuite+QuickTestSuiteBuilder.m"; path = "Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m"; sourceTree = ""; }; - D0A957877D1F903A5830268A2C05B2C0 /* CwlMachBadInstructionHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlMachBadInstructionHandler.m; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m; sourceTree = ""; }; - D13A30260CB105567BFA5CA03B5F63F5 /* QuickSpec.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpec.h; path = Sources/QuickObjectiveC/QuickSpec.h; sourceTree = ""; }; - D2F201F8ABF0AEAC28E4DCB47E8AF6A4 /* BeAnInstanceOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAnInstanceOf.swift; path = Sources/Nimble/Matchers/BeAnInstanceOf.swift; sourceTree = ""; }; + C004251BCDC9ED115C4DFB3320BDBD8B /* jazzy.css */ = {isa = PBXFileReference; includeInIndex = 1; name = jazzy.css; path = docs/css/jazzy.css; sourceTree = ""; }; + C03E42FC64984A32E9B5D2F842B42E25 /* SatisfyAnyOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAnyOf.swift; path = Sources/Nimble/Matchers/SatisfyAnyOf.swift; sourceTree = ""; }; + C1203509141AE5E9FFDC7541AF05EF2D /* CwlCatchException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchException.h; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h; sourceTree = ""; }; + C127A341E44E6C42A5CDEE3CFF95F80D /* MKMapView+MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "MKMapView+MapCache.swift"; path = "MapCache/Classes/MKMapView+MapCache.swift"; sourceTree = ""; }; + C1A5526181AC4F821A1754535920B963 /* spinner.gif */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.gif; name = spinner.gif; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/img/spinner.gif; sourceTree = ""; }; + C1DFDC1D1FD3D92A0ACFE50BFEF9BC23 /* badge.svg */ = {isa = PBXFileReference; includeInIndex = 1; name = badge.svg; path = docs/badge.svg; sourceTree = ""; }; + C28A22B89AD403FA3D733BA5BCAAB2E4 /* carat.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = carat.png; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/img/carat.png; sourceTree = ""; }; + C414D16995B3E69D1E9EE9510F6183F3 /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; + C459BE8DFC0FC715F57C85E818ECAF57 /* OHHTTPStubs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubs.h; path = OHHTTPStubs/Sources/OHHTTPStubs.h; sourceTree = ""; }; + C73173A92DE69070A7AD2E4444A3DD46 /* MD5.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MD5.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/MD5.html; sourceTree = ""; }; + C795D74CD9A3E4D4718EDA8F72AFD60C /* World+DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "World+DSL.swift"; path = "Sources/Quick/DSL/World+DSL.swift"; sourceTree = ""; }; + C8A582FB16FED57126BD6C85098D0AC8 /* CwlDarwinDefinitions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlDarwinDefinitions.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift; sourceTree = ""; }; + C90024937DCE73432277D23A5452D077 /* NSMutableData.html */ = {isa = PBXFileReference; includeInIndex = 1; name = NSMutableData.html; path = docs/Extensions/NSMutableData.html; sourceTree = ""; }; + CAA01F188F89CEE1F1BA6EF012273B31 /* HaveCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HaveCount.swift; path = Sources/Nimble/Matchers/HaveCount.swift; sourceTree = ""; }; + CAF0A3A47724D16281FCDD50828CE148 /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; + CC7677630ED6708FB432B577CF69709E /* DSL+Wait.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DSL+Wait.swift"; path = "Sources/Nimble/DSL+Wait.swift"; sourceTree = ""; }; + CCE4202498E07EFA304254E7498272DE /* jazzy.search.js */ = {isa = PBXFileReference; includeInIndex = 1; name = jazzy.search.js; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/js/jazzy.search.js; sourceTree = ""; }; + CD59ADB915FD4F04B438D249B98A0B72 /* Int.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Int.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/Int.html; sourceTree = ""; }; + CD6F6373BEFACA0E7B746A5626C1EC42 /* LongitudeError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = LongitudeError.html; path = docs/Enums/LongitudeError.html; sourceTree = ""; }; + CE44AD545A0AD9E46C85A4A7103F0445 /* MatcherFunc.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherFunc.swift; path = Sources/Nimble/Matchers/MatcherFunc.swift; sourceTree = ""; }; + CE6716875BED3D7521586105CF0BCD77 /* CachedTileOverlayRenderer.html */ = {isa = PBXFileReference; includeInIndex = 1; name = CachedTileOverlayRenderer.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/CachedTileOverlayRenderer.html; sourceTree = ""; }; + CE9AE9D4A804577E2230C14811C7EC4F /* ExampleMetadata.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleMetadata.swift; path = Sources/Quick/ExampleMetadata.swift; sourceTree = ""; }; + CF2A1D0D205F501C22FD78C9C169983E /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; + D070F8A978F25B5C3E57C5C8869AEAF3 /* XCTestSuite+QuickTestSuiteBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestSuite+QuickTestSuiteBuilder.m"; path = "Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m"; sourceTree = ""; }; + D16C7155905B4AD3FAB9C48E292F694D /* CachedTileOverlayZoomRenderer.html */ = {isa = PBXFileReference; includeInIndex = 1; name = CachedTileOverlayZoomRenderer.html; path = docs/Classes/CachedTileOverlayZoomRenderer.html; sourceTree = ""; }; + D1707FA50A33DA503520807B9BE0D1DA /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; + D354320757F66E58A5579C219768D904 /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; D3C4D4DC9E50B4FBA64B3F0B9AEA26D5 /* Pods-MapCache_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MapCache_Example.release.xcconfig"; sourceTree = ""; }; - D7132EDF91FF6AF730AB87172465F5AA /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; - D91A9848438720D394DD458A612081F5 /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; - DC0CE467A996D8D4EBDDAC47F3EBF151 /* CwlCatchException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchException.m; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m; sourceTree = ""; }; + D3DACFB2D43676794CFBF3FD2FD622DF /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; + D4743B69E3173671CFFD80EBE7E922C1 /* Functions.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Functions.html; path = docs/Functions.html; sourceTree = ""; }; + D4E3E41A747F4AB8566CF792D948AC0D /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; + D61A49076C45865F85EDD5CC7230C899 /* MKMapView.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MKMapView.html; path = docs/Extensions/MKMapView.html; sourceTree = ""; }; + D6268C5A6D71C3C8C7DB4C2560BE2778 /* String.html */ = {isa = PBXFileReference; includeInIndex = 1; name = String.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Extensions/String.html; sourceTree = ""; }; + D648B9EEA91DC0512F41202F2526F8EE /* DiskCache.html */ = {isa = PBXFileReference; includeInIndex = 1; name = DiskCache.html; path = docs/Classes/DiskCache.html; sourceTree = ""; }; + D6F3E919D290987CFAECE25B24178055 /* Equal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Equal.swift; path = Sources/Nimble/Matchers/Equal.swift; sourceTree = ""; }; + D712F0A6F9F6DD57B19276193639190A /* MD5.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MD5.html; path = docs/Classes/MD5.html; sourceTree = ""; }; + D7512AB11D29274C41F20A2CDEEC80E1 /* OHPathHelpers.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OHPathHelpers.m; path = OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m; sourceTree = ""; }; + D9AEE5CE37CD51C48E5A9A9A628CA9C2 /* undocumented.json */ = {isa = PBXFileReference; includeInIndex = 1; name = undocumented.json; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/undocumented.json; sourceTree = ""; }; + DAD3ABE0F05EDC9DB07284EC6ED8A43F /* jquery.min.js */ = {isa = PBXFileReference; includeInIndex = 1; name = jquery.min.js; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/js/jquery.min.js; sourceTree = ""; }; + DCC33D39E55EDA16673F640D1A70557B /* BeLogical.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLogical.swift; path = Sources/Nimble/Matchers/BeLogical.swift; sourceTree = ""; }; + DCF7D509711876CD17A79E3C8ED2A2F6 /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Quick/DSL/DSL.swift; sourceTree = ""; }; + DE0E00CD23B6D208A0BDC42A0AFBDE5B /* MKZoomScale+MapCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "MKZoomScale+MapCache.swift"; path = "MapCache/Classes/MKZoomScale+MapCache.swift"; sourceTree = ""; }; DE323BCAE949B9DB6C6C9C15701A906B /* Pods-MapCache_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MapCache_Example.modulemap"; sourceTree = ""; }; - E195B947F8E022DA5B95511401FB8BCC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; - E1DACCD4C05DCC1439B6544C45794934 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; }; - E1E9FEE48CDEAFC92782BD1EA33E4F4F /* QuickSpecBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpecBase.h; path = Sources/QuickSpecBase/include/QuickSpecBase.h; sourceTree = ""; }; - E2CE1DD503DF38ECB994877A61BE504A /* MapCache-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MapCache-umbrella.h"; sourceTree = ""; }; - E4F4D12195B41610314F11E1C078CC2E /* CwlPreconditionTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlPreconditionTesting.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h; sourceTree = ""; }; - E71A1548CB7EC426E3D18AC1185B1506 /* OHHTTPStubs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubs.h; path = OHHTTPStubs/Sources/OHHTTPStubs.h; sourceTree = ""; }; - E7CB0B46A4D179D569B8020B5A44B7BF /* CwlCatchBadInstruction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstruction.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift; sourceTree = ""; }; - E7E52BA193C9B63C25CCF6225A10A5CB /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; - ED616F0F8ECB5246F8C77E4801D2C2F3 /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; - EE753723EFC2EAC03249D40367D471D2 /* OHHTTPStubs-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs-dummy.m"; sourceTree = ""; }; - EF54A01F553F29F621F98E0D9BB2758C /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; - EFE934A7C4114F10F3553438C691E889 /* Quick.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Quick.xcconfig; sourceTree = ""; }; - F00AC50894CC6BD867D65958F5042900 /* OHHTTPStubsResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubsResponse.h; path = OHHTTPStubs/Sources/OHHTTPStubsResponse.h; sourceTree = ""; }; - F0CF97A3735B53AA465C2845C068AFEB /* Compatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Compatibility.h; path = OHHTTPStubs/Sources/Compatibility.h; sourceTree = ""; }; - F2486E71282E0351A88C40C2204E0525 /* MapCacheProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MapCacheProtocol.swift; path = MapCache/Classes/MapCacheProtocol.swift; sourceTree = ""; }; - F268F3534B41F0176CC72038207681C8 /* Pods_MapCache_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MapCache_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47AB13BDFB77B63C6204AA50EEC62DF /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Nimble.modulemap; sourceTree = ""; }; - F5EDAECD9536A2DED4A68EE5B2BDB2AC /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; - F5F108D2A74FAB4ABA6D25FB80BF0A79 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; - F62DEF5218239987D32EA8B3DF4381F2 /* BeLessThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThan.swift; path = Sources/Nimble/Matchers/BeLessThan.swift; sourceTree = ""; }; - F69B72BB6858EA6EE8B07BC5431D70F5 /* OHHTTPStubs.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = OHHTTPStubs.modulemap; sourceTree = ""; }; - F7CAC3D888B57533CFF853DF1EE4B09B /* String+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+C99ExtendedIdentifier.swift"; path = "Sources/Quick/String+C99ExtendedIdentifier.swift"; sourceTree = ""; }; - F85830AF537C52FF3ADFE8707CBD714C /* OHHTTPStubs-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubs-umbrella.h"; sourceTree = ""; }; + E0F23969312D96449060669300597DE4 /* CachedTileOverlayRenderer.html */ = {isa = PBXFileReference; includeInIndex = 1; name = CachedTileOverlayRenderer.html; path = docs/Classes/CachedTileOverlayRenderer.html; sourceTree = ""; }; + E15AF7C42ECD4F6FB2AA37626EEED908 /* TileRangeError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileRangeError.html; path = docs/Enums/TileRangeError.html; sourceTree = ""; }; + E21AF1374D6E9404B17905C62E7C6EB8 /* Nimble.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Nimble.xcconfig; sourceTree = ""; }; + E285096D8BF6DC1FF39BB64E4D3EE15B /* TileRange.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileRange.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/TileRange.html; sourceTree = ""; }; + E2A0192605EA6BFC070D20E84376F6BE /* highlight.css */ = {isa = PBXFileReference; includeInIndex = 1; name = highlight.css; path = docs/css/highlight.css; sourceTree = ""; }; + E2FD2ED142C64BBBA2BE127A101EAD09 /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; + E32820BCDD9A589384B4DB22A248FAF3 /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Nimble/DSL.swift; sourceTree = ""; }; + E3D282CEDCAA17EB9EE4D5AAB38CCE1D /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; + E5EEAA1DD3F86A1C0C70B46826571801 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = Sources/Quick/Filter.swift; sourceTree = ""; }; + E61F575AA83A5BE4492D657A33CAA3F1 /* index.html */ = {isa = PBXFileReference; includeInIndex = 1; name = index.html; path = docs/index.html; sourceTree = ""; }; + E7D8A0C4CDB3D855A990975F2741BCAB /* URL+DiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "URL+DiskCache.swift"; sourceTree = ""; }; + E90D44DC36D14D6195AD3C04078D18AE /* URL.html */ = {isa = PBXFileReference; includeInIndex = 1; name = URL.html; path = docs/Extensions/URL.html; sourceTree = ""; }; + E9B492D8C3A0C86FFEE1377E1E2A938E /* RegionDownloaderDelegate.html */ = {isa = PBXFileReference; includeInIndex = 1; name = RegionDownloaderDelegate.html; path = docs/Protocols/RegionDownloaderDelegate.html; sourceTree = ""; }; + E9F85512C9D5229F7B826990A1455BEB /* Expectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expectation.swift; path = Sources/Nimble/Expectation.swift; sourceTree = ""; }; + EB00BD3D8785D8265316C10FBC19A1B9 /* Behavior.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Behavior.swift; path = Sources/Quick/Behavior.swift; sourceTree = ""; }; + EC3726D60627223562F1B531DD074BD5 /* ZoomError.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomError.html; path = docs/Enums/ZoomError.html; sourceTree = ""; }; + EC4277FB682EE3412AF11B5E81534A35 /* QuickSelectedTestSuiteBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickSelectedTestSuiteBuilder.swift; path = Sources/Quick/QuickSelectedTestSuiteBuilder.swift; sourceTree = ""; }; + ED8D569A7587D3132C83D71EA3122E79 /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; + EE9A326EB306300343B2D1842C97D352 /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; + F01BC0C12BFC9461920C5012C844FD0C /* OHHTTPStubsSwift.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OHHTTPStubsSwift.swift; path = OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift; sourceTree = ""; }; + F073D4CBB522835C5500DE9263BB94E1 /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; + F12F023D0B00EB7BD5EE7CCA35230555 /* MatcherProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherProtocols.swift; path = Sources/Nimble/Matchers/MatcherProtocols.swift; sourceTree = ""; }; + F268F3534B41F0176CC72038207681C8 /* Pods_MapCache_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MapCache_Tests.framework; path = "Pods-MapCache_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + F4294C90DB412B67191E1558C518FFD6 /* MapCacheConfig.html */ = {isa = PBXFileReference; includeInIndex = 1; name = MapCacheConfig.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Structs/MapCacheConfig.html; sourceTree = ""; }; + F4BA7E402686F67E6AC7352787F95B8C /* Typealiases.html */ = {isa = PBXFileReference; includeInIndex = 1; name = Typealiases.html; path = docs/Typealiases.html; sourceTree = ""; }; + F5AC6DD403DB6806D01634068A904B28 /* ZoomRangeIterator.html */ = {isa = PBXFileReference; includeInIndex = 1; name = ZoomRangeIterator.html; path = docs/Structs/ZoomRangeIterator.html; sourceTree = ""; }; + F72BCF5BACAE12906A061C0882DCF95A /* BeCloseTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeCloseTo.swift; path = Sources/Nimble/Matchers/BeCloseTo.swift; sourceTree = ""; }; + F7BB91811F31EE9130D854CD1C9AACC8 /* BeLessThanOrEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThanOrEqual.swift; path = Sources/Nimble/Matchers/BeLessThanOrEqual.swift; sourceTree = ""; }; + F84A8CB314832DECF2440F056ED008E4 /* TileRangeIterator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TileRangeIterator.swift; path = MapCache/Classes/TileRangeIterator.swift; sourceTree = ""; }; + F8521BC982C001EC7011982256FA3C7E /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestObservationCenter+Register.m"; path = "Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m"; sourceTree = ""; }; F86924B8A3F36F3BB85817DBF556F827 /* Pods-MapCache_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MapCache_Tests.modulemap"; sourceTree = ""; }; - FD616A6818F3ECCB7D00FB8E2D610F84 /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; - FDF0CE3ABA703D86133F5A8B94A3E628 /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Matchers/Async.swift; sourceTree = ""; }; - FE3F3D4A53B4D6FFDE4E7B942DD3E552 /* Behavior.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Behavior.swift; path = Sources/Quick/Behavior.swift; sourceTree = ""; }; - FE4BFCD6A51238AB986817F919AA2016 /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; - FEF46BCE484A0D2490AA6C90B2ADA4A1 /* MapCache-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MapCache-prefix.pch"; sourceTree = ""; }; + FA6CF0F8797ADA2F5B6B0F8517F07917 /* Nimble-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Nimble-Info.plist"; sourceTree = ""; }; + FAE7F251754A213E127BEF87CDDC0066 /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; + FAEA53E2B655A0AA7F88171475A4BDB9 /* CwlMachBadInstructionHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlMachBadInstructionHandler.m; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m; sourceTree = ""; }; + FB12B34BB62A97613D5A0786CC24A093 /* TileCoords.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileCoords.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/Classes/TileCoords.html; sourceTree = ""; }; + FB495ABB8619029FBD04B53DB594494E /* OHHTTPStubsMethodSwizzling.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OHHTTPStubsMethodSwizzling.h; path = OHHTTPStubs/Sources/NSURLSession/OHHTTPStubsMethodSwizzling.h; sourceTree = ""; }; + FDF46C789D038D3A761760AE8DEC2D10 /* TileRangeIterator.html */ = {isa = PBXFileReference; includeInIndex = 1; name = TileRangeIterator.html; path = docs/Structs/TileRangeIterator.html; sourceTree = ""; }; + FED5C085867D588040B23092CD9A75DF /* NMBObjCMatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBObjCMatcher.swift; path = Sources/Nimble/Adapters/NMBObjCMatcher.swift; sourceTree = ""; }; + FF2A712FE20E5CCF74458BCC61B51C41 /* index.html */ = {isa = PBXFileReference; includeInIndex = 1; name = index.html; path = docs/docsets/MapCache.docset/Contents/Resources/Documents/index.html; sourceTree = ""; }; + FFD7A0660C75672B92ED47D486C39318 /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -413,21 +539,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3EA64315E5EB0CD69C8F937119DDBC02 /* Frameworks */ = { + 1FB41F3B817F50C08A530AB486E92A06 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A55433663AE83E51EB96C54950361247 /* Foundation.framework in Frameworks */, - 1B4F048FF9AAF1741501A7E0ABDFB7D8 /* MapKit.framework in Frameworks */, - 13791F91C39F408FDD0DC652B1D7CADE /* UIKit.framework in Frameworks */, + 163C2D9C86D8AA40817453CC2F41F5BE /* Foundation.framework in Frameworks */, + 02DD7FC6A855D0675EA8B3BE66C99BBB /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 55C81EE76C6A69F1F69792A679310C68 /* Frameworks */ = { + 51E40E8536E2064486F54A495745494F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EFB9CC9267297D8104141A4046AAD14E /* Foundation.framework in Frameworks */, + 611D6583FD95ECA1B8D97DAEC6995725 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -440,97 +565,119 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - AC1C86EF694B27618279F94C87220AD3 /* Frameworks */ = { + A7CFDE07CFAC9DF29E57AA54350FA102 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6DC1EBB1F53CA78AFBCFE94F6EC9BA64 /* Foundation.framework in Frameworks */, + F37E5D553251C1080C36A9C64ACA219C /* Foundation.framework in Frameworks */, + AF400669D1D3B159A0E17AADDCF4E2AF /* MapKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - D9523B817C92EFD8BCE3CDE77F54908E /* Frameworks */ = { + AC1C86EF694B27618279F94C87220AD3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7BCC1E21AD0581F508C189CA6CDBF923 /* Foundation.framework in Frameworks */, - FBBE9D9A2D1C31E86BEABF94B224C4EE /* XCTest.framework in Frameworks */, + 6DC1EBB1F53CA78AFBCFE94F6EC9BA64 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1E2853184B13600C67D7F5B5B8BF00B9 /* Targets Support Files */ = { + 065FBFC9C845CA751679BE6A4D6DF6E7 /* Swift */ = { isa = PBXGroup; children = ( - 6429C29EF6F09A97E116448D8BD16162 /* Pods-MapCache_Example */, - 3CFBCD0AD5C2DC8B1C351071F86605D6 /* Pods-MapCache_Tests */, + F01BC0C12BFC9461920C5012C844FD0C /* OHHTTPStubsSwift.swift */, ); - name = "Targets Support Files"; + name = Swift; sourceTree = ""; }; - 281745A166F1898455E9BCC4A91E68B6 /* Core */ = { + 0B7B1A0BFE4BCF9A177FD705C0F03EB2 /* MapCache */ = { isa = PBXGroup; children = ( - F0CF97A3735B53AA465C2845C068AFEB /* Compatibility.h */, - E71A1548CB7EC426E3D18AC1185B1506 /* OHHTTPStubs.h */, - 7B87F6DE6F4C2B34E5C045885C248366 /* OHHTTPStubs.m */, - F00AC50894CC6BD867D65958F5042900 /* OHHTTPStubsResponse.h */, - 8692EA1A6C52FBBD0E2B4F28CDAE188E /* OHHTTPStubsResponse.m */, + 6E184A869A365D0FE2C92AB87C3DBB90 /* CachedTileOverlay.swift */, + 1803A6161AC020CCAEF38C78944D9F12 /* CachedTileOverlayRenderer.swift */, + 8E8780A40B650D259D801A1E6C9204E1 /* LoadTileMode.swift */, + 90F9BBCB3C84830D987B0A541ABF26D8 /* Log.swift */, + 6DDE878A048D00EA16C9CA3717D1AD0E /* MapCache.swift */, + 1BC3413CFEAB587CDA04B43A62A87F62 /* MapCacheConfig.swift */, + 1A78A89B3E80FEB98C18E1DF7818856B /* MapCacheProtocol.swift */, + C127A341E44E6C42A5CDEE3CFF95F80D /* MKMapView+MapCache.swift */, + 163A11930572926FC2B7E58893ECC26E /* MKTileOverlayPath+MapCache.swift */, + DE0E00CD23B6D208A0BDC42A0AFBDE5B /* MKZoomScale+MapCache.swift */, + 46F98D9192BFEB469DF1634C78D85E0D /* RegionDownloader.swift */, + B93AFEAF23F080EC2D79874D97B5FBDB /* RegionDownloaderDelegate.swift */, + 05895B6A84D2574C62B5F20E4193F4F9 /* TileCoords.swift */, + 46672F603F982F341F9E9196046B65C4 /* TileCoordsRegion.swift */, + 7B59BB8FE6AAEC642B72D78830BB2D31 /* TileRange.swift */, + F84A8CB314832DECF2440F056ED008E4 /* TileRangeIterator.swift */, + A6E63D7E5C4BA2B03E24C2F394A74577 /* ZoomableTile.swift */, + 840234133F19EC22A5F421C16E65F96C /* ZoomRange.swift */, + 5F0E55EF9B47362995A14527175870D7 /* ZoomRangeIterator.swift */, + F195732A2E071DC854C479C179ED8354 /* DiskCache */, + 40D102E237699D43483680036D9560A2 /* Pod */, + C00DA96FCA350B961EAC22EBABD33264 /* Support Files */, ); - name = Core; + name = MapCache; + path = ../..; sourceTree = ""; }; - 2857504C4BDB920AC3D223FF0D615803 /* Products */ = { + 117CDE81359D3079E76AC29EF2E11821 /* JSON */ = { isa = PBXGroup; children = ( - 115747451E3769DDB80BB07379405375 /* MapCache.framework */, - BAE263041362D074978BB3B577DF0A05 /* Nimble.framework */, - 17E33041B314FA837A3CAEB9DF3CDE9F /* OHHTTPStubs.framework */, - 414EFDEA84A81A79F1B1B381C14D612D /* Pods_MapCache_Example.framework */, - F268F3534B41F0176CC72038207681C8 /* Pods_MapCache_Tests.framework */, - 0D631E9908483F9525A6B3F36F16CC61 /* Quick.framework */, + 7E23C5027F49CCB1115A5709A9AD4B38 /* OHHTTPStubsResponse+JSON.h */, + 73B5C96F73A150F05BA5269117D30F07 /* OHHTTPStubsResponse+JSON.m */, ); - name = Products; + name = JSON; sourceTree = ""; }; - 3539042A5A370D1C086DEB43F075BDBB /* DiskCache */ = { + 1255304D95981C18B0971B5589546D45 /* Support Files */ = { isa = PBXGroup; children = ( - 652FE8CFA26C49E0D14E90A1DEAB3CF1 /* DiskCache.swift */, - 693B3FD22026DAE1C1DC1A2054701A45 /* FileManager+DiskCache.swift */, - 7679EEB9D42F00FAB0D7BFF878BE973F /* MD5.swift */, - 96C1C546EB3876A4EC84313410FE23FC /* String+DiskCache.swift */, - 5E58721E81408E6B0DFF0D7540AB7713 /* URL+DiskCache.swift */, + 17289CF181606AA1826AC4BE24353461 /* OHHTTPStubs.modulemap */, + B8C9F5F4CC1E9AB92A2AA8EF6D550405 /* OHHTTPStubs.xcconfig */, + A2AE985901449644D09E9F2658ED8CE8 /* OHHTTPStubs-dummy.m */, + 65F56D2ECF6723E977CC85B463E4BC15 /* OHHTTPStubs-Info.plist */, + 056D27853DF17A97C23812BC8EA2593F /* OHHTTPStubs-prefix.pch */, + 1272EB46FD274A9857ED9C8B4B48C571 /* OHHTTPStubs-umbrella.h */, ); - name = DiskCache; - path = MapCache/Classes/DiskCache; + name = "Support Files"; + path = "../Target Support Files/OHHTTPStubs"; sourceTree = ""; }; - 3568E69D5850BDE87FD2008599D12E87 /* Support Files */ = { + 1E2853184B13600C67D7F5B5B8BF00B9 /* Targets Support Files */ = { isa = PBXGroup; children = ( - A7EA45263FAAD6504F20D16DC86697EB /* MapCache.modulemap */, - 7417F9F7D2958F28B87B8B6C2DB5367D /* MapCache.xcconfig */, - 1733E028DCCD164B9FCDF2D26867A7AB /* MapCache-dummy.m */, - 4E5BC0414051578510095428898D77E1 /* MapCache-Info.plist */, - FEF46BCE484A0D2490AA6C90B2ADA4A1 /* MapCache-prefix.pch */, - E2CE1DD503DF38ECB994877A61BE504A /* MapCache-umbrella.h */, + 6429C29EF6F09A97E116448D8BD16162 /* Pods-MapCache_Example */, + 3CFBCD0AD5C2DC8B1C351071F86605D6 /* Pods-MapCache_Tests */, ); - name = "Support Files"; - path = "Example/Pods/Target Support Files/MapCache"; + name = "Targets Support Files"; sourceTree = ""; }; - 390089DB91D14134902F8160362F7760 /* NSURLSession */ = { + 2857504C4BDB920AC3D223FF0D615803 /* Products */ = { isa = PBXGroup; children = ( - 5C8C1D628275ABF472571DA614C1E071 /* NSURLRequest+HTTPBodyTesting.h */, - 2E8B394B35BA2E26C13D22FCB8E16DB9 /* NSURLRequest+HTTPBodyTesting.m */, - B36A214EBB134A6C72435DBD9C033F2E /* OHHTTPStubs+NSURLSessionConfiguration.m */, - BF32412D641E634D93C1A0ACA8136770 /* OHHTTPStubsMethodSwizzling.h */, - 653EDC6189A83B318FCCBE6C8F890B19 /* OHHTTPStubsMethodSwizzling.m */, + 115747451E3769DDB80BB07379405375 /* MapCache.framework */, + BAE263041362D074978BB3B577DF0A05 /* Nimble.framework */, + 17E33041B314FA837A3CAEB9DF3CDE9F /* OHHTTPStubs.framework */, + 414EFDEA84A81A79F1B1B381C14D612D /* Pods_MapCache_Example.framework */, + F268F3534B41F0176CC72038207681C8 /* Pods_MapCache_Tests.framework */, + 0D631E9908483F9525A6B3F36F16CC61 /* Quick.framework */, ); - name = NSURLSession; + name = Products; + sourceTree = ""; + }; + 2E264CB22F7D70FDB3F29F0F71476FD0 /* Core */ = { + isa = PBXGroup; + children = ( + 63D9392730024C9C1DD6872692D1C590 /* Compatibility.h */, + C459BE8DFC0FC715F57C85E818ECAF57 /* OHHTTPStubs.h */, + A423C1F49445714ECAF5E43ABF9D02DA /* OHHTTPStubs.m */, + 932406D4E1DF3C6114B740469A2ECBF1 /* OHHTTPStubsResponse.h */, + AEAB1F0948E0B4A948609CFD56D9F7E1 /* OHHTTPStubsResponse.m */, + ); + name = Core; sourceTree = ""; }; 3CFBCD0AD5C2DC8B1C351071F86605D6 /* Pods-MapCache_Tests */ = { @@ -550,173 +697,235 @@ path = "Target Support Files/Pods-MapCache_Tests"; sourceTree = ""; }; - 3E595DF82C13F48E48E9AD13A3E8EF28 /* Pods */ = { - isa = PBXGroup; - children = ( - 62F4082E05AC2C01DD28C58318E525FD /* Nimble */, - 947569997C0A89BF533023C398FB522B /* OHHTTPStubs */, - 5680EABBE3B937C71F9D3E05D84555F9 /* Quick */, - ); - name = Pods; - sourceTree = ""; - }; - 4F8947F9E7D61BF92D9C175A05D61A15 /* MapCache */ = { + 40D102E237699D43483680036D9560A2 /* Pod */ = { isa = PBXGroup; children = ( - 895A9F4A2520089C00D083C7 /* CachedTileOverlayRenderer.swift */, - 2FA84894A0ED4B49C202F674179FD3F1 /* CachedTileOverlay.swift */, - A27FA715B02735A7598DA75D285AC6D3 /* LoadTileMode.swift */, - 8FB30407B2F0B8A654B76336D235B108 /* Log.swift */, - 71EE69460C450C6E74C2FA36BB3DBCB9 /* MapCache.swift */, - C69B62A0A743EA6F9AB97C75F9A576E6 /* MapCacheConfig.swift */, - F2486E71282E0351A88C40C2204E0525 /* MapCacheProtocol.swift */, - 9CD8958658AE5D54E60F4656CA957AA9 /* MKMapView+MapCache.swift */, - AAC3E90C117C8066A9FFF25C7FC927B8 /* MKTileOverlayPath+MapCache.swift */, - 895A9F4C2520192900D083C7 /* MKZoomScale+MapCache.swift */, - 391E75F827CE440BF45D68C45D06B1FF /* RegionDownloader.swift */, - 5350C92CF49E06B7B814DE5B37093ECB /* RegionDownloaderDelegate.swift */, - ACDB135FBF2FB01FE571816A595F97B7 /* TileCoords.swift */, - 9E2E118681343EE34FFAAAB010092898 /* TileCoordsRegion.swift */, - A6E6CA3C5BD20FB67E7D4323C1B8D599 /* TileRange.swift */, - 880966A95B74A3A1BCC56C7C9DC18611 /* TileRangeIterator.swift */, - C660C368275EEDA27F49D2B2D50CF9F7 /* ZoomRange.swift */, - B509716C457E029391E7C1C2857F8B2D /* ZoomRangeIterator.swift */, - 895A9F502520BB8C00D083C7 /* ZoomableTile.swift */, - 3539042A5A370D1C086DEB43F075BDBB /* DiskCache */, - B907D0B32FA58D5B249359EE0E3AAF07 /* Pod */, - 3568E69D5850BDE87FD2008599D12E87 /* Support Files */, + AF6418202FA6DBE85CE1EE634C892FEB /* allocatedDiskSizeForDirectory(at:).html */, + 949967040481E4AF7B93441B2C253C1F /* allocatedDiskSizeForDirectory(at:).html */, + 1FA1FEE9F0F2B07CA3E3864243312B3D /* badge.svg */, + C1DFDC1D1FD3D92A0ACFE50BFEF9BC23 /* badge.svg */, + 085682E10B93FBF95B65CA4C5BF1D1F6 /* BytesSequence.html */, + 471F644BE66950C94FDB8611D0B2BECF /* BytesSequence.html */, + A3DCF688262C3E78B6232C6291A1A2B4 /* CachedTileOverlay.html */, + 68A691C150A9BF45401F8A48E8D18137 /* CachedTileOverlay.html */, + CE6716875BED3D7521586105CF0BCD77 /* CachedTileOverlayRenderer.html */, + E0F23969312D96449060669300597DE4 /* CachedTileOverlayRenderer.html */, + D16C7155905B4AD3FAB9C48E292F694D /* CachedTileOverlayZoomRenderer.html */, + B1399B06BC39890DD4180B27BA281C3A /* CachedTileOverlayZoomRenderer.html */, + C28A22B89AD403FA3D733BA5BCAAB2E4 /* carat.png */, + 93A94AA2CB20D8E22666749B429C99AE /* carat.png */, + 9510043B0F4D525B257AE3F726EE74B1 /* Classes.html */, + 20EFA79EFA09F9E2150F7FCA74B79004 /* Classes.html */, + 024F77411190AF4E760D234AE6E3F2C1 /* dash.png */, + 943727202087480F65144722451B7DA0 /* dash.png */, + D648B9EEA91DC0512F41202F2526F8EE /* DiskCache.html */, + 9086148617A951E0097698D69B1DE6F4 /* DiskCache.html */, + 80024FBF49DBE02CE6F1C859D70F2214 /* docSet.dsidx */, + 1B5E18B7D9CBBBFA152EA499F9C2466E /* Enums.html */, + 61DC57F199AB3EA15A20853E219A97DB /* Enums.html */, + 9A08B35D4E12C94ECFF930DF608798BA /* Extensions.html */, + 6C31C9D9EB5A62CDCCFC61A45BB2CF91 /* Extensions.html */, + 54D768FC7886C8E82A08DA6149D1EEAD /* FileManager.html */, + 3B440EDB5146513ACA316CBAAAE8A3C0 /* FileManager.html */, + 9FFD2C83749EBDD374EADECC5968473F /* fileSizeForDirectory(at:).html */, + B20B23644FDD2BFEC2DC6EB302A6FAA9 /* fileSizeForDirectory(at:).html */, + D4743B69E3173671CFFD80EBE7E922C1 /* Functions.html */, + 6F69B508EFDA4BE5C8E095C8F499FC34 /* Functions.html */, + A90443FE50E2E44D48F11BE8E291C241 /* gh.png */, + A622DB0CD5C43C1E56EF07740D22EB9D /* gh.png */, + 19F24FA7525D629A577EB1E4ECEC7D19 /* HashBase.html */, + B90DFC6D37967452281E826929B828D3 /* HashBase.html */, + 9B8CFD431B8C5DC8F10C2A7D436FB04B /* highlight.css */, + E2A0192605EA6BFC070D20E84376F6BE /* highlight.css */, + E61F575AA83A5BE4492D657A33CAA3F1 /* index.html */, + FF2A712FE20E5CCF74458BCC61B51C41 /* index.html */, + 1FD0D84D43EEC0A91801DA7C6D09E053 /* Info.plist */, + CD59ADB915FD4F04B438D249B98A0B72 /* Int.html */, + 0A3F198F626821383F4C4ADC94D40F42 /* Int.html */, + C004251BCDC9ED115C4DFB3320BDBD8B /* jazzy.css */, + AD859E75AA91B117AE969508E895DC43 /* jazzy.css */, + 01CC01DDC8C9FEDB271F0628976ADF7A /* jazzy.js */, + 0D55AC0CD8C4836F869C0B8AE7DD217A /* jazzy.js */, + 19814C0EA6E5E99C086BFB63A964EED3 /* jazzy.search.js */, + CCE4202498E07EFA304254E7498272DE /* jazzy.search.js */, + DAD3ABE0F05EDC9DB07284EC6ED8A43F /* jquery.min.js */, + 60C1147BD9E40C3FF35D16882C7CE015 /* jquery.min.js */, + 62396F73090CA6793106A27778F57B3A /* LatitudeError.html */, + 12BBAB6795B1588E0CF0B45AD3C4021E /* LatitudeError.html */, + B65FD0E87ADB1AB5145A516EC23B5D9B /* Level.html */, + AE0D051847099C46DA310BB729019E2E /* Level.html */, + 3FF9ABF95BC12EEE0B587FD147C86927 /* LICENSE */, + A2FFD2266B3E62EC8ADD4B79269845FB /* LoadTileMode.html */, + 5DFBD3406765B998B480B8F8F07F3CD2 /* LoadTileMode.html */, + 425BEE2EDD27199B11A20699A5C31DAF /* Log.html */, + 8181122B9C3B3742977B54445B93D26A /* Log.html */, + CD6F6373BEFACA0E7B746A5626C1EC42 /* LongitudeError.html */, + 2818F4C04EC2DCFEEDF78E5DDA0879D1 /* LongitudeError.html */, + 0EB10702CBBC5F3AE8FDD75A3013B5E1 /* lunr.min.js */, + 827A26E23D634BD77435399F4FC4F09F /* lunr.min.js */, + 15C6D79BFCB71DD0B8341D0F4F8A9A2F /* MapCache.html */, + B489442A3E49C0085F8151F6663C38D4 /* MapCache.html */, + A7359DB9F871FA611AC9035E48B03E6F /* MapCache.podspec */, + A56C8DD20F1C0F3FEF035DE99C2930FB /* MapCache.tgz */, + B3E72146CD71A463C95A7CB1704F4758 /* MapCacheConfig.html */, + F4294C90DB412B67191E1558C518FFD6 /* MapCacheConfig.html */, + AE90AE8F652F4A8CD394342A49C903E2 /* MapCacheProtocol.html */, + 7AC474C0B407EBE83265324D5653CB6F /* MapCacheProtocol.html */, + D712F0A6F9F6DD57B19276193639190A /* MD5.html */, + C73173A92DE69070A7AD2E4444A3DD46 /* MD5.html */, + D61A49076C45865F85EDD5CC7230C899 /* MKMapView.html */, + 84638E179DF00985521B63EEB0012B37 /* MKMapView.html */, + 0E3580128D900AB1EC46587183EE58F4 /* MKTileOverlayPath.html */, + 6CC80904A3C0E5DA0A4C9C4C85802515 /* MKTileOverlayPath.html */, + 046AE629552BFADF1206744AA8838420 /* MKZoomScale.html */, + 76B0A3728AAC24AC7F162D6195A77FB4 /* MKZoomScale.html */, + C90024937DCE73432277D23A5452D077 /* NSMutableData.html */, + A71A4EFF8D788853325D109F6B6A5425 /* NSMutableData.html */, + A8D114A257D36D77A39CD63977D96411 /* Protocols.html */, + 72BED7B0EAD6246912CA4D5BBA94E346 /* Protocols.html */, + 55E17646EAFC968EB23362F3B98D459A /* README.md */, + AB74C0F6516CA4AC25C108887F871194 /* RegionDownloader.html */, + 542B09F79CA383781F1EFCF4E57EB3E2 /* RegionDownloader.html */, + 9BD7B880C864713ED203EBB9D96FBDBB /* RegionDownloaderDelegate.html */, + E9B492D8C3A0C86FFEE1377E1E2A938E /* RegionDownloaderDelegate.html */, + 2FF360866795F1F2EEFBF63C4B97176D /* search.json */, + AAA6245A8B8300B340FC865AAF2B03D7 /* search.json */, + C1A5526181AC4F821A1754535920B963 /* spinner.gif */, + 43E1BD604EDE016A92A3F6588ECD0FE1 /* spinner.gif */, + D6268C5A6D71C3C8C7DB4C2560BE2778 /* String.html */, + 6D1A5F5B2B354F14C08E4F67BD265127 /* String.html */, + AA0F38C6F934E4D9ABC2F60510125F27 /* Structs.html */, + 5642B8397B364978E466DB01569B5890 /* Structs.html */, + 802E9A2EB7F3F6B65F8E932837CDC989 /* TileCoords.html */, + FB12B34BB62A97613D5A0786CC24A093 /* TileCoords.html */, + A7D84DDB54216A35901D009A4D549C3C /* TileCoordsRegion.html */, + 3AF49077C99907596F0E49B7EC4A0F93 /* TileCoordsRegion.html */, + 20C519F6ACDC4A0C875F2E3C8BF7EC19 /* TileError.html */, + 950778978D0B992BB31A89C3E738A3B3 /* TileError.html */, + E285096D8BF6DC1FF39BB64E4D3EE15B /* TileRange.html */, + 4342C4A0BC822258BC60B2335152EB0D /* TileRange.html */, + E15AF7C42ECD4F6FB2AA37626EEED908 /* TileRangeError.html */, + 9559C0B7C71C0FC900D082A0C7F393ED /* TileRangeError.html */, + FDF46C789D038D3A761760AE8DEC2D10 /* TileRangeIterator.html */, + 46EFA0F3E9CF595AAF8A052346160254 /* TileRangeIterator.html */, + 6A416EC7D92C7F5C06D1F1A731E1AD3B /* typeahead.jquery.js */, + ACB32869CFF8333ACDDF5267F1DC5364 /* typeahead.jquery.js */, + F4BA7E402686F67E6AC7352787F95B8C /* Typealiases.html */, + 3A1DB25947ADCD36350BC93C166D10C8 /* Typealiases.html */, + 1300A810219BC226680515397FCA1509 /* undocumented.json */, + D9AEE5CE37CD51C48E5A9A9A628CA9C2 /* undocumented.json */, + E90D44DC36D14D6195AD3C04078D18AE /* URL.html */, + 6BA066129BD01BA43AE93D3A82FB0AD6 /* URL.html */, + 2A2E7128501404B2BE17F4350E41CE6B /* ZoomableTile.html */, + 3F4C65E946EA1106BA03C22C9F87A630 /* ZoomableTile.html */, + EC3726D60627223562F1B531DD074BD5 /* ZoomError.html */, + A60D802B0E490971A6017D10A9B57A97 /* ZoomError.html */, + 291406F8369E06DF58E8B903CD27E758 /* ZoomRange.html */, + 6DC7E9B95A98BEC3F10B58FC3D8DEDD9 /* ZoomRange.html */, + 46D3A6336CE50F683598715BFBDA1811 /* ZoomRangeIterator.html */, + F5AC6DD403DB6806D01634068A904B28 /* ZoomRangeIterator.html */, ); - name = MapCache; - path = ../..; + name = Pod; sourceTree = ""; }; - 5680EABBE3B937C71F9D3E05D84555F9 /* Quick */ = { + 4AE59552C531B968AE822B1F0187EF59 /* Development Pods */ = { isa = PBXGroup; children = ( - FE3F3D4A53B4D6FFDE4E7B942DD3E552 /* Behavior.swift */, - 3766413BF40711BC7A1AA11E7A322CC5 /* Callsite.swift */, - 922FB358BAEB5DCF70AA829172AB78A3 /* Closures.swift */, - 648712EF908CF6AF67480B59D3A8D00C /* Configuration.swift */, - 62B693BD2EFC82DE2F0BC929DAABC288 /* DSL.swift */, - 34663960400566EF930386958B02783C /* ErrorUtility.swift */, - 911B06044A3BF3D67D9028BBD2BAAE76 /* Example.swift */, - ED616F0F8ECB5246F8C77E4801D2C2F3 /* ExampleGroup.swift */, - B7A6CA59A4AA8B8F52527BFF2F7EBD78 /* ExampleHooks.swift */, - 9ED64A605FB721F40DA193A7D501D7CE /* ExampleMetadata.swift */, - 4C2E3A9467C89EE9FFCB3BA6538A2A26 /* Filter.swift */, - 3A90724E0D506F14E76BC8939CD5A2DB /* HooksPhase.swift */, - EF54A01F553F29F621F98E0D9BB2758C /* NSBundle+CurrentTestBundle.swift */, - 91C0F36CD0A75417BCF69ED4A90E61D4 /* QCKDSL.h */, - A1A7B07025EC9B0167C9A4CE201FAFCD /* QCKDSL.m */, - 735D06736FD9C79A4F9232CA1417D1C7 /* Quick.h */, - 6503EF0C0284B7AA6A4E8F1BE88399A4 /* QuickConfiguration.h */, - 54C99B88350DC9DE9643120E6A2079CE /* QuickConfiguration.m */, - 0D9DAA8E3F95D3E2F76CA2E4A8DA68BC /* QuickSelectedTestSuiteBuilder.swift */, - D13A30260CB105567BFA5CA03B5F63F5 /* QuickSpec.h */, - 01DFEABA038B8351117FE2EABD976FAA /* QuickSpec.m */, - E1E9FEE48CDEAFC92782BD1EA33E4F4F /* QuickSpecBase.h */, - 0BD18C83B0338D3140BEEC9AD00D3B77 /* QuickSpecBase.m */, - 56D8B351CD4ECC7BA22ECDDFCCA87FC9 /* QuickTestSuite.swift */, - F7CAC3D888B57533CFF853DF1EE4B09B /* String+C99ExtendedIdentifier.swift */, - 2A4EE851FEE7978F898806AC8D49D3D6 /* SuiteHooks.swift */, - 5F07844CF025D839A93AD0927ABFBD7C /* URL+FileName.swift */, - 8C1092AB770999A27768BADA699E54E4 /* World.swift */, - 5D2327A427B2BD8F721B522AEB74E972 /* World+DSL.swift */, - CB58FBA2EFDB29215B5DC1C5DF5B82F2 /* XCTestSuite+QuickTestSuiteBuilder.m */, - 59DACB2A46DFEB8F25B7C12EAF2CFF3C /* Support Files */, + 0B7B1A0BFE4BCF9A177FD705C0F03EB2 /* MapCache */, ); - path = Quick; + name = "Development Pods"; sourceTree = ""; }; - 59DACB2A46DFEB8F25B7C12EAF2CFF3C /* Support Files */ = { + 5341168511678A57A9B86AE1067C1412 /* OHHTTPStubs */ = { isa = PBXGroup; children = ( - 6A7CC84F51C79C8AD3C0F6C507E7C82B /* Quick.modulemap */, - EFE934A7C4114F10F3553438C691E889 /* Quick.xcconfig */, - 41B76475CF79311864EE2C9AC3C5FECF /* Quick-dummy.m */, - C7FFF8319F9E316AB7A9295D5AE2BC1E /* Quick-Info.plist */, - D91A9848438720D394DD458A612081F5 /* Quick-prefix.pch */, - 4BE5FAA16B3F3E5E74852A98EBF9B301 /* Quick-umbrella.h */, + 2E264CB22F7D70FDB3F29F0F71476FD0 /* Core */, + 117CDE81359D3079E76AC29EF2E11821 /* JSON */, + B3DAC9776C44030B781F0FA4AD1EDE1E /* NSURLSession */, + A72B752ED0B76B545EA68BFAB521B7CF /* OHPathHelpers */, + 1255304D95981C18B0971B5589546D45 /* Support Files */, + 065FBFC9C845CA751679BE6A4D6DF6E7 /* Swift */, ); - name = "Support Files"; - path = "../Target Support Files/Quick"; + name = OHHTTPStubs; + path = OHHTTPStubs; sourceTree = ""; }; - 62F4082E05AC2C01DD28C58318E525FD /* Nimble */ = { + 607A551AC74E8A142E26431803A9BA90 /* Nimble */ = { isa = PBXGroup; children = ( - 41B6AE4618F2A2292FDA4C30660FD484 /* AdapterProtocols.swift */, - 824F6F91CF7BF57BA6B38A2249570631 /* AllPass.swift */, - 7006B9DE95C20575C8104D556FD82F64 /* AssertionDispatcher.swift */, - 90D6C8439AFD1DF0C31C19BD170579D4 /* AssertionRecorder.swift */, - FDF0CE3ABA703D86133F5A8B94A3E628 /* Async.swift */, - C3B06E76B3637C5A622B3C2CD41B999B /* Await.swift */, - 9D53F7368DD619907C312123D341E0CE /* BeAKindOf.swift */, - D2F201F8ABF0AEAC28E4DCB47E8AF6A4 /* BeAnInstanceOf.swift */, - 51D8355401EBFC7E98C10A3C9F7B268A /* BeCloseTo.swift */, - 9558C3392958FEF6451C867A954D3624 /* BeEmpty.swift */, - 54A3BFFC02ED1452E04ECE01D5788221 /* BeginWith.swift */, - 9AE46063D85FB14613BE20CD608AB7D6 /* BeGreaterThan.swift */, - F5EDAECD9536A2DED4A68EE5B2BDB2AC /* BeGreaterThanOrEqualTo.swift */, - 9F4F3C8DA66BF27F83E03EF36C668356 /* BeIdenticalTo.swift */, - F62DEF5218239987D32EA8B3DF4381F2 /* BeLessThan.swift */, - C295A07F23D938CD7464968410EFA016 /* BeLessThanOrEqual.swift */, - 54BD76F593BB743EF028F3CC3883C3FB /* BeLogical.swift */, - 75B8EC736F60632EAEC416C67C5E5389 /* BeNil.swift */, - B197AFED90D8344E24FBE7EA5DC6FEB8 /* BeVoid.swift */, - F5F108D2A74FAB4ABA6D25FB80BF0A79 /* Contain.swift */, - 3A04E42E0B79CBCE659E1D3BB39EC854 /* ContainElementSatisfying.swift */, - E7E52BA193C9B63C25CCF6225A10A5CB /* CwlBadInstructionException.swift */, - E7CB0B46A4D179D569B8020B5A44B7BF /* CwlCatchBadInstruction.swift */, - 4375272808E92B06D8C5B507D02344EE /* CwlCatchException.h */, - DC0CE467A996D8D4EBDDAC47F3EBF151 /* CwlCatchException.m */, - 46962C940649D631BD5FB3D78AF65580 /* CwlCatchException.swift */, - 0C08A53F7C453E738AAE2F448663B3E0 /* CwlDarwinDefinitions.swift */, - 58C679E71A657586E07385AA3C2AF776 /* CwlMachBadInstructionHandler.h */, - D0A957877D1F903A5830268A2C05B2C0 /* CwlMachBadInstructionHandler.m */, - E4F4D12195B41610314F11E1C078CC2E /* CwlPreconditionTesting.h */, - ACC40BBED2F4EF8D6FA3ADDA2598395A /* DSL.h */, - 8206E705C0B3119435E144BC9D2DAB5D /* DSL.m */, - A7E689B6B9DFFCF4F83BB830F7EAFE48 /* DSL.swift */, - 10A5C33702031BDD460D4DB8C7F2C46A /* DSL+Wait.swift */, - A4E94020B70B031BFFEB9590D86193F0 /* ElementsEqual.swift */, - 1AD83EAA2F28D4F3A57F6B97B89C3D9E /* EndWith.swift */, - 69D64FE31821C028D03F21EE032A6FF9 /* Equal.swift */, - 24DA9DF6F0005B8E2A739F1BE3781EAC /* Errors.swift */, - C216496AEA73B6952A8F346E69886DD2 /* Expectation.swift */, - 1880E766E464AD0B6ED5AFC4B62E0908 /* ExpectationMessage.swift */, - 11C6C324A756BDE10FCE734B7DE7C139 /* Expression.swift */, - 39B6549173364643994D9DFF8C638779 /* FailureMessage.swift */, - 52C6AC8EC49C0EBD55696528F4EBFBF6 /* Functional.swift */, - 395EE898C52B91BE11E3466E6F9AEAEE /* HaveCount.swift */, - B8FECB6D64AD648E284AD355612B498B /* mach_excServer.c */, - 99DD65142038A8494A13FC6CB5363AE8 /* mach_excServer.h */, - 9DEC34BA82C26E63F2F1261DDE47101A /* Match.swift */, - 2909C149B79363BA2C0DACBD42906F21 /* MatcherFunc.swift */, - 6E74FD125DB45D6D2AF372FC7DDE90C1 /* MatcherProtocols.swift */, - 53199BC2B238A45F0049A1015F8A550A /* MatchError.swift */, - 507FDDF7452EDA32B25AD50023A485E1 /* Nimble.h */, - FE4BFCD6A51238AB986817F919AA2016 /* NimbleEnvironment.swift */, - 657057D20738B4215112B2CD52F26045 /* NimbleXCTestHandler.swift */, - 47A7484A26D426C2F034B0B7A7BD4FC0 /* NMBExceptionCapture.h */, - 51B77DE700D095FB89CD68F9E54EDC70 /* NMBExceptionCapture.m */, - FD616A6818F3ECCB7D00FB8E2D610F84 /* NMBExpectation.swift */, - 5B66B3F014D7F8670742F8D470B24C7A /* NMBObjCMatcher.swift */, - D7132EDF91FF6AF730AB87172465F5AA /* NMBStringify.h */, - 211D3C5C8A6138EDF0F150D704FE72B0 /* NMBStringify.m */, - 5F1278DE6131B5156740A3ACC90CF8DD /* PostNotification.swift */, - 1EDE0A82E960B7EB7D5901106C84996F /* Predicate.swift */, - B6579D2619AC8D3D023B34BA4FC56B0B /* RaisesException.swift */, - B98E887DF9C68D15B0940E1DBE494FEA /* SatisfyAllOf.swift */, - 2994E4039A35F30F17709D727B378F45 /* SatisfyAnyOf.swift */, - 8C29CAD75DA4C75D8CC7A2573578C7DA /* SourceLocation.swift */, - 72D12EEA6BDAC4FD3863B037310814D8 /* Stringers.swift */, - 82A31B1C61BE8BE362841B618BDA39E2 /* ThrowAssertion.swift */, - 71A99273767469EF6AF2FB44F8F4D5C7 /* ThrowError.swift */, - 5A3F3244B4D14F0F6B6CF66A073953CE /* ToSucceed.swift */, - C74B7479708267FB169BBF01B8920C90 /* XCTestObservationCenter+Register.m */, - B5D020C2AC5BCCA896AAE6062C240CAA /* Support Files */, + 3D59637D26DD58060CD295D3AA88097F /* AdapterProtocols.swift */, + 78ED18ECB4CE94F11CBADEC017103BE7 /* AllPass.swift */, + 991B74211A9204244463F0891054A96B /* AssertionDispatcher.swift */, + 86BB725AD13DBE78EC993A939F13D2A8 /* AssertionRecorder.swift */, + B35450B70EB56065624E377B75EE8D35 /* Async.swift */, + 80B0213FE033CAF6DBD0C280D66CE48F /* Await.swift */, + 654230CDD658658331C4CA7AAD297477 /* BeAKindOf.swift */, + 86EE3DA33C79D566526AF252F22B6E92 /* BeAnInstanceOf.swift */, + F72BCF5BACAE12906A061C0882DCF95A /* BeCloseTo.swift */, + 50DF72DB6249B4F56DFC3C3D0F3056D2 /* BeEmpty.swift */, + 06F7EA2C3BB55C73409E71F62853A8A4 /* BeginWith.swift */, + 4254C540A7400F0424C8BC1D5F2C46B0 /* BeginWithPrefix.swift */, + D354320757F66E58A5579C219768D904 /* BeGreaterThan.swift */, + 791DE21DA91D6F29F6687ECD62EA6FB9 /* BeGreaterThanOrEqualTo.swift */, + 02F378B0DFB68CB25C9833E5A4FD1C6B /* BeIdenticalTo.swift */, + 2DB53F6709C3EED9FFE831DEDBB360A8 /* BeLessThan.swift */, + F7BB91811F31EE9130D854CD1C9AACC8 /* BeLessThanOrEqual.swift */, + DCC33D39E55EDA16673F640D1A70557B /* BeLogical.swift */, + 313AD1CE7DBF24FA8FD0B3F3D10C16D1 /* BeNil.swift */, + 3B512D03B99EDFE8179BD7E9CB392332 /* BeVoid.swift */, + 360E84A46E42BCFB18831D7F3613B8D3 /* Contain.swift */, + 951BEED39E1DF158C737D0791C786909 /* ContainElementSatisfying.swift */, + 8CC8A7BE1F047F0BE4495AE3AD4A3104 /* CwlBadInstructionException.swift */, + 0FCD508375053E5BC27BC68949BD5039 /* CwlCatchBadInstruction.swift */, + C1203509141AE5E9FFDC7541AF05EF2D /* CwlCatchException.h */, + 1CBDDF07A68ED9A8935158163D7DE566 /* CwlCatchException.m */, + 4B3FB2D85D9D01F78D44D114C4B1377F /* CwlCatchException.swift */, + C8A582FB16FED57126BD6C85098D0AC8 /* CwlDarwinDefinitions.swift */, + B4F38021A56C8ACADBCEA370CBA3C7FC /* CwlMachBadInstructionHandler.h */, + FAEA53E2B655A0AA7F88171475A4BDB9 /* CwlMachBadInstructionHandler.m */, + 3F001325EA32FBDCD7E2554E90313D16 /* DispatchTimeInterval.swift */, + 4F8EBA2948E86735B919AD56668EDAA6 /* DSL.h */, + 56C651CE9650C090EA2965D3646DAA4B /* DSL.m */, + E32820BCDD9A589384B4DB22A248FAF3 /* DSL.swift */, + CC7677630ED6708FB432B577CF69709E /* DSL+Wait.swift */, + 9F4F2B1F048A2EFB87FD5F8440068EDC /* ElementsEqual.swift */, + D4E3E41A747F4AB8566CF792D948AC0D /* EndWith.swift */, + D6F3E919D290987CFAECE25B24178055 /* Equal.swift */, + 795B462193EBE8925080B296C53B5EC5 /* Errors.swift */, + E9F85512C9D5229F7B826990A1455BEB /* Expectation.swift */, + A6F409F76C645289A90ED67E5E88B9BF /* ExpectationMessage.swift */, + 1D3813FBA71C055DD569D635AE1C099D /* Expression.swift */, + 90E074C5D8E5F4E01C9B1E35A2B516AF /* FailureMessage.swift */, + CAA01F188F89CEE1F1BA6EF012273B31 /* HaveCount.swift */, + 74E684295FC726DEA754DB314A0D6B1A /* mach_excServer.c */, + 0212B6DB2B1431C27307988A7C314ED8 /* mach_excServer.h */, + 7CF8F464FDDD2BB156123DB78F57182D /* Match.swift */, + CE44AD545A0AD9E46C85A4A7103F0445 /* MatcherFunc.swift */, + F12F023D0B00EB7BD5EE7CCA35230555 /* MatcherProtocols.swift */, + 730269C4B278DF751B426E8D7695833C /* MatchError.swift */, + 818B430A00D451996F2C9725D03B73CE /* Nimble.h */, + 066F6F4C9A193CA0D7957636B740258E /* NimbleEnvironment.swift */, + 1FDB1926373EBA468A94CE37C448CB8E /* NimbleXCTestHandler.swift */, + 7C0B0FF8D7E18968C31E823BA4225FCF /* NMBExceptionCapture.h */, + 06B38F22EECC62B6041AEB8D5E08B625 /* NMBExceptionCapture.m */, + D1707FA50A33DA503520807B9BE0D1DA /* NMBExpectation.swift */, + FED5C085867D588040B23092CD9A75DF /* NMBObjCMatcher.swift */, + 8985456D5A9FAD4E2F673A0939A82581 /* NMBStringify.h */, + 671AC82E7E722B6916C84C0332122DD8 /* NMBStringify.m */, + 375738AFF6A1C050FC2B6FEF5BF56DC4 /* PostNotification.swift */, + 1BAE66D7AB547D0C58A58CB7720CE397 /* Predicate.swift */, + EE9A326EB306300343B2D1842C97D352 /* RaisesException.swift */, + 9F586987961FF1F9780633FC3DE4C7FE /* SatisfyAllOf.swift */, + C03E42FC64984A32E9B5D2F842B42E25 /* SatisfyAnyOf.swift */, + E2FD2ED142C64BBBA2BE127A101EAD09 /* SourceLocation.swift */, + E3D282CEDCAA17EB9EE4D5AAB38CCE1D /* Stringers.swift */, + CAF0A3A47724D16281FCDD50828CE148 /* ThrowAssertion.swift */, + 106629AF70FD65D2F0352301129D4CA6 /* ThrowError.swift */, + AA1364021B61B6779249DF84B4A95A1B /* ToSucceed.swift */, + F8521BC982C001EC7011982256FA3C7E /* XCTestObservationCenter+Register.m */, + 8FB65044D9E2790396404CA21D5E1E31 /* Support Files */, ); + name = Nimble; path = Nimble; sourceTree = ""; }; @@ -737,131 +946,167 @@ path = "Target Support Files/Pods-MapCache_Example"; sourceTree = ""; }; - 723C12182EDF80A14A4E3C6702F86A6C /* iOS */ = { + 8FB65044D9E2790396404CA21D5E1E31 /* Support Files */ = { isa = PBXGroup; children = ( - E195B947F8E022DA5B95511401FB8BCC /* CFNetwork.framework */, - 04A1CEF19DDFB9E4896D4B29E8B73804 /* Foundation.framework */, - E1DACCD4C05DCC1439B6544C45794934 /* MapKit.framework */, - 2F61D5DA66B063EB7612679691E71D8E /* UIKit.framework */, - 2D2CDC2B3C9E5E38B425904019C0AB98 /* XCTest.framework */, + 551CB3DF50B51A44C5FDFAC107DA80B3 /* Nimble.modulemap */, + E21AF1374D6E9404B17905C62E7C6EB8 /* Nimble.xcconfig */, + 6B584EAD56D24B2900714A7BC9313910 /* Nimble-dummy.m */, + FA6CF0F8797ADA2F5B6B0F8517F07917 /* Nimble-Info.plist */, + CF2A1D0D205F501C22FD78C9C169983E /* Nimble-prefix.pch */, + 5DCF98E97A53ADCB9F820637E64E3B30 /* Nimble-umbrella.h */, ); - name = iOS; + name = "Support Files"; + path = "../Target Support Files/Nimble"; sourceTree = ""; }; - 947569997C0A89BF533023C398FB522B /* OHHTTPStubs */ = { + 926ED0D0B5E7CA28500FE1418FB2523C /* Quick */ = { isa = PBXGroup; children = ( - 281745A166F1898455E9BCC4A91E68B6 /* Core */, - F66C08D27C8584A00BF3263EB7B6BBBF /* JSON */, - 390089DB91D14134902F8160362F7760 /* NSURLSession */, - EBF286EBBB1CEC323DAB80C30483444F /* OHPathHelpers */, - FC8DB4C4EA329AD6EBE032DB8DF259A5 /* Support Files */, - B9D4ABB45612B866F8C7EC70F8A7458F /* Swift */, + EB00BD3D8785D8265316C10FBC19A1B9 /* Behavior.swift */, + C414D16995B3E69D1E9EE9510F6183F3 /* Callsite.swift */, + 929FDF3B9F330913C29B04BB8A3CF6E5 /* Closures.swift */, + 6ED0FE9236F1CAE618F72A1D0DCC892B /* Configuration.swift */, + DCF7D509711876CD17A79E3C8ED2A2F6 /* DSL.swift */, + 1E3F4B4B8AFEBC5EB163BCD46AEB6677 /* ErrorUtility.swift */, + 55AF7391D64643383F74C7A205868F8E /* Example.swift */, + B7B1F7360FAABF0E220F2ECFC7F3DE3A /* ExampleGroup.swift */, + 877F6084753C9B0AD662FFAB2671A0FC /* ExampleHooks.swift */, + CE9AE9D4A804577E2230C14811C7EC4F /* ExampleMetadata.swift */, + E5EEAA1DD3F86A1C0C70B46826571801 /* Filter.swift */, + 5E56B21C8A1F843E190BFB1BCFFA480A /* HooksPhase.swift */, + FFD7A0660C75672B92ED47D486C39318 /* NSBundle+CurrentTestBundle.swift */, + B2CA3A3E0E96246DDAC8AC0A65BCAD55 /* QCKDSL.h */, + 1DA8F308C587174E1B274B1A312E5B6A /* QCKDSL.m */, + ED8D569A7587D3132C83D71EA3122E79 /* Quick.h */, + FAE7F251754A213E127BEF87CDDC0066 /* QuickConfiguration.h */, + 676FBE1A9835D018A658E201831FEE64 /* QuickConfiguration.m */, + 2DBDB0F1031B401AE43BD18107B31B78 /* QuickConfiguration.swift */, + EC4277FB682EE3412AF11B5E81534A35 /* QuickSelectedTestSuiteBuilder.swift */, + 778A19D566C9FDCE75F613ECFFC8F65B /* QuickSpec.h */, + 35E5C292BBE3983BA541F6F502FAFA9B /* QuickSpec.m */, + 379A18659913E7C5C99ABAB30E115F2C /* QuickSpecBase.h */, + 22F5E634D1E51988CACC28B111DA493E /* QuickSpecBase.m */, + 0DC11741F26FEB163D678EAF2A98BBC9 /* QuickTestObservation.swift */, + F073D4CBB522835C5500DE9263BB94E1 /* QuickTestSuite.swift */, + 7BBBD933A1394BA217CEED50207FCE05 /* String+C99ExtendedIdentifier.swift */, + 89001E0BAF80B8B9E75AB1627596D905 /* SuiteHooks.swift */, + 0F9619CDEF4F3C1A0979714DD3803991 /* URL+FileName.swift */, + 247A52FE97D9C04AAE2DE1C4ACC8361C /* World.swift */, + C795D74CD9A3E4D4718EDA8F72AFD60C /* World+DSL.swift */, + D070F8A978F25B5C3E57C5C8869AEAF3 /* XCTestSuite+QuickTestSuiteBuilder.m */, + EE7E3BE495A8241267FA02076CB2F89B /* Support Files */, ); - path = OHHTTPStubs; + name = Quick; + path = Quick; sourceTree = ""; }; - A34C9825E85B3FA07446853097E9C0B3 /* Development Pods */ = { + A72B752ED0B76B545EA68BFAB521B7CF /* OHPathHelpers */ = { isa = PBXGroup; children = ( - 4F8947F9E7D61BF92D9C175A05D61A15 /* MapCache */, + 359A341E9A91396315FBC06D5E34A503 /* OHPathHelpers.h */, + D7512AB11D29274C41F20A2CDEEC80E1 /* OHPathHelpers.m */, ); - name = "Development Pods"; + name = OHPathHelpers; sourceTree = ""; }; - B5D020C2AC5BCCA896AAE6062C240CAA /* Support Files */ = { + A84318708EC60D0224307A35D02AC30E /* iOS */ = { isa = PBXGroup; children = ( - F47AB13BDFB77B63C6204AA50EEC62DF /* Nimble.modulemap */, - 5EFB24964BA4EB933CC5E8F82C1FE61A /* Nimble.xcconfig */, - 6EC245C843DB0600AFC6378E16A4A96F /* Nimble-dummy.m */, - 013EE4849980A17D60BD1CA736137B69 /* Nimble-Info.plist */, - 2B9662CA595EA7B8C02EC0983FB7EFE4 /* Nimble-prefix.pch */, - 12C63023E61CF58EA0D8522F6DB486BB /* Nimble-umbrella.h */, + 3D08DDB48DF4D1E8FA2482934B30F7CF /* CFNetwork.framework */, + 02050620335361A56185640A7C02C436 /* Foundation.framework */, + BA73F9ABFC32B574929D4A7F521B7F6E /* MapKit.framework */, + 82294359767EE9AD2352AEE40D68B55A /* XCTest.framework */, ); - name = "Support Files"; - path = "../Target Support Files/Nimble"; + name = iOS; sourceTree = ""; }; - B907D0B32FA58D5B249359EE0E3AAF07 /* Pod */ = { + B3DAC9776C44030B781F0FA4AD1EDE1E /* NSURLSession */ = { isa = PBXGroup; children = ( + 7A9E7A288343A8DFA3F71AC3012B3F39 /* NSURLRequest+HTTPBodyTesting.h */, + AD14C524AEBCF7962A0536758DA758C1 /* NSURLRequest+HTTPBodyTesting.m */, + A98F1C6EAEF1DB8C2B623EDC23CD0C8D /* OHHTTPStubs+NSURLSessionConfiguration.m */, + FB495ABB8619029FBD04B53DB594494E /* OHHTTPStubsMethodSwizzling.h */, + 178DBFBC5B886FCF8AD20199ED05638E /* OHHTTPStubsMethodSwizzling.m */, ); - name = Pod; + name = NSURLSession; sourceTree = ""; }; - B94D7768568A9992200DB461E8CF687F /* Frameworks */ = { + BA4F31F07263C99FC76E66D632A59F09 /* Frameworks */ = { isa = PBXGroup; children = ( - 723C12182EDF80A14A4E3C6702F86A6C /* iOS */, + A84318708EC60D0224307A35D02AC30E /* iOS */, ); name = Frameworks; sourceTree = ""; }; - B9D4ABB45612B866F8C7EC70F8A7458F /* Swift */ = { + C00DA96FCA350B961EAC22EBABD33264 /* Support Files */ = { isa = PBXGroup; children = ( - B1FB7F3A8D89DC02BC80AC7F0508982C /* OHHTTPStubsSwift.swift */, + 6D08E2B2471AD910F5B2456FDBDA48B1 /* MapCache.modulemap */, + 64FF983284EB51DA2419C48B63C53461 /* MapCache.xcconfig */, + A19BD5D9046748796D75D5766CE0DBE7 /* MapCache-dummy.m */, + 25F01294024D5006C41718E4AFACAA8B /* MapCache-Info.plist */, + 7639BB14FBBD03FD53C9C874E663C5FF /* MapCache-prefix.pch */, + 9D078D3F1D714D55E420BFC39BA5F59D /* MapCache-umbrella.h */, ); - name = Swift; + name = "Support Files"; + path = "Example/Pods/Target Support Files/MapCache"; sourceTree = ""; }; CF1408CF629C7361332E53B88F7BD30C = { isa = PBXGroup; children = ( 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */, - A34C9825E85B3FA07446853097E9C0B3 /* Development Pods */, - B94D7768568A9992200DB461E8CF687F /* Frameworks */, - 3E595DF82C13F48E48E9AD13A3E8EF28 /* Pods */, + 4AE59552C531B968AE822B1F0187EF59 /* Development Pods */, + BA4F31F07263C99FC76E66D632A59F09 /* Frameworks */, + EDAA25C2D7AFAFFB522B52E8CD340C7A /* Pods */, 2857504C4BDB920AC3D223FF0D615803 /* Products */, 1E2853184B13600C67D7F5B5B8BF00B9 /* Targets Support Files */, ); sourceTree = ""; }; - EBF286EBBB1CEC323DAB80C30483444F /* OHPathHelpers */ = { + EDAA25C2D7AFAFFB522B52E8CD340C7A /* Pods */ = { isa = PBXGroup; children = ( - 6F43E68EAAE9C9543D3B81CDA03083A9 /* OHPathHelpers.h */, - 13FC466ED8E79B6C9C6D5E75DD44443D /* OHPathHelpers.m */, + 607A551AC74E8A142E26431803A9BA90 /* Nimble */, + 5341168511678A57A9B86AE1067C1412 /* OHHTTPStubs */, + 926ED0D0B5E7CA28500FE1418FB2523C /* Quick */, ); - name = OHPathHelpers; + name = Pods; sourceTree = ""; }; - F66C08D27C8584A00BF3263EB7B6BBBF /* JSON */ = { + EE7E3BE495A8241267FA02076CB2F89B /* Support Files */ = { isa = PBXGroup; children = ( - 22DE8F4275F435E33B71AE648F2C0C04 /* OHHTTPStubsResponse+JSON.h */, - B4D8E99D7468D22A7051E13B20BD6531 /* OHHTTPStubsResponse+JSON.m */, + 25ABC64B3B98170AD62759D33060014C /* Quick.modulemap */, + 7398FEEC1BD462709E631A3212AEB294 /* Quick.xcconfig */, + D3DACFB2D43676794CFBF3FD2FD622DF /* Quick-dummy.m */, + 8C522762B935C227D5001482883F11CF /* Quick-Info.plist */, + 9FC566102DFDBA768FA7C6121AD3BA4B /* Quick-prefix.pch */, + 4293857848F9EB31813D13DFC509E912 /* Quick-umbrella.h */, ); - name = JSON; + name = "Support Files"; + path = "../Target Support Files/Quick"; sourceTree = ""; }; - FC8DB4C4EA329AD6EBE032DB8DF259A5 /* Support Files */ = { + F195732A2E071DC854C479C179ED8354 /* DiskCache */ = { isa = PBXGroup; children = ( - F69B72BB6858EA6EE8B07BC5431D70F5 /* OHHTTPStubs.modulemap */, - 48A1662B8E8DC7361A127F08C70BC0FA /* OHHTTPStubs.xcconfig */, - EE753723EFC2EAC03249D40367D471D2 /* OHHTTPStubs-dummy.m */, - AF37B8CBB7C429C95B65E4D89A4773DE /* OHHTTPStubs-Info.plist */, - 9068DEBB0DB97EDDDF064E8B38FF760C /* OHHTTPStubs-prefix.pch */, - F85830AF537C52FF3ADFE8707CBD714C /* OHHTTPStubs-umbrella.h */, + A53D33487DA081D790A9D9B55EA9CDCC /* DiskCache.swift */, + 27AB8FE0304FBDFFD6D650AC7B1BD3D0 /* FileManager+DiskCache.swift */, + 612F544562D2709285747F57CA0F0064 /* MD5.swift */, + 71C88BAAA8CE8D030AAA3AB2DDB5935C /* String+DiskCache.swift */, + E7D8A0C4CDB3D855A990975F2741BCAB /* URL+DiskCache.swift */, ); - name = "Support Files"; - path = "../Target Support Files/OHHTTPStubs"; + name = DiskCache; + path = MapCache/Classes/DiskCache; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 1E02EB737F98B5603A1E1116B442E692 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 878F0474D84D790D1268F9AC54B51E53 /* MapCache-umbrella.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 245B2044FC0E21765220C8307E99A1BB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -877,48 +1122,55 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 51A00ABBA2BEF3913A4628399CEBD45B /* Headers */ = { + 54B3AC7F569025F4BEE5F3D8A8D19011 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 221ED892E5138A00F3CDF540E914519D /* CwlCatchException.h in Headers */, - 9F70369EF71BD9ABAFF687AF532CC20D /* CwlMachBadInstructionHandler.h in Headers */, - 19BA8AF46D9CC49E3E2CEDCAF6354442 /* CwlPreconditionTesting.h in Headers */, - C051C0411627BD5FCDA031782EB1F716 /* DSL.h in Headers */, - 3BD0C370BBCEBDEA68B8EDBD969370EB /* mach_excServer.h in Headers */, - CD6B1F146B0E157FE5B9CAFFAE77A5B5 /* Nimble-umbrella.h in Headers */, - 9BB5E9B6487FE95C710687B484C17161 /* Nimble.h in Headers */, - 8D17749611AB0C8BD51C068749D8DF68 /* NMBExceptionCapture.h in Headers */, - E0EAC85F7ACFAD998B14FCE66144000E /* NMBStringify.h in Headers */, + 77485EFA0FAF7EBBF5085756212C0FB2 /* MapCache-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - C530E4F2AB4FF57EB24A5A8F351C7501 /* Headers */ = { + 55CD468A8004898CA7EB70D7071A9A7C /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - A45E6307D6F6DEDDE44A3C0C5FBCA943 /* Pods-MapCache_Tests-umbrella.h in Headers */, + C96C1A7F6894C38A5BB0EF16A41C2A1B /* CwlCatchException.h in Headers */, + 230B95D35E0D844194E7D60EA53375F9 /* CwlMachBadInstructionHandler.h in Headers */, + E9B55E6C43FB7AB6DD2823698F782B87 /* DSL.h in Headers */, + 543A0F1350859A17BDBC32632492CB1C /* mach_excServer.h in Headers */, + 10D8EC65B5BD4AEE3934DED2BE508793 /* Nimble-umbrella.h in Headers */, + 52C19F8F7C365A559FC9A2C686F9CED4 /* Nimble.h in Headers */, + EBF0D67208D37255308A31F00DD4198F /* NMBExceptionCapture.h in Headers */, + DF40457B66380958B843F26597F99E8B /* NMBStringify.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - DFED7E40C1A10B30BFE85ED91EB577DC /* Headers */ = { + 789BF2A9515D75DE2B2453A4B5637A9D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - F7F1CE07F30CE57333B105A11EC664E5 /* Pods-MapCache_Example-umbrella.h in Headers */, + 1A8DF79F5EF3D69864A84173E7C9810E /* QCKDSL.h in Headers */, + 8E4A2F4A1EF16B63817A516CC2743619 /* Quick-umbrella.h in Headers */, + 10C8810E574F925B5CD3449B6DBE6EC0 /* Quick.h in Headers */, + BFEBC90223F66B0FF770B92B1C670BCF /* QuickConfiguration.h in Headers */, + 7EB28FEC3D0ABA1A2A6CFE57C400F74D /* QuickSpec.h in Headers */, + 76E7C7CDAA543C791A714B991F595F2B /* QuickSpecBase.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C530E4F2AB4FF57EB24A5A8F351C7501 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + A45E6307D6F6DEDDE44A3C0C5FBCA943 /* Pods-MapCache_Tests-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - EC3EC9092F61BD757267FD6009C275C5 /* Headers */ = { + DFED7E40C1A10B30BFE85ED91EB577DC /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - C912897D77798A90873A3DAD8A4BDC50 /* QCKDSL.h in Headers */, - BD379F95293A811D8E591CAC8E9FF410 /* Quick-umbrella.h in Headers */, - A9BF211D24462D531E278F2AE317AEA4 /* Quick.h in Headers */, - 34EA8D74C57BC1A6AC8C0A5B5267E56C /* QuickConfiguration.h in Headers */, - D755642ECA73CFE2E4C31CDD0DFBA42E /* QuickSpec.h in Headers */, - 403F837F9B4AC86C901D238D847A767A /* QuickSpecBase.h in Headers */, + F7F1CE07F30CE57333B105A11EC664E5 /* Pods-MapCache_Example-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -949,12 +1201,12 @@ }; 6F13695E06195A78EA8A95F8C7ED0D2F /* Nimble */ = { isa = PBXNativeTarget; - buildConfigurationList = 9AC65E53333ACA93EEB1D8EBAB58CBB6 /* Build configuration list for PBXNativeTarget "Nimble" */; + buildConfigurationList = E2DD7DB7143E990DAB72377E755E612F /* Build configuration list for PBXNativeTarget "Nimble" */; buildPhases = ( - 51A00ABBA2BEF3913A4628399CEBD45B /* Headers */, - D399136A0E6FE19CACE7F05143312FB1 /* Sources */, - 55C81EE76C6A69F1F69792A679310C68 /* Frameworks */, - D7EBE1F47ACC336A60ED6056AF3261E1 /* Resources */, + 55CD468A8004898CA7EB70D7071A9A7C /* Headers */, + 7903E287553F36350DBFD8973BC77FB0 /* Sources */, + 51E40E8536E2064486F54A495745494F /* Frameworks */, + 069C955520292BD6747392DB0F09D4B1 /* Resources */, ); buildRules = ( ); @@ -985,12 +1237,12 @@ }; C82891EAB7293DBEE916B21F57E8474D /* Quick */ = { isa = PBXNativeTarget; - buildConfigurationList = A482E8F0F5BEDCE177543007D23A5736 /* Build configuration list for PBXNativeTarget "Quick" */; + buildConfigurationList = 189D56F652B0345CC3E1073543C1B391 /* Build configuration list for PBXNativeTarget "Quick" */; buildPhases = ( - EC3EC9092F61BD757267FD6009C275C5 /* Headers */, - 507CFA4217F0978AF450319CC96D5C36 /* Sources */, - D9523B817C92EFD8BCE3CDE77F54908E /* Frameworks */, - 42E082BE7328DA6969AECE264ACD14E0 /* Resources */, + 789BF2A9515D75DE2B2453A4B5637A9D /* Headers */, + 694205E4C1C5652ABC91AB6B8D119A52 /* Sources */, + 1FB41F3B817F50C08A530AB486E92A06 /* Frameworks */, + 295DA4774C40DBFC844D2E7BA312DE5F /* Resources */, ); buildRules = ( ); @@ -1003,12 +1255,12 @@ }; D26394E74B3D99783EE42885C06E286A /* MapCache */ = { isa = PBXNativeTarget; - buildConfigurationList = 243B31D03F19B8A1D875D1E7FB12AEE3 /* Build configuration list for PBXNativeTarget "MapCache" */; + buildConfigurationList = 272115438C930133EF435FEDE8D36127 /* Build configuration list for PBXNativeTarget "MapCache" */; buildPhases = ( - 1E02EB737F98B5603A1E1116B442E692 /* Headers */, - CC761415C0443A2F0ACA9A352BDD79E5 /* Sources */, - 3EA64315E5EB0CD69C8F937119DDBC02 /* Frameworks */, - 63E180BFD732553B8F2FB89A230C7AC5 /* Resources */, + 54B3AC7F569025F4BEE5F3D8A8D19011 /* Headers */, + 5B59EFA63E1C15B0AD1C3005D510B8CD /* Sources */, + A7CFDE07CFAC9DF29E57AA54350FA102 /* Frameworks */, + 5A39DA49F15B54AD3CFA24C03D3B9D01 /* Resources */, ); buildRules = ( ); @@ -1077,35 +1329,35 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 0FC690F64DA2FCEC04C4AD1BEC983511 /* Resources */ = { + 069C955520292BD6747392DB0F09D4B1 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 3A231438AF20CA1E0B0FF627805663F0 /* Resources */ = { + 0FC690F64DA2FCEC04C4AD1BEC983511 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 42E082BE7328DA6969AECE264ACD14E0 /* Resources */ = { + 295DA4774C40DBFC844D2E7BA312DE5F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 63E180BFD732553B8F2FB89A230C7AC5 /* Resources */ = { + 3A231438AF20CA1E0B0FF627805663F0 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - D7EBE1F47ACC336A60ED6056AF3261E1 /* Resources */ = { + 5A39DA49F15B54AD3CFA24C03D3B9D01 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -1115,36 +1367,141 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 507CFA4217F0978AF450319CC96D5C36 /* Sources */ = { + 5B59EFA63E1C15B0AD1C3005D510B8CD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 55461DBF31A3076A832C0B3AB1390ADB /* CachedTileOverlay.swift in Sources */, + 2BFBDAFBEB69F68DC79A4A644C8C7838 /* CachedTileOverlayRenderer.swift in Sources */, + 988CFD7CD7B73314742EEFBF0AC5617B /* DiskCache.swift in Sources */, + DCCBBA9E39573DD44831535086342FD8 /* FileManager+DiskCache.swift in Sources */, + 5956BEDC9BBE97111789E571025AD511 /* LoadTileMode.swift in Sources */, + 97764844A8C438827D068D3B36E30797 /* Log.swift in Sources */, + 42ECC5EB8F2C661D9AC6B5DFED33D799 /* MapCache-dummy.m in Sources */, + 0A855031B215AE008389192579F9F680 /* MapCache.swift in Sources */, + 7EAF5AB5544E93C6DAB005DABBE88479 /* MapCacheConfig.swift in Sources */, + AF2BC5CE9E9C800699861D8BF2A22AC8 /* MapCacheProtocol.swift in Sources */, + C9C4379FEC8CED22396E95A1F0A2624C /* MD5.swift in Sources */, + E58AAF6616E9391EB04F8D239D17DCCF /* MKMapView+MapCache.swift in Sources */, + BE3B4B7C1DEF344A90A5A8E5A411724A /* MKTileOverlayPath+MapCache.swift in Sources */, + 8DB2AB6A900F8B759671367838B2BDC2 /* MKZoomScale+MapCache.swift in Sources */, + C55EAB2A06FE8D7F06B19B04103A8732 /* RegionDownloader.swift in Sources */, + FDC3291ADDDFF7AF558972ED5ED3361B /* RegionDownloaderDelegate.swift in Sources */, + 2756AC1E77E2B6810DB80EEFE8E8850D /* String+DiskCache.swift in Sources */, + 8992CD3A1E62B1BC79D5A8D287F7CD42 /* TileCoords.swift in Sources */, + F0929D1E0ABB52207BAE6CD8E9A12387 /* TileCoordsRegion.swift in Sources */, + 43B4841966D44AF9953A92B76CCC9B78 /* TileRange.swift in Sources */, + 94A71871F05740B4F124E87BE47FB2DB /* TileRangeIterator.swift in Sources */, + 88EBBD12DB036ACCF5847176C2073344 /* URL+DiskCache.swift in Sources */, + A24D882940B3F56F39B475022048C973 /* ZoomableTile.swift in Sources */, + BB2624D57AD7CBB874FBCB2CCDEB86AF /* ZoomRange.swift in Sources */, + CED07149A5087B86617CD542A475B3C2 /* ZoomRangeIterator.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 694205E4C1C5652ABC91AB6B8D119A52 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B9397BD911F09C73BC598D60DC04C1A7 /* Behavior.swift in Sources */, - 603A2FC60B90F1279D399DAF8104201F /* Callsite.swift in Sources */, - 7034D0B6AE91D924AB27F6B828C79EB8 /* Closures.swift in Sources */, - AE191084C68BDF1A2878978CCFBF29E2 /* Configuration.swift in Sources */, - 63B7ECA666221B5EE437EFE136434959 /* DSL.swift in Sources */, - 1E5C4F9EB261B75BECC921A303CA3AA6 /* ErrorUtility.swift in Sources */, - 81FED3E061FA39538B0AA3092F6F380B /* Example.swift in Sources */, - 208F9DADCC8F01AAC14247BF0E54C863 /* ExampleGroup.swift in Sources */, - 1B4D25D41B2CE138D184DD18A534ADB2 /* ExampleHooks.swift in Sources */, - FF4C06BD3EF989D203359A47EAA0A287 /* ExampleMetadata.swift in Sources */, - 05376A2B4A599FB919C25922E08EF492 /* Filter.swift in Sources */, - C43FC4EFD9E762C454E4168953475A55 /* HooksPhase.swift in Sources */, - 88F403109D33F993ACD635A3D01134BC /* NSBundle+CurrentTestBundle.swift in Sources */, - 5FFC8254039A54540761DC5656615630 /* QCKDSL.m in Sources */, - B7977833FE910D5DB829DCCC6EA3D104 /* Quick-dummy.m in Sources */, - 26BFBD738BB96C6C730D4DC96D47A107 /* QuickConfiguration.m in Sources */, - A173703877A14EBF47A8A4FF41F7DBE6 /* QuickSelectedTestSuiteBuilder.swift in Sources */, - 712E987D79829DC53E38FC6DA1B17CFB /* QuickSpec.m in Sources */, - C6A86479B1236153B50C59E9ACB07D0D /* QuickSpecBase.m in Sources */, - 011CAC6A74AAEEAF9F54E817D1A9FD33 /* QuickTestSuite.swift in Sources */, - 01692FC85BC6ECB122F1380ECBBA6EF5 /* String+C99ExtendedIdentifier.swift in Sources */, - 01A100AE3D2AF7A7D6A6BF1A91A4EDF3 /* SuiteHooks.swift in Sources */, - 9BB2E6C13B25C0157C4BECFC9F8DF489 /* URL+FileName.swift in Sources */, - 4E737D040955550EACFE774A383EB4A2 /* World+DSL.swift in Sources */, - B5AEEFF5F31AC069BD96E8104301AD4D /* World.swift in Sources */, - 2BE5D1B1D8986048A3B0E3D73B9EE158 /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */, + 58A884856B7E64EE3C204D9EDAA14045 /* Behavior.swift in Sources */, + 7CE6049975894E447F2D4071C74F6F8F /* Callsite.swift in Sources */, + 14ECE81218F5F5C9BEF00819A7C078EC /* Closures.swift in Sources */, + B48508EB39EE315F5A00429EEA69DD63 /* Configuration.swift in Sources */, + 018228C4760DF4F8B80630BC9ACCB39E /* DSL.swift in Sources */, + BE56C54CD29F23A1C631645390E8569D /* ErrorUtility.swift in Sources */, + D2C041844A0EB4EB2E8C7B9DAA748EEB /* Example.swift in Sources */, + 9231B70907F130F31CF5717C502B780C /* ExampleGroup.swift in Sources */, + 7536DD99ACEDE673713161E597B7B447 /* ExampleHooks.swift in Sources */, + 59BF9ABA8BB14E0E4E345D13AB6D49FB /* ExampleMetadata.swift in Sources */, + AF60C00928A7AFE04E374B620EEA5F49 /* Filter.swift in Sources */, + 209F98BB7B328893FB64BA0393B4BD57 /* HooksPhase.swift in Sources */, + 887AF8C809D60140319DE71D6427F370 /* NSBundle+CurrentTestBundle.swift in Sources */, + 4ADE5FC9505A3BF7DF17AF9756585116 /* QCKDSL.m in Sources */, + 512AAF465EE936155DD9BBA92368928E /* Quick-dummy.m in Sources */, + 9FB5F3B3AAF3103848313FACD0CACBCD /* QuickConfiguration.m in Sources */, + 3D6A581E79FD9EAC1A948D8BC53F1EB0 /* QuickConfiguration.swift in Sources */, + 4E1DBC9FF76D6AD924D1356260438074 /* QuickSelectedTestSuiteBuilder.swift in Sources */, + 2F0B5199CDB717CA9F680579900ABF15 /* QuickSpec.m in Sources */, + 22B5B4ED0824E7BAF2091AAD6238A73F /* QuickSpecBase.m in Sources */, + 39382B0A1EF090D15BA6C89FC3DCB099 /* QuickTestObservation.swift in Sources */, + A7F5B07BF96955EFDC9106335235EDB2 /* QuickTestSuite.swift in Sources */, + A35159AD5A7A49BA9093F29B63DBD30D /* String+C99ExtendedIdentifier.swift in Sources */, + 94B18F2CFF543F6B2E43E84630C337E2 /* SuiteHooks.swift in Sources */, + A6CE2E672C8EB4DF57485428AFD64A3C /* URL+FileName.swift in Sources */, + C9E716023868A97D2F5B19934D93045E /* World+DSL.swift in Sources */, + F01995755687FA91F51A15ED8FD9D125 /* World.swift in Sources */, + 9E874C00792FA983399C03EC00AE326D /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7903E287553F36350DBFD8973BC77FB0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0803D3A5C37AB1E7A7D327DC326C3F7F /* AdapterProtocols.swift in Sources */, + A85403E9F906C2E74B26DFB29F83C484 /* AllPass.swift in Sources */, + A590E76A80283B9FB9A3AB36E021723F /* AssertionDispatcher.swift in Sources */, + FAF2D94B80ADF206BDE14D4FB5C70939 /* AssertionRecorder.swift in Sources */, + 9DF8F4034624C4D4B6130B377ACBCCA5 /* Async.swift in Sources */, + DD9B2D62BC7B8527A6CC05D2737674B4 /* Await.swift in Sources */, + 5004989FF230763FBA51808AA9EE49AD /* BeAKindOf.swift in Sources */, + D175D29A5DB6B6ECFF966BC035985AB4 /* BeAnInstanceOf.swift in Sources */, + C52FB32088F23958D2D96F67B0A30AA3 /* BeCloseTo.swift in Sources */, + B3A14E7D18C64299488164C04FD75E83 /* BeEmpty.swift in Sources */, + B791BCADC64C0308254FE6BEE9ADBFBA /* BeginWith.swift in Sources */, + 9231C59F68ED4A9A5EA944224F71C954 /* BeginWithPrefix.swift in Sources */, + 6BBE446491DB1CBD8C4EC0A54660565E /* BeGreaterThan.swift in Sources */, + DC1A7C98613B411576BC3474CBD69EC2 /* BeGreaterThanOrEqualTo.swift in Sources */, + 26655D8B7ABBC59035AF80295D2E8187 /* BeIdenticalTo.swift in Sources */, + D7F330FD8821513B4878BA0CD769F64E /* BeLessThan.swift in Sources */, + 79945940AD580338225CD02DE971036B /* BeLessThanOrEqual.swift in Sources */, + E6919764B414357B20730085E46D021F /* BeLogical.swift in Sources */, + 626A3DE1DAE9310FF840DDD2AD2A2C9B /* BeNil.swift in Sources */, + 327B838EF661BC49AC99190873F5DD95 /* BeVoid.swift in Sources */, + BAE453A15CC93D9864577A1FEDE4E0E7 /* Contain.swift in Sources */, + 610D686198B3BBB3906FD2DC859BAEA6 /* ContainElementSatisfying.swift in Sources */, + 114DFB67D17BD7BEF25CE042228C9D17 /* CwlBadInstructionException.swift in Sources */, + 44F78A9C4B73BB615F9F0EAE1548A20F /* CwlCatchBadInstruction.swift in Sources */, + 89DFED261F449E70AF9DB5FE5ADF7DAA /* CwlCatchException.m in Sources */, + 3DBEFDA275364CBBC008E9CA7222DED0 /* CwlCatchException.swift in Sources */, + 0B6C72C5CE197E5D1FC5BAF2B38CD18D /* CwlDarwinDefinitions.swift in Sources */, + 038EC28EC00D757505F0932ABB15D518 /* CwlMachBadInstructionHandler.m in Sources */, + A3CD90F92E7E63331CDD6D45BDF98CC1 /* DispatchTimeInterval.swift in Sources */, + 0A0D5425DC364F19FF9FC4C2DDBA4990 /* DSL+Wait.swift in Sources */, + D9280F42D370B7A50BE491101C79E80E /* DSL.m in Sources */, + B4990E8D4FFAEF51DA68F7B195158FF8 /* DSL.swift in Sources */, + F6B5D5E3FCD639EE750DE6F2ED6FF4FD /* ElementsEqual.swift in Sources */, + 6D6FEE5DE48C29438DBD66D1066453D5 /* EndWith.swift in Sources */, + AA30AF4811BF289F891D60B772ABC7F6 /* Equal.swift in Sources */, + DE3657A6A7DAF55EDDC583D060CEA51C /* Errors.swift in Sources */, + 3759C6A46C530C10CE2D39F08261239A /* Expectation.swift in Sources */, + 0ADEC83846CB2257DD5F96459B335622 /* ExpectationMessage.swift in Sources */, + CC87EF1E8E515447BCFCBC6F019EE057 /* Expression.swift in Sources */, + E1B3B56A2B3791E9363D8E5CEFB31B49 /* FailureMessage.swift in Sources */, + 8983FE0BC9271728ABB395DF206431AB /* HaveCount.swift in Sources */, + 89414D5228B7117D80C9412389FC400B /* mach_excServer.c in Sources */, + 54822D8662A32DE339917DF78A580DFD /* Match.swift in Sources */, + 3D76CD4A04044B00D7AB752D91A24EEC /* MatcherFunc.swift in Sources */, + AD3F3DEA678B9C0A1C4F0EF79BFB7505 /* MatcherProtocols.swift in Sources */, + 275F3EABB03768D6AB675F2452A3AE23 /* MatchError.swift in Sources */, + 2D01CFC489EE16DB6F945D84C4E0CD04 /* Nimble-dummy.m in Sources */, + F32BD8F634D9F82B0EE791262FEFC59C /* NimbleEnvironment.swift in Sources */, + B7A132AB2E3920D99510C0A7C9DC6A3C /* NimbleXCTestHandler.swift in Sources */, + 3B85C195B5EC040E5C16B8451E2DC9EB /* NMBExceptionCapture.m in Sources */, + 8A2DDA2570D63EA79E63B3711BFDDDBA /* NMBExpectation.swift in Sources */, + 23B1189E6BC5DFFE64CA88632EDE11BB /* NMBObjCMatcher.swift in Sources */, + 599BD5FE9D1D2B17E8733D32B413EA8A /* NMBStringify.m in Sources */, + 65D41C8FDA768DF81796B22875979AF2 /* PostNotification.swift in Sources */, + 43EB6D8B2DF972A7629EB87CD4CEFC77 /* Predicate.swift in Sources */, + 8E6C52E521C7213CC27000CEDF156F8F /* RaisesException.swift in Sources */, + F4980302BB992AECA18EB5CD294A8069 /* SatisfyAllOf.swift in Sources */, + D6C7E3D6B8C5D7C73664FEAC6F37EFB4 /* SatisfyAnyOf.swift in Sources */, + 7756FA7ED7F556FE496573BC9EB2FD8F /* SourceLocation.swift in Sources */, + 1A7668F50FBD77A351AD34A740622F12 /* Stringers.swift in Sources */, + E5420ACB746E9206169606C5C9352E50 /* ThrowAssertion.swift in Sources */, + 2A3F1E2C701876668EBF1FE1A7825995 /* ThrowError.swift in Sources */, + 77701F5CA6F8DB9091F8B9B8420FEC23 /* ToSucceed.swift in Sources */, + 9C96123C115327FBDCF2F3F7432348CC /* XCTestObservationCenter+Register.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1180,108 +1537,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CC761415C0443A2F0ACA9A352BDD79E5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 567AAC2BA1F12C08838DD4472283C5CC /* CachedTileOverlay.swift in Sources */, - AD13D4018B31C1AB08A5BEE54E9FBF05 /* DiskCache.swift in Sources */, - 58AC9FD84C77CACB085234373B549612 /* FileManager+DiskCache.swift in Sources */, - F3E92983B774801A81A5EB48AA1B2C30 /* LoadTileMode.swift in Sources */, - 9E4E9672D32604544117F33983E2968B /* Log.swift in Sources */, - 22284BFEB9D94716FFA56F62D34AB040 /* MapCache-dummy.m in Sources */, - 895A9F512520BB8C00D083C7 /* ZoomableTile.swift in Sources */, - 786F87E50A2F92B2B04B98FED840BFD9 /* MapCache.swift in Sources */, - 895A9F4D2520192900D083C7 /* MKZoomScale+MapCache.swift in Sources */, - 2F73CCD99F13564207C549DF9C80FA18 /* MapCacheConfig.swift in Sources */, - BF1FF48ABA96425848A8139D129E9028 /* MapCacheProtocol.swift in Sources */, - 08C2DA09EAAD7DFF0E929E7B44BE9A7A /* MD5.swift in Sources */, - F22487D25FC98EFAA279FD39C7225D9A /* MKMapView+MapCache.swift in Sources */, - 895A9F4B2520089C00D083C7 /* CachedTileOverlayRenderer.swift in Sources */, - 141E895949E33F72731B18B57F7C43D0 /* MKTileOverlayPath+MapCache.swift in Sources */, - 6880A2FACB91C2C25B777945144044B6 /* RegionDownloader.swift in Sources */, - 93AE33B3526FF4B6085B508ED89A3A35 /* RegionDownloaderDelegate.swift in Sources */, - C0A372B2CC7CFB555904F780C4363E56 /* String+DiskCache.swift in Sources */, - 77CE1B5168BF432E0D20721DA475A057 /* TileCoords.swift in Sources */, - 02D0F8ADBDEE4EA9C9E54FA44AB96104 /* TileCoordsRegion.swift in Sources */, - A8D0EB830EE43169528E1D181CB2DDBE /* TileRange.swift in Sources */, - 6FBD30E4450F8719EBF0C09E706C524E /* TileRangeIterator.swift in Sources */, - 9DA1AE386458782592D9B662E7A3B700 /* URL+DiskCache.swift in Sources */, - 7E4558FD855653A4754B3DAE9C9073A8 /* ZoomRange.swift in Sources */, - 6700FDE77D0692E8BA594EEF8F07CE67 /* ZoomRangeIterator.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D399136A0E6FE19CACE7F05143312FB1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B4058A2AA8486E9879F113E6F67B9679 /* AdapterProtocols.swift in Sources */, - 4203EF96811AE514D64AE069311B1575 /* AllPass.swift in Sources */, - C99BBC3F70E056CB6A3CC0516318939D /* AssertionDispatcher.swift in Sources */, - F310B21703A7BC438A09DDB96670583F /* AssertionRecorder.swift in Sources */, - DCD198D49C0A198A09525B7688EE3BC9 /* Async.swift in Sources */, - 330E8E4A6596ED625E9B34C94CC4136E /* Await.swift in Sources */, - 94DA3131D64B3D904BE28E72F1871065 /* BeAKindOf.swift in Sources */, - 9C460BA614D4B1D314A252C4C5CE1D87 /* BeAnInstanceOf.swift in Sources */, - F4877B3857C780DCDB7F413A03F95600 /* BeCloseTo.swift in Sources */, - C903AEFEEB4E73644A03FB8285543107 /* BeEmpty.swift in Sources */, - 78A51B7FCC1DFB888AAA254529013C12 /* BeginWith.swift in Sources */, - 42F76698690916E0407F51610D829412 /* BeGreaterThan.swift in Sources */, - 2391FFD3230B40E2348B5257D6296BBB /* BeGreaterThanOrEqualTo.swift in Sources */, - 52AB6461CAA9481D24835F3E48301FC6 /* BeIdenticalTo.swift in Sources */, - 9B9714C476F416AD7FD803EA1184D113 /* BeLessThan.swift in Sources */, - 46BDEBF35D99D2CC53EF72DFC5BDCDCC /* BeLessThanOrEqual.swift in Sources */, - 8D75EC8969EA46FBD6E1BED7791A3C37 /* BeLogical.swift in Sources */, - EC7EF3D5778783BD93EBC6F82016ADA9 /* BeNil.swift in Sources */, - C979EEB0159A65246F6BD2C906A8ADB7 /* BeVoid.swift in Sources */, - D34D0540ADCBF163575B6B5444B1AAF6 /* Contain.swift in Sources */, - 5B6F70DDD4C63CF6ED95291BCB633494 /* ContainElementSatisfying.swift in Sources */, - FF920E965F1CA016FF302DE8C92C5122 /* CwlBadInstructionException.swift in Sources */, - 89EE4D6DBDB79963D65AA1E67B543B6D /* CwlCatchBadInstruction.swift in Sources */, - 02A1AAA49758A955770775CD409D8635 /* CwlCatchException.m in Sources */, - CAACEBB97A7D23E6782B47A805DFED81 /* CwlCatchException.swift in Sources */, - 39133A7716CEDEB690A7DA9D12C45C4D /* CwlDarwinDefinitions.swift in Sources */, - 8A0EF19254BAC5DF0885D1FBA345E016 /* CwlMachBadInstructionHandler.m in Sources */, - 234849AD309265FD107C74357FC8C0CF /* DSL+Wait.swift in Sources */, - 7AC93EB6DCDA9226165D5BC354FE7BC6 /* DSL.m in Sources */, - A9996A6303084D17B9C439CB132A1F69 /* DSL.swift in Sources */, - 3460FEA0CEADB05D3B56C2E1CAF9590C /* ElementsEqual.swift in Sources */, - 3262B230B938C8D6522790093FEAF69D /* EndWith.swift in Sources */, - D9CFB8E5E354D7BE61D092259779F437 /* Equal.swift in Sources */, - B7662703AF8D3FFFCB0070C50FEDCC58 /* Errors.swift in Sources */, - 602E3758C0EF64AF6B7FCEA05BF5B9B9 /* Expectation.swift in Sources */, - AD69407E2FA1D39A9E09248052F2D81B /* ExpectationMessage.swift in Sources */, - E458AAE1AE9E2250F29806E5633B1860 /* Expression.swift in Sources */, - 192A3F8BEC1A99FD8712D3E09724D72C /* FailureMessage.swift in Sources */, - 7DAC86DCBC36C10F43FA5FEB819B7BF1 /* Functional.swift in Sources */, - 64E26D7D025AC4462DFA8BA66B38C9D8 /* HaveCount.swift in Sources */, - 13D2A4D59DD9612E1AA7F3182A342162 /* mach_excServer.c in Sources */, - 5578F928AEFA8B2B7CC542033590DFD6 /* Match.swift in Sources */, - 26B9FEAB3DE0C8B91709D53571752A3B /* MatcherFunc.swift in Sources */, - 44C9470137EF941955A1FDCE71D68C26 /* MatcherProtocols.swift in Sources */, - 0892D14FE7A3452423E9129D7917664B /* MatchError.swift in Sources */, - B71070160CF07EFA99ED0445B0D191E7 /* Nimble-dummy.m in Sources */, - ECCA1FA570A912E8CDB54EB843F1D030 /* NimbleEnvironment.swift in Sources */, - 2B350015B9F7546D0769649EE12D7D1A /* NimbleXCTestHandler.swift in Sources */, - CEE8D31A4E76BB7B350BF2A7175D4BC2 /* NMBExceptionCapture.m in Sources */, - C0C98C8C7D07E1598F20EE2F0539197D /* NMBExpectation.swift in Sources */, - 99E8019F4689A514DAC6AA40AFF7352E /* NMBObjCMatcher.swift in Sources */, - F78E35D04F09485FA5DFA72FE1AD5AB2 /* NMBStringify.m in Sources */, - 46B90B2CF2EB97B38C43A31E9A5478C2 /* PostNotification.swift in Sources */, - B6CC23C6C288F4EB9EDD3A06F1F5F094 /* Predicate.swift in Sources */, - F9E85548BF1EF8C5035BAF92233C34B6 /* RaisesException.swift in Sources */, - B79FC6E46F642C3FC74B3E6D9175B1AB /* SatisfyAllOf.swift in Sources */, - 8D543DAD9A6C0B8BF8A5DB38AD876677 /* SatisfyAnyOf.swift in Sources */, - D9D6150D329A87CBB415FD349F0C50FD /* SourceLocation.swift in Sources */, - 806B9040D79A3DC58FB56EAC16FE19BF /* Stringers.swift in Sources */, - 72FB8CEABF346A37D54CC08647489A98 /* ThrowAssertion.swift in Sources */, - B2A65EEDB5D5EC246EA68E10964FF7B3 /* ThrowError.swift in Sources */, - CF9218FF56D8EE43681150A3E1635C9A /* ToSucceed.swift in Sources */, - DB84342A0C0DEABBF7F729DE55225D82 /* XCTestObservationCenter+Register.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -1318,42 +1573,39 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 031AAFACB185B3FAFDC68F01C8E4C8DB /* Debug */ = { + 1B6BD8AB219AA9ECAA0562499BA601F4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 23D3BCD493B00F0CE281CD049CFA4E3C /* Pods-MapCache_Example.debug.xcconfig */; + baseConfigurationReference = E21AF1374D6E9404B17905C62E7C6EB8 /* Nimble.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Nimble/Nimble-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; + PRODUCT_MODULE_NAME = Nimble; + PRODUCT_NAME = Nimble; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 301FE9FE0194BECAB407F02A00B1D130 /* Release */ = { + 1DE3C96890408587FED34BA3499F71D6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EFE934A7C4114F10F3553438C691E889 /* Quick.xcconfig */; + baseConfigurationReference = 64FF983284EB51DA2419C48B63C53461 /* MapCache.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1364,18 +1616,18 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Quick/Quick-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/MapCache/MapCache-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/MapCache/MapCache-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/Quick/Quick.modulemap"; - PRODUCT_MODULE_NAME = Quick; - PRODUCT_NAME = Quick; + MODULEMAP_FILE = "Target Support Files/MapCache/MapCache.modulemap"; + PRODUCT_MODULE_NAME = MapCache; + PRODUCT_NAME = MapCache; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1383,9 +1635,42 @@ }; name = Release; }; - 47D31B5539BD1CE3B6BAAB64CA419DDC /* Debug */ = { + 443ED064E4E27B131DCAF2BD0A72A33E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7417F9F7D2958F28B87B8B6C2DB5367D /* MapCache.xcconfig */; + baseConfigurationReference = A45F40A639F932A5B509547374FB3FC6 /* Pods-MapCache_Tests.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 645772151481CFCC65006B3AA0710D3A /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 64FF983284EB51DA2419C48B63C53461 /* MapCache.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1414,7 +1699,41 @@ }; name = Debug; }; - 4BE66A09A74FD25164AAB3C2645B9B93 /* Release */ = { + 8BA28F04A1B8A6DDD2261E3EEC1F33D8 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 75BC5DCDAA9DA816051EC50473CE8C17 /* Pods-MapCache_Tests.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 8F17DC3A99F99FBAD606CE6963886315 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1462,146 +1781,19 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; SYMROOT = "${SRCROOT}/../build"; }; name = Release; }; - 4E0C664B6E3299B48C14F9CE5ABEDE34 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5EFB24964BA4EB933CC5E8F82C1FE61A /* Nimble.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Nimble/Nimble-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/Nimble/Nimble.modulemap"; - PRODUCT_MODULE_NAME = Nimble; - PRODUCT_NAME = Nimble; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 6885B77D1EFCD123015FE52DDE6C8474 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 75BC5DCDAA9DA816051EC50473CE8C17 /* Pods-MapCache_Tests.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 79250BA165394D8BB97D00EB8FA399F4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = EFE934A7C4114F10F3553438C691E889 /* Quick.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Quick/Quick-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/Quick/Quick.modulemap"; - PRODUCT_MODULE_NAME = Quick; - PRODUCT_NAME = Quick; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 7A5BBEC942ED293BAB33D11D49E5F4DB /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5EFB24964BA4EB933CC5E8F82C1FE61A /* Nimble.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Nimble/Nimble-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/Nimble/Nimble.modulemap"; - PRODUCT_MODULE_NAME = Nimble; - PRODUCT_NAME = Nimble; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 7EF7227D9B20A1D549000096ACCB23D7 /* Debug */ = { + 916E0404255105F480DC4950B7625F7A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1652,7 +1844,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1667,7 +1859,7 @@ }; 973FDED8F70824C779B775B2F9E5EEC1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 48A1662B8E8DC7361A127F08C70BC0FA /* OHHTTPStubs.xcconfig */; + baseConfigurationReference = B8C9F5F4CC1E9AB92A2AA8EF6D550405 /* OHHTTPStubs.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1696,33 +1888,61 @@ }; name = Debug; }; - CCF83F6583895202FD0C3FBD1060E5B4 /* Release */ = { + CF43B677033987618D583A536289DD7C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D3C4D4DC9E50B4FBA64B3F0B9AEA26D5 /* Pods-MapCache_Example.release.xcconfig */; + baseConfigurationReference = E21AF1374D6E9404B17905C62E7C6EB8 /* Nimble.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Nimble/Nimble-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; + PRODUCT_MODULE_NAME = Nimble; + PRODUCT_NAME = Nimble; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + D410B644B0872D1BF58E81026047F6A8 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7398FEEC1BD462709E631A3212AEB294 /* Quick.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Quick/Quick-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + MODULEMAP_FILE = "Target Support Files/Quick/Quick.modulemap"; + PRODUCT_MODULE_NAME = Quick; + PRODUCT_NAME = Quick; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1732,7 +1952,7 @@ }; D6EC4C512D46BF20992D05ABDA3F1777 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 48A1662B8E8DC7361A127F08C70BC0FA /* OHHTTPStubs.xcconfig */; + baseConfigurationReference = B8C9F5F4CC1E9AB92A2AA8EF6D550405 /* OHHTTPStubs.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1762,9 +1982,9 @@ }; name = Release; }; - EFA317FE469F928B839982225D97B1C7 /* Debug */ = { + E7E6191CA0F2B9398EEF4124E051D656 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A45F40A639F932A5B509547374FB3FC6 /* Pods-MapCache_Tests.debug.xcconfig */; + baseConfigurationReference = 23D3BCD493B00F0CE281CD049CFA4E3C /* Pods-MapCache_Example.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; @@ -1776,12 +1996,12 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests-Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -1795,32 +2015,64 @@ }; name = Debug; }; - F0871D787CFB2C72B27B7541C17E1CA7 /* Release */ = { + F329561B7F3F327106C0E05C3FF77A56 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7417F9F7D2958F28B87B8B6C2DB5367D /* MapCache.xcconfig */; + baseConfigurationReference = 7398FEEC1BD462709E631A3212AEB294 /* Quick.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/MapCache/MapCache-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/MapCache/MapCache-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Quick/Quick-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/MapCache/MapCache.modulemap"; - PRODUCT_MODULE_NAME = MapCache; - PRODUCT_NAME = MapCache; + MODULEMAP_FILE = "Target Support Files/Quick/Quick.modulemap"; + PRODUCT_MODULE_NAME = Quick; + PRODUCT_NAME = Quick; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + F507563067431E8587FF65198CC69D7A /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D3C4D4DC9E50B4FBA64B3F0B9AEA26D5 /* Pods-MapCache_Example.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1830,38 +2082,38 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 243B31D03F19B8A1D875D1E7FB12AEE3 /* Build configuration list for PBXNativeTarget "MapCache" */ = { + 189D56F652B0345CC3E1073543C1B391 /* Build configuration list for PBXNativeTarget "Quick" */ = { isa = XCConfigurationList; buildConfigurations = ( - 47D31B5539BD1CE3B6BAAB64CA419DDC /* Debug */, - F0871D787CFB2C72B27B7541C17E1CA7 /* Release */, + F329561B7F3F327106C0E05C3FF77A56 /* Debug */, + D410B644B0872D1BF58E81026047F6A8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { + 272115438C930133EF435FEDE8D36127 /* Build configuration list for PBXNativeTarget "MapCache" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7EF7227D9B20A1D549000096ACCB23D7 /* Debug */, - 4BE66A09A74FD25164AAB3C2645B9B93 /* Release */, + 645772151481CFCC65006B3AA0710D3A /* Debug */, + 1DE3C96890408587FED34BA3499F71D6 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 922F19B1A739BBFD2F4284423D72D365 /* Build configuration list for PBXNativeTarget "OHHTTPStubs" */ = { + 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 973FDED8F70824C779B775B2F9E5EEC1 /* Debug */, - D6EC4C512D46BF20992D05ABDA3F1777 /* Release */, + 916E0404255105F480DC4950B7625F7A /* Debug */, + 8F17DC3A99F99FBAD606CE6963886315 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9AC65E53333ACA93EEB1D8EBAB58CBB6 /* Build configuration list for PBXNativeTarget "Nimble" */ = { + 922F19B1A739BBFD2F4284423D72D365 /* Build configuration list for PBXNativeTarget "OHHTTPStubs" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7A5BBEC942ED293BAB33D11D49E5F4DB /* Debug */, - 4E0C664B6E3299B48C14F9CE5ABEDE34 /* Release */, + 973FDED8F70824C779B775B2F9E5EEC1 /* Debug */, + D6EC4C512D46BF20992D05ABDA3F1777 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1869,17 +2121,17 @@ A2D760F50154868091637D5D1BF21F3D /* Build configuration list for PBXNativeTarget "Pods-MapCache_Example" */ = { isa = XCConfigurationList; buildConfigurations = ( - 031AAFACB185B3FAFDC68F01C8E4C8DB /* Debug */, - CCF83F6583895202FD0C3FBD1060E5B4 /* Release */, + E7E6191CA0F2B9398EEF4124E051D656 /* Debug */, + F507563067431E8587FF65198CC69D7A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A482E8F0F5BEDCE177543007D23A5736 /* Build configuration list for PBXNativeTarget "Quick" */ = { + E2DD7DB7143E990DAB72377E755E612F /* Build configuration list for PBXNativeTarget "Nimble" */ = { isa = XCConfigurationList; buildConfigurations = ( - 79250BA165394D8BB97D00EB8FA399F4 /* Debug */, - 301FE9FE0194BECAB407F02A00B1D130 /* Release */, + 1B6BD8AB219AA9ECAA0562499BA601F4 /* Debug */, + CF43B677033987618D583A536289DD7C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1887,8 +2139,8 @@ F987F1D9EE1D4F3E29EA78B77AD8A6E9 /* Build configuration list for PBXNativeTarget "Pods-MapCache_Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - EFA317FE469F928B839982225D97B1C7 /* Debug */, - 6885B77D1EFCD123015FE52DDE6C8474 /* Release */, + 443ED064E4E27B131DCAF2BD0A72A33E /* Debug */, + 8BA28F04A1B8A6DDD2261E3EEC1F33D8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Quick/README.md b/Example/Pods/Quick/README.md index 2cb397f..fc257da 100644 --- a/Example/Pods/Quick/README.md +++ b/Example/Pods/Quick/README.md @@ -3,8 +3,8 @@ [![Build Status](https://travis-ci.org/Quick/Quick.svg?branch=master)](https://travis-ci.org/Quick/Quick) [![CocoaPods](https://img.shields.io/cocoapods/v/Quick.svg)](https://cocoapods.org/pods/Quick) [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) +[![Accio supported](https://img.shields.io/badge/Accio-supported-0A7CF5.svg?style=flat)](https://github.com/JamitLabs/Accio) [![Platforms](https://img.shields.io/cocoapods/p/Quick.svg)](https://cocoapods.org/pods/Quick) -[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com) Quick is a behavior-driven development framework for Swift and Objective-C. Inspired by [RSpec](https://github.com/rspec/rspec), [Specta](https://github.com/specta/specta), and [Ginkgo](https://github.com/onsi/ginkgo). @@ -45,7 +45,8 @@ Certain versions of Quick and Nimble only support certain versions of Swift. Dep |Swift version |Quick version |Nimble version | |:--------------------|:---------------|:--------------| -|Swift 4.2 |v1.3.2 or later |v7.3.2 or later| +|Swift 5.2 |v3.0.0 or later |v9.0.0 or later| +|Swift 4.2 / Swift 5 |v1.3.2 or later |v7.3.2 or later| |Swift 3 / Swift 4 |v1.0.0 or later |v5.0.0 or later| |Swift 2.2 / Swift 2.3|v0.9.3 |v4.1.0 | diff --git a/Example/Pods/Quick/Sources/Quick/Behavior.swift b/Example/Pods/Quick/Sources/Quick/Behavior.swift index 7dfefac..7a25a36 100644 --- a/Example/Pods/Quick/Sources/Quick/Behavior.swift +++ b/Example/Pods/Quick/Sources/Quick/Behavior.swift @@ -1,12 +1,14 @@ -/** - A `Behavior` encapsulates a set of examples that can be re-used in several locations using the `itBehavesLike` function with a context instance of the generic type. - */ - +/// A `Behavior` encapsulates a set of examples that can be re-used in several locations using the `itBehavesLike` +/// function with a context instance of the generic type. open class Behavior { - public static var name: String { return String(describing: self) } /** - override this method in your behavior to define a set of reusable examples. + Override this variable if you want to provide custom name for this example group. + */ + open class var name: String { return String(describing: self) } + + /** + Override this method in your behavior to define a set of reusable examples. This behaves just like an example group defines using `describe` or `context`--it may contain any number of `beforeEach` and `afterEach` closures, as well as any number of examples (defined using `it`). diff --git a/Example/Pods/Quick/Sources/Quick/Callsite.swift b/Example/Pods/Quick/Sources/Quick/Callsite.swift index 47b3442..33e732c 100644 --- a/Example/Pods/Quick/Sources/Quick/Callsite.swift +++ b/Example/Pods/Quick/Sources/Quick/Callsite.swift @@ -1,10 +1,12 @@ import Foundation -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) +// swiftlint:disable type_name @objcMembers public class _CallsiteBase: NSObject {} #else public class _CallsiteBase: NSObject {} +// swiftlint:enable type_name #endif // Ideally we would always use `StaticString` as the type for tracking the file name diff --git a/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift b/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift index fe33997..71b263b 100644 --- a/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift +++ b/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift @@ -19,20 +19,24 @@ public typealias ExampleFilter = (_ example: Example) -> Bool final public class Configuration: NSObject { internal let exampleHooks = ExampleHooks() internal let suiteHooks = SuiteHooks() - internal var exclusionFilters: [ExampleFilter] = [ { example in - if let pending = example.filterFlags[Filter.pending] { - return pending - } else { - return false - } - }] - internal var inclusionFilters: [ExampleFilter] = [ { example in - if let focused = example.filterFlags[Filter.focused] { - return focused - } else { - return false - } - }] + internal var exclusionFilters: [ExampleFilter] = [ + { example in // swiftlint:disable:this opening_brace + if let pending = example.filterFlags[Filter.pending] { + return pending + } else { + return false + } + }, + ] + internal var inclusionFilters: [ExampleFilter] = [ + { example in // swiftlint:disable:this opening_brace + if let focused = example.filterFlags[Filter.focused] { + return focused + } else { + return false + } + }, + ] /** Run all examples if none match the configured filters. True by default. @@ -88,13 +92,13 @@ final public class Configuration: NSObject { given closure before each example that is run. The closure passed to this method is executed before each example Quick runs, globally across the test suite. You may call this method multiple - times across mulitple +[QuickConfigure configure:] methods in order + times across multiple +[QuickConfigure configure:] methods in order to define several closures to run before each example. Note that, since Quick makes no guarantee as to the order in which +[QuickConfiguration configure:] methods are evaluated, there is no guarantee as to the order in which beforeEach closures are evaluated - either. Mulitple beforeEach defined on a single configuration, however, + either. Multiple beforeEach defined on a single configuration, however, will be executed in the order they're defined. - parameter closure: The closure to be executed before each example @@ -125,13 +129,13 @@ final public class Configuration: NSObject { given closure after each example that is run. The closure passed to this method is executed after each example Quick runs, globally across the test suite. You may call this method multiple - times across mulitple +[QuickConfigure configure:] methods in order + times across multiple +[QuickConfigure configure:] methods in order to define several closures to run after each example. Note that, since Quick makes no guarantee as to the order in which +[QuickConfiguration configure:] methods are evaluated, there is no guarantee as to the order in which afterEach closures are evaluated - either. Mulitple afterEach defined on a single configuration, however, + either. Multiple afterEach defined on a single configuration, however, will be executed in the order they're defined. - parameter closure: The closure to be executed before each example diff --git a/Example/Pods/Quick/Sources/Quick/Configuration/QuickConfiguration.swift b/Example/Pods/Quick/Sources/Quick/Configuration/QuickConfiguration.swift new file mode 100644 index 0000000..d807bfe --- /dev/null +++ b/Example/Pods/Quick/Sources/Quick/Configuration/QuickConfiguration.swift @@ -0,0 +1,78 @@ +import Foundation +import XCTest + +#if SWIFT_PACKAGE + +open class QuickConfiguration: NSObject { + open class func configure(_ configuration: Configuration) {} +} + +#endif + +extension QuickConfiguration { + #if !canImport(Darwin) + private static var configurationSubclasses: [QuickConfiguration.Type] = [] + #endif + + /// Finds all direct subclasses of QuickConfiguration and passes them to the block provided. + /// The classes are iterated over in the order that objc_getClassList returns them. + /// + /// - parameter block: A block that takes a QuickConfiguration.Type. + /// This block will be executed once for each subclass of QuickConfiguration. + private static func enumerateSubclasses(_ block: (QuickConfiguration.Type) -> Void) { + #if canImport(Darwin) + let classesCount = objc_getClassList(nil, 0) + + guard classesCount > 0 else { + return + } + + let classes = UnsafeMutablePointer.allocate(capacity: Int(classesCount)) + defer { free(classes) } + + objc_getClassList(AutoreleasingUnsafeMutablePointer(classes), classesCount) + + var configurationSubclasses: [QuickConfiguration.Type] = [] + for index in 0.. Void) { +public func it(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () throws -> Void) { World.sharedWorld.it(description, flags: flags, file: file, line: line, closure: closure) } @@ -198,7 +200,7 @@ public func pending(_ description: String, closure: () -> Void) { Use this to quickly mark a `describe` closure as pending. This disables all examples within the closure. */ -public func xdescribe(_ description: String, flags: FilterFlags, closure: () -> Void) { +public func xdescribe(_ description: String, flags: FilterFlags = [:], closure: () -> Void) { World.sharedWorld.xdescribe(description, flags: flags, closure: closure) } @@ -206,7 +208,7 @@ public func xdescribe(_ description: String, flags: FilterFlags, closure: () -> Use this to quickly mark a `context` closure as pending. This disables all examples within the closure. */ -public func xcontext(_ description: String, flags: FilterFlags, closure: () -> Void) { +public func xcontext(_ description: String, flags: FilterFlags = [:], closure: () -> Void) { xdescribe(description, flags: flags, closure: closure) } @@ -214,7 +216,7 @@ public func xcontext(_ description: String, flags: FilterFlags, closure: () -> V Use this to quickly mark an `it` closure as pending. This disables the example and ensures the code within the closure is never run. */ -public func xit(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () -> Void) { +public func xit(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () throws -> Void) { World.sharedWorld.xit(description, flags: flags, file: file, line: line, closure: closure) } @@ -245,7 +247,7 @@ public func fcontext(_ description: String, flags: FilterFlags = [:], closure: ( Use this to quickly focus an `it` closure, focusing the example. If any examples in the test suite are focused, only those examples are executed. */ -public func fit(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () -> Void) { +public func fit(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () throws -> Void) { World.sharedWorld.fit(description, flags: flags, file: file, line: line, closure: closure) } @@ -269,3 +271,5 @@ public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: FileS public func fitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, context: @escaping () -> C) { World.sharedWorld.fitBehavesLike(behavior, context: context, flags: flags, file: file, line: line) } + +// swiftlint:enable line_length diff --git a/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift b/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift index d331d69..7b4edf3 100644 --- a/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift +++ b/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift @@ -20,9 +20,10 @@ extension World { internal func describe(_ description: String, flags: FilterFlags, closure: () -> Void) { guard currentExampleMetadata == nil else { - raiseError("'describe' cannot be used inside '\(currentPhase)', 'describe' may only be used inside 'context' or 'describe'. ") + raiseError("'describe' cannot be used inside '\(currentPhase)', 'describe' may only be used inside 'context' or 'describe'.") } guard currentExampleGroup != nil else { + // swiftlint:disable:next line_length raiseError("Error: example group was not created by its parent QuickSpec spec. Check that describe() or context() was used in QuickSpec.spec() and not a more general context (i.e. an XCTestCase test)") } let group = ExampleGroup(description: description, flags: flags) @@ -32,7 +33,7 @@ extension World { internal func context(_ description: String, flags: FilterFlags, closure: () -> Void) { guard currentExampleMetadata == nil else { - raiseError("'context' cannot be used inside '\(currentPhase)', 'context' may only be used inside 'context' or 'describe'. ") + raiseError("'context' cannot be used inside '\(currentPhase)', 'context' may only be used inside 'context' or 'describe'.") } self.describe(description, flags: flags, closure: closure) } @@ -51,12 +52,12 @@ extension World { internal func beforeEach(_ closure: @escaping BeforeExampleClosure) { guard currentExampleMetadata == nil else { - raiseError("'beforeEach' cannot be used inside '\(currentPhase)', 'beforeEach' may only be used inside 'context' or 'describe'. ") + raiseError("'beforeEach' cannot be used inside '\(currentPhase)', 'beforeEach' may only be used inside 'context' or 'describe'.") } currentExampleGroup.hooks.appendBefore(closure) } -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) @objc(beforeEachWithMetadata:) internal func beforeEach(closure: @escaping BeforeExampleWithMetadataClosure) { currentExampleGroup.hooks.appendBefore(closure) @@ -69,12 +70,12 @@ extension World { internal func afterEach(_ closure: @escaping AfterExampleClosure) { guard currentExampleMetadata == nil else { - raiseError("'afterEach' cannot be used inside '\(currentPhase)', 'afterEach' may only be used inside 'context' or 'describe'. ") + raiseError("'afterEach' cannot be used inside '\(currentPhase)', 'afterEach' may only be used inside 'context' or 'describe'.") } currentExampleGroup.hooks.appendAfter(closure) } -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) @objc(afterEachWithMetadata:) internal func afterEach(closure: @escaping AfterExampleWithMetadataClosure) { currentExampleGroup.hooks.appendAfter(closure) @@ -86,15 +87,15 @@ extension World { #endif @nonobjc - internal func it(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { + internal func it(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () throws -> Void) { if beforesCurrentlyExecuting { - raiseError("'it' cannot be used inside 'beforeEach', 'it' may only be used inside 'context' or 'describe'. ") + raiseError("'it' cannot be used inside 'beforeEach', 'it' may only be used inside 'context' or 'describe'.") } if aftersCurrentlyExecuting { - raiseError("'it' cannot be used inside 'afterEach', 'it' may only be used inside 'context' or 'describe'. ") + raiseError("'it' cannot be used inside 'afterEach', 'it' may only be used inside 'context' or 'describe'.") } guard currentExampleMetadata == nil else { - raiseError("'it' cannot be used inside 'it', 'it' may only be used inside 'context' or 'describe'. ") + raiseError("'it' cannot be used inside 'it', 'it' may only be used inside 'context' or 'describe'.") } let callsite = Callsite(file: file, line: line) let example = Example(description: description, callsite: callsite, flags: flags, closure: closure) @@ -102,14 +103,14 @@ extension World { } @nonobjc - internal func fit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { + internal func fit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () throws -> Void) { var focusedFlags = flags focusedFlags[Filter.focused] = true self.it(description, flags: focusedFlags, file: file, line: line, closure: closure) } @nonobjc - internal func xit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { + internal func xit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () throws -> Void) { var pendingFlags = flags pendingFlags[Filter.pending] = true self.it(description, flags: pendingFlags, file: file, line: line, closure: closure) @@ -118,7 +119,7 @@ extension World { @nonobjc internal func itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: FileString, line: UInt) { guard currentExampleMetadata == nil else { - raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'. ") + raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'.") } let callsite = Callsite(file: file, line: line) let closure = World.sharedWorld.sharedExample(name) @@ -144,7 +145,7 @@ extension World { internal func itBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: FileString, line: UInt) { guard currentExampleMetadata == nil else { - raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'. ") + raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'.") } let callsite = Callsite(file: file, line: line) let closure = behavior.spec diff --git a/Example/Pods/Quick/Sources/Quick/Example.swift b/Example/Pods/Quick/Sources/Quick/Example.swift index 594efa0..7cef7c5 100644 --- a/Example/Pods/Quick/Sources/Quick/Example.swift +++ b/Example/Pods/Quick/Sources/Quick/Example.swift @@ -1,13 +1,12 @@ import Foundation -private var numberOfExamplesRun = 0 -private var numberOfIncludedExamples = 0 - -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) +// swiftlint:disable type_name @objcMembers public class _ExampleBase: NSObject {} #else public class _ExampleBase: NSObject {} +// swiftlint:enable type_name #endif /** @@ -31,10 +30,10 @@ final public class Example: _ExampleBase { weak internal var group: ExampleGroup? private let internalDescription: String - private let closure: () -> Void + private let closure: () throws -> Void private let flags: FilterFlags - internal init(description: String, callsite: Callsite, flags: FilterFlags, closure: @escaping () -> Void) { + internal init(description: String, callsite: Callsite, flags: FilterFlags, closure: @escaping () throws -> Void) { self.internalDescription = description self.closure = closure self.callsite = callsite @@ -65,15 +64,11 @@ final public class Example: _ExampleBase { public func run() { let world = World.sharedWorld - if numberOfIncludedExamples == 0 { - numberOfIncludedExamples = world.includedExampleCount - } - - if numberOfExamplesRun == 0 { + if world.numberOfExamplesRun == 0 { world.suiteHooks.executeBefores() } - let exampleMetadata = ExampleMetadata(example: self, exampleIndex: numberOfExamplesRun) + let exampleMetadata = ExampleMetadata(example: self, exampleIndex: world.numberOfExamplesRun) world.currentExampleMetadata = exampleMetadata defer { world.currentExampleMetadata = nil @@ -86,7 +81,22 @@ final public class Example: _ExampleBase { } group!.phase = .beforesFinished - closure() + do { + try closure() + } catch { + let description = "Test \(name) threw unexpected error: \(error.localizedDescription)" + #if SWIFT_PACKAGE + let file = callsite.file.description + #else + let file = callsite.file + #endif + QuickSpec.current.recordFailure( + withDescription: description, + inFile: file, + atLine: Int(callsite.line), + expected: false + ) + } group!.phase = .aftersExecuting for after in group!.afters { @@ -95,9 +105,9 @@ final public class Example: _ExampleBase { group!.phase = .aftersFinished world.exampleHooks.executeAfters(exampleMetadata) - numberOfExamplesRun += 1 + world.numberOfExamplesRun += 1 - if !world.isRunningAdditionalSuites && numberOfExamplesRun >= numberOfIncludedExamples { + if !world.isRunningAdditionalSuites && world.numberOfExamplesRun >= world.cachedIncludedExampleCount { world.suiteHooks.executeAfters() } } diff --git a/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift b/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift index 129bed0..5fbfadb 100644 --- a/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift +++ b/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift @@ -31,9 +31,16 @@ final public class ExampleGroup: NSObject { Returns a list of examples that belong to this example group, or to any of its descendant example groups. */ + #if canImport(Darwin) + @objc public var examples: [Example] { return childExamples + childGroups.flatMap { $0.examples } } + #else + public var examples: [Example] { + return childExamples + childGroups.flatMap { $0.examples } + } + #endif internal var name: String? { guard let parent = parent else { diff --git a/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift b/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift index b07b3bd..a8f0d77 100644 --- a/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift +++ b/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift @@ -1,10 +1,12 @@ import Foundation -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) +// swiftlint:disable type_name @objcMembers public class _ExampleMetadataBase: NSObject {} #else public class _ExampleMetadataBase: NSObject {} +// swiftlint:enable type_name #endif /** diff --git a/Example/Pods/Quick/Sources/Quick/Filter.swift b/Example/Pods/Quick/Sources/Quick/Filter.swift index 304f6ec..d7fbe8d 100644 --- a/Example/Pods/Quick/Sources/Quick/Filter.swift +++ b/Example/Pods/Quick/Sources/Quick/Filter.swift @@ -1,10 +1,12 @@ import Foundation -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) +// swiftlint:disable type_name @objcMembers public class _FilterBase: NSObject {} #else public class _FilterBase: NSObject {} +// swiftlint:enable type_name #endif /** diff --git a/Example/Pods/Quick/Sources/Quick/QuickTestObservation.swift b/Example/Pods/Quick/Sources/Quick/QuickTestObservation.swift new file mode 100644 index 0000000..e508566 --- /dev/null +++ b/Example/Pods/Quick/Sources/Quick/QuickTestObservation.swift @@ -0,0 +1,69 @@ +#if !SWIFT_PACKAGE + +import Foundation +import XCTest + +/// A dummy protocol for calling the internal `+[QuickSpec buildExamplesIfNeeded]` method +/// which is defined in Objective-C from Swift. +@objc internal protocol _QuickSpecInternal { + static func buildExamplesIfNeeded() +} + +@objc internal final class QuickTestObservation: NSObject, XCTestObservation { + @objc(sharedInstance) + static let shared = QuickTestObservation() + + // Quick hooks into this event to compile example groups for each QuickSpec subclasses. + // + // If an exception occurs when compiling examples, report it to the user. Chances are they + // included an expectation outside of a "it", "describe", or "context" block. + func testBundleWillStart(_ testBundle: Bundle) { + QuickSpec.enumerateSubclasses { specClass in + // This relies on `_QuickSpecInternal`. + (specClass as AnyClass).buildExamplesIfNeeded() + } + } +} + +// swiftlint:disable:next todo +// TODO: Unify this with QuickConfiguration's equivalent +extension QuickSpec { + internal static func enumerateSubclasses( + subclasses: [QuickSpec.Type]? = nil, + _ block: (QuickSpec.Type) -> Void + ) { + let subjects: [QuickSpec.Type] + if let subclasses = subclasses { + subjects = subclasses + } else { + let classesCount = objc_getClassList(nil, 0) + + guard classesCount > 0 else { + return + } + + let classes = UnsafeMutablePointer.allocate(capacity: Int(classesCount)) + defer { free(classes) } + + objc_getClassList(AutoreleasingUnsafeMutablePointer(classes), classesCount) + + var specSubclasses: [QuickSpec.Type] = [] + for index in 0.. [String: Any] */ public typealias SharedExampleClosure = (@escaping SharedExampleContext) -> Void -#if canImport(Darwin) && !SWIFT_PACKAGE +#if canImport(Darwin) +// swiftlint:disable type_name @objcMembers internal class _WorldBase: NSObject {} #else internal class _WorldBase: NSObject {} +// swiftlint:enable type_name #endif /** @@ -46,6 +48,8 @@ final internal class World: _WorldBase { internal var currentExampleMetadata: ExampleMetadata? + internal var numberOfExamplesRun = 0 + /** A flag that indicates whether additional test suites are being run within this test suite. This is only true within the context of Quick @@ -72,7 +76,16 @@ final internal class World: _WorldBase { private override init() {} - static let sharedWorld = World() + static private(set) var sharedWorld = World() + + static func anotherWorld(block: (World) -> T) -> T { + let previous = sharedWorld + defer { sharedWorld = previous } + + let newWorld = World() + sharedWorld = newWorld + return block(newWorld) + } // MARK: Public Interface @@ -85,8 +98,11 @@ final internal class World: _WorldBase { be mutated to change Quick's behavior. */ internal func configure(_ closure: QuickConfigurer) { - assert(!isConfigurationFinalized, - "Quick cannot be configured outside of a +[QuickConfiguration configure:] method. You should not call -[World configure:] directly. Instead, subclass QuickConfiguration and override the +[QuickConfiguration configure:] method.") + assert( + !isConfigurationFinalized, + // swiftlint:disable:next line_length + "Quick cannot be configured outside of a +[QuickConfiguration configure:] method. You should not call -[World configure:] directly. Instead, subclass QuickConfiguration and override the +[QuickConfiguration configure:] method." + ) closure(configuration) } @@ -98,6 +114,17 @@ final internal class World: _WorldBase { isConfigurationFinalized = true } + /** + Returns `true` if the root example group for the given spec class has been already initialized. + + - parameter specClass: The QuickSpec class for which is checked for the existing root example group. + - returns: Whether the root example group for the given spec class has been already initialized or not. + */ + internal func isRootExampleGroupInitialized(forSpecClass specClass: QuickSpec.Type) -> Bool { + let name = String(describing: specClass) + return specs.keys.contains(name) + } + /** Returns an internally constructed root example group for the given QuickSpec class. @@ -113,11 +140,11 @@ final internal class World: _WorldBase { it("is at the top level") {} } - - parameter cls: The QuickSpec class for which to retrieve the root example group. + - parameter specClass: The QuickSpec class for which to retrieve the root example group. - returns: The root example group for the class. */ - internal func rootExampleGroupForSpecClass(_ cls: AnyClass) -> ExampleGroup { - let name = String(describing: cls) + internal func rootExampleGroup(forSpecClass specClass: QuickSpec.Type) -> ExampleGroup { + let name = String(describing: specClass) if let group = specs[name] { return group @@ -141,24 +168,17 @@ final internal class World: _WorldBase { - parameter specClass: The QuickSpec subclass for which examples are to be returned. - returns: A list of examples to be run as test invocations. */ - internal func examples(_ specClass: AnyClass) -> [Example] { + internal func examples(forSpecClass specClass: QuickSpec.Type) -> [Example] { // 1. Grab all included examples. let included = includedExamples // 2. Grab the intersection of (a) examples for this spec, and (b) included examples. - let spec = rootExampleGroupForSpecClass(specClass).examples.filter { included.contains($0) } + let spec = rootExampleGroup(forSpecClass: specClass).examples.filter { included.contains($0) } // 3. Remove all excluded examples. return spec.filter { example in - !self.configuration.exclusionFilters.reduce(false) { $0 || $1(example) } + !self.configuration.exclusionFilters.contains { $0(example) } } } -#if canImport(Darwin) - @objc(examplesForSpecClass:) - internal func objc_examples(_ specClass: AnyClass) -> [Example] { - return examples(specClass) - } -#endif - // MARK: Internal internal func registerSharedExample(_ name: String, closure: @escaping SharedExampleClosure) { @@ -175,6 +195,8 @@ final internal class World: _WorldBase { return includedExamples.count } + internal lazy var cachedIncludedExampleCount: Int = self.includedExampleCount + internal var beforesCurrentlyExecuting: Bool { let suiteBeforesExecuting = suiteHooks.phase == .beforesExecuting let exampleBeforesExecuting = exampleHooks.phase == .beforesExecuting @@ -217,7 +239,7 @@ final internal class World: _WorldBase { private var includedExamples: [Example] { let all = allExamples let included = all.filter { example in - return self.configuration.inclusionFilters.reduce(false) { $0 || $1(example) } + return self.configuration.inclusionFilters.contains { $0(example) } } if included.isEmpty && configuration.runAllWhenEverythingFiltered { diff --git a/Example/Pods/Quick/Sources/QuickSpecBase/QuickSpecBase.m b/Example/Pods/Quick/Sources/QuickObjCRuntime/QuickSpecBase.m similarity index 60% rename from Example/Pods/Quick/Sources/QuickSpecBase/QuickSpecBase.m rename to Example/Pods/Quick/Sources/QuickObjCRuntime/QuickSpecBase.m index 10b6f7e..e452e65 100644 --- a/Example/Pods/Quick/Sources/QuickSpecBase/QuickSpecBase.m +++ b/Example/Pods/Quick/Sources/QuickObjCRuntime/QuickSpecBase.m @@ -1,22 +1,5 @@ #import "QuickSpecBase.h" -#pragma mark - _QuickSelectorWrapper - -@interface _QuickSelectorWrapper () -@property(nonatomic, assign) SEL selector; -@end - -@implementation _QuickSelectorWrapper - -- (instancetype)initWithSelector:(SEL)selector { - self = [super init]; - _selector = selector; - return self; -} - -@end - - #pragma mark - _QuickSpecBase @implementation _QuickSpecBase @@ -33,11 +16,11 @@ - (instancetype)init { @return An array of invocations that execute the newly defined example methods. */ + (NSArray *)testInvocations { - NSArray<_QuickSelectorWrapper *> *wrappers = [self _qck_testMethodSelectors]; - NSMutableArray *invocations = [NSMutableArray arrayWithCapacity:wrappers.count]; + NSArray *selectors = [self _qck_testMethodSelectors]; + NSMutableArray *invocations = [NSMutableArray arrayWithCapacity:selectors.count]; - for (_QuickSelectorWrapper *wrapper in wrappers) { - SEL selector = wrapper.selector; + for (NSString *selectorString in selectors) { + SEL selector = NSSelectorFromString(selectorString); NSMethodSignature *signature = [self instanceMethodSignatureForSelector:selector]; NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature]; invocation.selector = selector; @@ -48,7 +31,7 @@ - (instancetype)init { return invocations; } -+ (NSArray<_QuickSelectorWrapper *> *)_qck_testMethodSelectors { ++ (NSArray *)_qck_testMethodSelectors { return @[]; } diff --git a/Example/Pods/Quick/Sources/QuickObjCRuntime/include/QuickSpecBase.h b/Example/Pods/Quick/Sources/QuickObjCRuntime/include/QuickSpecBase.h new file mode 100644 index 0000000..2ee00e7 --- /dev/null +++ b/Example/Pods/Quick/Sources/QuickObjCRuntime/include/QuickSpecBase.h @@ -0,0 +1,7 @@ +#import +#import + +@interface _QuickSpecBase : XCTestCase ++ (NSArray *)_qck_testMethodSelectors; +- (instancetype)init NS_DESIGNATED_INITIALIZER; +@end diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m b/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m index 17beaa7..a51a8bd 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m @@ -7,36 +7,6 @@ #import #endif -typedef void (^QCKClassEnumerationBlock)(Class klass); - -/** - Finds all direct subclasses of the given class and passes them to the block provided. - The classes are iterated over in the order that objc_getClassList returns them. - - @param klass The base class to find subclasses of. - @param block A block that takes a Class. This block will be executed once for each subclass of klass. - */ -void qck_enumerateSubclasses(Class klass, QCKClassEnumerationBlock block) { - Class *classes = NULL; - int classesCount = objc_getClassList(NULL, 0); - - if (classesCount > 0) { - classes = (Class *)calloc(sizeof(Class), classesCount); - classesCount = objc_getClassList(classes, classesCount); - - Class subclass, superclass; - for(int i = 0; i < classesCount; i++) { - subclass = classes[i]; - superclass = class_getSuperclass(subclass); - if (superclass == klass && block) { - block(subclass); - } - } - - free(classes); - } -} - @implementation QuickConfiguration #pragma mark - Object Lifecycle @@ -65,19 +35,8 @@ - (instancetype)init { + (void)initialize { // Only enumerate over the subclasses of QuickConfiguration, not any of its subclasses. if ([self class] == [QuickConfiguration class]) { - - // Only enumerate over subclasses once, even if +[QuickConfiguration initialize] - // were to be called several times. This is necessary because +[QuickSpec initialize] - // manually calls +[QuickConfiguration initialize]. - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - qck_enumerateSubclasses([QuickConfiguration class], ^(__unsafe_unretained Class klass) { - [[World sharedWorld] configure:^(Configuration *configuration) { - [klass configure:configuration]; - }]; - }); - [[World sharedWorld] finalizeConfiguration]; - }); + World *world = [World sharedWorld]; + [self configureSubclassesIfNeededWithWorld:world]; } } diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m b/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m index ed70d35..90ac7c6 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m @@ -17,39 +17,6 @@ @implementation QuickSpec #pragma mark - XCTestCase Overrides -/** - The runtime sends initialize to each class in a program just before the class, or any class - that inherits from it, is sent its first message from within the program. QuickSpec hooks into - this event to compile the example groups for this spec subclass. - - If an exception occurs when compiling the examples, report it to the user. Chances are they - included an expectation outside of a "it", "describe", or "context" block. - */ -+ (void)initialize { - [QuickConfiguration initialize]; - - World *world = [World sharedWorld]; - [world performWithCurrentExampleGroup:[world rootExampleGroupForSpecClass:self] closure:^{ - QuickSpec *spec = [self new]; - - @try { - [spec spec]; - } - @catch (NSException *exception) { - [NSException raise:NSInternalInconsistencyException - format:@"An exception occurred when building Quick's example groups.\n" - @"Some possible reasons this might happen include:\n\n" - @"- An 'expect(...).to' expectation was evaluated outside of " - @"an 'it', 'context', or 'describe' block\n" - @"- 'sharedExamples' was called twice with the same name\n" - @"- 'itBehavesLike' was called with a name that is not registered as a shared example\n\n" - @"Here's the original exception: '%@', reason: '%@', userInfo: '%@'", - exception.name, exception.reason, exception.userInfo]; - } - [self testInvocations]; - }]; -} - /** Invocations for each test method in the test case. QuickSpec overrides this method to define a new method for each example defined in +[QuickSpec spec]. @@ -85,6 +52,42 @@ + (QuickSpec*) current { #pragma mark - Internal Methods +/** + Runs the `spec` method and builds the examples for this class. + + It's safe to call this method multiple times. If the examples for the class have been built, invocation + of this method has no effect. + */ ++ (void)buildExamplesIfNeeded { + [QuickConfiguration class]; + World *world = [World sharedWorld]; + + if ([world isRootExampleGroupInitializedForSpecClass:[self class]]) { + // The examples fot this subclass have been already built. Skipping. + return; + } + + ExampleGroup *rootExampleGroup = [world rootExampleGroupForSpecClass:[self class]]; + [world performWithCurrentExampleGroup:rootExampleGroup closure:^{ + QuickSpec *spec = [self new]; + + @try { + [spec spec]; + } + @catch (NSException *exception) { + [NSException raise:NSInternalInconsistencyException + format:@"An exception occurred when building Quick's example groups.\n" + @"Some possible reasons this might happen include:\n\n" + @"- An 'expect(...).to' expectation was evaluated outside of " + @"an 'it', 'context', or 'describe' block\n" + @"- 'sharedExamples' was called twice with the same name\n" + @"- 'itBehavesLike' was called with a name that is not registered as a shared example\n\n" + @"Here's the original exception: '%@', reason: '%@', userInfo: '%@'", + exception.name, exception.reason, exception.userInfo]; + } + }]; +} + /** QuickSpec uses this method to dynamically define a new instance method for the given example. The instance method runs the example, catching any exceptions. @@ -136,14 +139,29 @@ - (void)recordFailureWithDescription:(NSString *)description inFile:(NSString *)filePath atLine:(NSUInteger)lineNumber expected:(BOOL)expected { + if (self != [QuickSpec current]) { + [[QuickSpec current] recordFailureWithDescription:description + inFile:filePath + atLine:lineNumber + expected:expected]; + return; + } + if (self.example.isSharedExample) { filePath = self.example.callsite.file; lineNumber = self.example.callsite.line; } - [currentSpec.testRun recordFailureWithDescription:description - inFile:filePath - atLine:lineNumber - expected:expected]; + [super recordFailureWithDescription:description + inFile:filePath + atLine:lineNumber + expected:expected]; } @end + +#pragma mark - Test Observation + +__attribute__((constructor)) +static void registerQuickTestObservation(void) { + [[XCTestObservationCenter sharedTestObservationCenter] addTestObserver:[QuickTestObservation sharedInstance]]; +} diff --git a/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h b/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h deleted file mode 100644 index 8881ca0..0000000 --- a/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h +++ /dev/null @@ -1,11 +0,0 @@ -#import -#import - -@interface _QuickSelectorWrapper : NSObject -- (instancetype)initWithSelector:(SEL)selector; -@end - -@interface _QuickSpecBase : XCTestCase -+ (NSArray<_QuickSelectorWrapper *> *)_qck_testMethodSelectors; -- (instancetype)init NS_DESIGNATED_INITIALIZER; -@end diff --git a/Example/Pods/Target Support Files/MapCache/MapCache-Info.plist b/Example/Pods/Target Support Files/MapCache/MapCache-Info.plist index 89a577b..cc21c75 100644 --- a/Example/Pods/Target Support Files/MapCache/MapCache-Info.plist +++ b/Example/Pods/Target Support Files/MapCache/MapCache-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.6.0 + 0.8.2 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/MapCache/MapCache.xcconfig b/Example/Pods/Target Support Files/MapCache/MapCache.xcconfig index 230dae0..65f1119 100644 --- a/Example/Pods/Target Support Files/MapCache/MapCache.xcconfig +++ b/Example/Pods/Target Support Files/MapCache/MapCache.xcconfig @@ -1,6 +1,6 @@ CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/MapCache GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -OTHER_LDFLAGS = $(inherited) -framework "MapKit" -framework "UIKit" +OTHER_LDFLAGS = $(inherited) -framework "Foundation" -framework "MapKit" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Nimble/Nimble-Info.plist b/Example/Pods/Target Support Files/Nimble/Nimble-Info.plist index 17b8536..ee83e4d 100644 --- a/Example/Pods/Target Support Files/Nimble/Nimble-Info.plist +++ b/Example/Pods/Target Support Files/Nimble/Nimble-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 8.0.1 + 9.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/Nimble/Nimble-umbrella.h b/Example/Pods/Target Support Files/Nimble/Nimble-umbrella.h index 3a2c2c8..15ed932 100644 --- a/Example/Pods/Target Support Files/Nimble/Nimble-umbrella.h +++ b/Example/Pods/Target Support Files/Nimble/Nimble-umbrella.h @@ -17,7 +17,6 @@ #import "CwlCatchException.h" #import "CwlMachBadInstructionHandler.h" #import "mach_excServer.h" -#import "CwlPreconditionTesting.h" FOUNDATION_EXPORT double NimbleVersionNumber; FOUNDATION_EXPORT const unsigned char NimbleVersionString[]; diff --git a/Example/Pods/Target Support Files/Nimble/Nimble.xcconfig b/Example/Pods/Target Support Files/Nimble/Nimble.xcconfig index 51f805f..908c938 100644 --- a/Example/Pods/Target Support Files/Nimble/Nimble.xcconfig +++ b/Example/Pods/Target Support Files/Nimble/Nimble.xcconfig @@ -1,6 +1,8 @@ APPLICATION_EXTENSION_API_ONLY = YES CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Nimble +DEFINES_MODULE = YES ENABLE_BITCODE = NO +ENABLE_TESTING_SEARCH_PATHS = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 OTHER_LDFLAGS = $(inherited) -Xlinker -no_application_extension -weak-lswiftXCTest -weak_framework "XCTest" diff --git a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.markdown index cb22669..0a393ab 100644 --- a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.markdown @@ -3,7 +3,7 @@ This application makes use of the following third party libraries: ## MapCache -Copyright (c) 2019 Juan M. Merlos @merlos +Copyright (c) 2019-2020 Juan M. Merlos @merlos Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.plist index 0ebd392..831c6b3 100644 --- a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example-acknowledgements.plist @@ -14,7 +14,7 @@ FooterText - Copyright (c) 2019 Juan M. Merlos @merlos + Copyright (c) 2019-2020 Juan M. Merlos @merlos Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.debug.xcconfig index 78d6273..f149520 100644 --- a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.debug.xcconfig @@ -3,7 +3,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MapCache" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MapCache/MapCache.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "MapCache" -framework "MapKit" -framework "UIKit" +OTHER_LDFLAGS = $(inherited) -framework "Foundation" -framework "MapCache" -framework "MapKit" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.release.xcconfig b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.release.xcconfig index 78d6273..f149520 100644 --- a/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MapCache_Example/Pods-MapCache_Example.release.xcconfig @@ -3,7 +3,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MapCache" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MapCache/MapCache.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "MapCache" -framework "MapKit" -framework "UIKit" +OTHER_LDFLAGS = $(inherited) -framework "Foundation" -framework "MapCache" -framework "MapKit" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.debug.xcconfig index 59a09a8..f35aec9 100644 --- a/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.debug.xcconfig @@ -3,7 +3,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Framewo GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MapCache/MapCache.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Nimble/Nimble.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/OHHTTPStubs/OHHTTPStubs.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Quick/Quick.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "CFNetwork" -framework "Foundation" -framework "MapCache" -framework "MapKit" -framework "Nimble" -framework "OHHTTPStubs" -framework "Quick" -framework "UIKit" -framework "XCTest" -weak_framework "XCTest" +OTHER_LDFLAGS = $(inherited) -framework "CFNetwork" -framework "Foundation" -framework "MapCache" -framework "MapKit" -framework "Nimble" -framework "OHHTTPStubs" -framework "Quick" -framework "XCTest" -weak_framework "XCTest" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.release.xcconfig b/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.release.xcconfig index 59a09a8..f35aec9 100644 --- a/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MapCache_Tests/Pods-MapCache_Tests.release.xcconfig @@ -3,7 +3,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Framewo GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MapCache/MapCache.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Nimble/Nimble.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/OHHTTPStubs/OHHTTPStubs.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Quick/Quick.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "CFNetwork" -framework "Foundation" -framework "MapCache" -framework "MapKit" -framework "Nimble" -framework "OHHTTPStubs" -framework "Quick" -framework "UIKit" -framework "XCTest" -weak_framework "XCTest" +OTHER_LDFLAGS = $(inherited) -framework "CFNetwork" -framework "Foundation" -framework "MapCache" -framework "MapKit" -framework "Nimble" -framework "OHHTTPStubs" -framework "Quick" -framework "XCTest" -weak_framework "XCTest" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Quick/Quick-Info.plist b/Example/Pods/Target Support Files/Quick/Quick-Info.plist index 7f71fff..4522675 100644 --- a/Example/Pods/Target Support Files/Quick/Quick-Info.plist +++ b/Example/Pods/Target Support Files/Quick/Quick-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.1.0 + 3.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/Quick/Quick.xcconfig b/Example/Pods/Target Support Files/Quick/Quick.xcconfig index f0639f1..effec21 100644 --- a/Example/Pods/Target Support Files/Quick/Quick.xcconfig +++ b/Example/Pods/Target Support Files/Quick/Quick.xcconfig @@ -1,5 +1,6 @@ APPLICATION_EXTENSION_API_ONLY = YES CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Quick +DEFINES_MODULE = YES ENABLE_BITCODE = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 From bee14626c0a1a112e7f8d258561712aafdc64b88 Mon Sep 17 00:00:00 2001 From: merlos Date: Fri, 2 Oct 2020 20:28:22 -0400 Subject: [PATCH 03/20] fixed tests that were compatible with new version of nimble/quick --- Example/Tests/DiskCache/DiskCacheSpecs.swift | 6 +++--- Example/Tests/RegionDownloaderSpecs.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Example/Tests/DiskCache/DiskCacheSpecs.swift b/Example/Tests/DiskCache/DiskCacheSpecs.swift index 1a94917..83ffad7 100644 --- a/Example/Tests/DiskCache/DiskCacheSpecs.swift +++ b/Example/Tests/DiskCache/DiskCacheSpecs.swift @@ -108,7 +108,7 @@ class DiskCacheSpecs: QuickSpec { result = $0 }) - expect(result).toEventually(equal(data1!), timeout: 2) + expect(result).toEventually(equal(data1!), timeout: .seconds(2)) } it("cannot find a file that is not in the cache") { @@ -116,7 +116,7 @@ class DiskCacheSpecs: QuickSpec { diskCache.fetchDataSync(forKey: "filename1", failure: { error in errorCode = (error! as NSError).code }, success: { _ in }) - expect(errorCode).toEventually(equal(NSFileReadNoSuchFileError), timeout: 1) + expect(errorCode).toEventually(equal(NSFileReadNoSuchFileError), timeout: .seconds(1)) } //it("can handle weird names2") { @@ -141,7 +141,7 @@ class DiskCacheSpecs: QuickSpec { result = $0 }) - expect(result).toEventually(equal(data1!), timeout: 1) + expect(result).toEventually(equal(data1!), timeout: .seconds(1)) } it("can remove the file from the cache") { diff --git a/Example/Tests/RegionDownloaderSpecs.swift b/Example/Tests/RegionDownloaderSpecs.swift index 6c5937a..3c852ec 100644 --- a/Example/Tests/RegionDownloaderSpecs.swift +++ b/Example/Tests/RegionDownloaderSpecs.swift @@ -103,7 +103,7 @@ class RegionDownloaderSpecs: QuickSpec { let delegate = DelegateTest() downloader.delegate = delegate downloader.start() - expect(delegate.finished).toEventually(beTrue(), timeout: 10) + expect(delegate.finished).toEventually(beTrue(), timeout: .seconds(10)) } } From 38b77fa405704c4c5d654aa5cd45adbaa821b12b Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 08:12:50 -0400 Subject: [PATCH 04/20] Updated deployment target to 9.0 --- Example/Pods/Pods.xcodeproj/project.pbxproj | 18 +++++++----------- MapCache.podspec | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 196d310..73ce1f4 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -846,7 +846,6 @@ 1255304D95981C18B0971B5589546D45 /* Support Files */, 065FBFC9C845CA751679BE6A4D6DF6E7 /* Swift */, ); - name = OHHTTPStubs; path = OHHTTPStubs; sourceTree = ""; }; @@ -925,7 +924,6 @@ F8521BC982C001EC7011982256FA3C7E /* XCTestObservationCenter+Register.m */, 8FB65044D9E2790396404CA21D5E1E31 /* Support Files */, ); - name = Nimble; path = Nimble; sourceTree = ""; }; @@ -997,7 +995,6 @@ D070F8A978F25B5C3E57C5C8869AEAF3 /* XCTestSuite+QuickTestSuiteBuilder.m */, EE7E3BE495A8241267FA02076CB2F89B /* Support Files */, ); - name = Quick; path = Quick; sourceTree = ""; }; @@ -1619,7 +1616,7 @@ GCC_PREFIX_HEADER = "Target Support Files/MapCache/MapCache-prefix.pch"; INFOPLIST_FILE = "Target Support Files/MapCache/MapCache-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/MapCache/MapCache.modulemap"; PRODUCT_MODULE_NAME = MapCache; @@ -1684,7 +1681,7 @@ GCC_PREFIX_HEADER = "Target Support Files/MapCache/MapCache-prefix.pch"; INFOPLIST_FILE = "Target Support Files/MapCache/MapCache-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/MapCache/MapCache.modulemap"; PRODUCT_MODULE_NAME = MapCache; @@ -1786,8 +1783,7 @@ MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; SYMROOT = "${SRCROOT}/../build"; }; @@ -1873,7 +1869,7 @@ GCC_PREFIX_HEADER = "Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch"; INFOPLIST_FILE = "Target Support Files/OHHTTPStubs/OHHTTPStubs-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/OHHTTPStubs/OHHTTPStubs.modulemap"; PRODUCT_MODULE_NAME = OHHTTPStubs; @@ -1934,7 +1930,7 @@ GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; INFOPLIST_FILE = "Target Support Files/Quick/Quick-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/Quick/Quick.modulemap"; PRODUCT_MODULE_NAME = Quick; @@ -1966,7 +1962,7 @@ GCC_PREFIX_HEADER = "Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch"; INFOPLIST_FILE = "Target Support Files/OHHTTPStubs/OHHTTPStubs-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/OHHTTPStubs/OHHTTPStubs.modulemap"; PRODUCT_MODULE_NAME = OHHTTPStubs; @@ -2030,7 +2026,7 @@ GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; INFOPLIST_FILE = "Target Support Files/Quick/Quick-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/Quick/Quick.modulemap"; PRODUCT_MODULE_NAME = Quick; diff --git a/MapCache.podspec b/MapCache.podspec index 7b8d428..49f85df 100644 --- a/MapCache.podspec +++ b/MapCache.podspec @@ -28,7 +28,7 @@ DESC s.swift_version = '5.0' s.source_files = 'MapCache/Classes/**/*' - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.10' # s.resource_bundles = { # 'MapCache' => ['MapCache/Assets/*.png'] From 724b8844f6cbc1bfcef1041cac3b0acf0b7d3a7b Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 08:15:14 -0400 Subject: [PATCH 05/20] removed references to docs files ( I thought I already did this...= --- .../xcschemes/MapCache-Example.xcscheme | 26 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 264 +----------------- 2 files changed, 22 insertions(+), 268 deletions(-) diff --git a/Example/MapCache.xcodeproj/xcshareddata/xcschemes/MapCache-Example.xcscheme b/Example/MapCache.xcodeproj/xcshareddata/xcschemes/MapCache-Example.xcscheme index 7e66224..0c17add 100644 --- a/Example/MapCache.xcodeproj/xcshareddata/xcschemes/MapCache-Example.xcscheme +++ b/Example/MapCache.xcodeproj/xcshareddata/xcschemes/MapCache-Example.xcscheme @@ -40,9 +40,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "YES" - shouldUseLaunchSchemeArgsEnv = "YES"> + onlyGenerateCoverageForSpecifiedTargets = "YES"> + + + + - - - - - - - - Date: Sat, 3 Oct 2020 08:39:30 -0400 Subject: [PATCH 06/20] Fixed documentation --- MapCache/Classes/ZoomableTile.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MapCache/Classes/ZoomableTile.swift b/MapCache/Classes/ZoomableTile.swift index f0c1a60..8569114 100644 --- a/MapCache/Classes/ZoomableTile.swift +++ b/MapCache/Classes/ZoomableTile.swift @@ -21,8 +21,12 @@ public struct ZoomableTile { /// Rectangle area ocupied by this tile let rect: MKMapRect - /// Delta from given tile z to desired tile z. - /// Example: maximum zoom supported by the server is 20 and the desired tile is in zoom level 24, the delta is 4. + /// Scale over the tile of the maximumZ path. + /// It is a multiple of 2 (2, 4, 8). + /// For a zoom larger than maximumZ represents the number of tiles the original tile is divided in + /// one axis. For example, overZoom=4 means that in each axis the tile is divided in 4 as well as + /// in the Y axis. So, the original tile at maximumZ is divided in 16 subtiles. + /// The `rect`tells us, among those tiles, which one is this tile. let overZoom: Int } From 4d4afab3542e6cc67592be2de87aa5cec3c769ee Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 08:39:59 -0400 Subject: [PATCH 07/20] bump version to 0.9.0 --- MapCache.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MapCache.podspec b/MapCache.podspec index 49f85df..6451451 100644 --- a/MapCache.podspec +++ b/MapCache.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.name = 'MapCache' - s.version = '0.8.2' + s.version = '0.9.0' s.summary = 'Map caching for iOS. Support offline maps in your app.' s.description = <<-DESC Cache for iOS applications for supporting offline tile maps. Downloads and keeps tiles in disk as user browses the map. Also, it can download a complete area at all different zoom levels for a complete offline experience (beta). From 7d839d617a151403b33b922d8f5a103e25f4e940 Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 08:58:23 -0400 Subject: [PATCH 08/20] fix english warning --- Example/MapCache.xcodeproj/project.pbxproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Example/MapCache.xcodeproj/project.pbxproj b/Example/MapCache.xcodeproj/project.pbxproj index 97c51eb..c4c2519 100644 --- a/Example/MapCache.xcodeproj/project.pbxproj +++ b/Example/MapCache.xcodeproj/project.pbxproj @@ -262,10 +262,9 @@ }; buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "MapCache" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); From 27522f075ec41f9040785a0d068744484109100b Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 09:01:35 -0400 Subject: [PATCH 09/20] removed min max warnings --- Example/Tests/TileRegionSpecs.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Example/Tests/TileRegionSpecs.swift b/Example/Tests/TileRegionSpecs.swift index c0067a4..679eb26 100644 --- a/Example/Tests/TileRegionSpecs.swift +++ b/Example/Tests/TileRegionSpecs.swift @@ -55,8 +55,8 @@ class TileRegionSpecs: QuickSpec { let tileCoordsRegion2 = TileCoordsRegion(topLeft: topLeft2, bottomRight: bottomRight2) it("can provide the zoom range") { - expect(tileCoordsRegion.zoomRange.min).to(equal(10)) - expect(tileCoordsRegion.zoomRange.max).to(equal(19)) + expect(tileCoordsRegion.zoomRange.min() ).to(equal(10)) + expect(tileCoordsRegion.zoomRange.max()).to(equal(19)) } it("can return the tile ranges for a particular zoom") { From 1e92fe5a85617a1d880dc3635ce54a15da98c8eb Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 09:18:12 -0400 Subject: [PATCH 10/20] added more expects to debug github test fails --- Example/Tests/DiskCache/DiskCacheSpecs.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Example/Tests/DiskCache/DiskCacheSpecs.swift b/Example/Tests/DiskCache/DiskCacheSpecs.swift index 83ffad7..2e2a4c2 100644 --- a/Example/Tests/DiskCache/DiskCacheSpecs.swift +++ b/Example/Tests/DiskCache/DiskCacheSpecs.swift @@ -56,6 +56,7 @@ class DiskCacheSpecs: QuickSpec { cacheName = cacheBaseName + String(Int.random(in: 1..<100000000)) try! FileManager.default.removeItem(at: DiskCache.baseURL()) diskCache = DiskCache(withName: cacheName) + expect(diskCache.diskSize).to(equal(0)) } afterEach { @@ -162,6 +163,7 @@ class DiskCacheSpecs: QuickSpec { } it("can remove all items from the cache") { + expect(diskCache.diskSize).to(equal(0)) diskCache.setDataSync(data1!, forKey: filename1) expect(diskCache.diskSize).to(equal(4096)) diskCache.setDataSync(data1!, forKey: longFileName) From 04566db06f6adef56424665c391b60c5b8ecbb7f Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 11:29:07 -0400 Subject: [PATCH 11/20] add jazzy, travis and Package.swift to project --- Example/MapCache.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Example/MapCache.xcodeproj/project.pbxproj b/Example/MapCache.xcodeproj/project.pbxproj index c4c2519..6ee7192 100644 --- a/Example/MapCache.xcodeproj/project.pbxproj +++ b/Example/MapCache.xcodeproj/project.pbxproj @@ -54,6 +54,9 @@ 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 = ""; }; 86806D7962E8E2CA29F7E1EF /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; + 89293F562528CF9C00D8ABA2 /* .jazzy.yaml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; name = .jazzy.yaml; path = ../.jazzy.yaml; sourceTree = ""; }; + 89293F572528CF9C00D8ABA2 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; name = .travis.yml; path = ../.travis.yml; sourceTree = ""; }; + 89293F582528CF9C00D8ABA2 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Package.swift; path = ../Package.swift; sourceTree = ""; }; 893072CB22A47E4A008612A1 /* DiskCacheSpecs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskCacheSpecs.swift; sourceTree = ""; }; 893072CD22A47F06008612A1 /* String+DiskCacheSpecs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+DiskCacheSpecs.swift"; sourceTree = ""; }; 895E719D22B34F2A0006977C /* ZoomRangeSpecs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomRangeSpecs.swift; sourceTree = ""; }; @@ -172,6 +175,9 @@ children = ( EEF136F62BE41AE85E8E4DEA /* MapCache.podspec */, 86806D7962E8E2CA29F7E1EF /* README.md */, + 89293F562528CF9C00D8ABA2 /* .jazzy.yaml */, + 89293F572528CF9C00D8ABA2 /* .travis.yml */, + 89293F582528CF9C00D8ABA2 /* Package.swift */, 98B68CF07B3AC619DB7870E1 /* LICENSE */, ); name = "Podspec Metadata"; From debc3546e7a8f4bcde66dfe53f289c54aac4b12a Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 11:29:35 -0400 Subject: [PATCH 12/20] update travis environment to xcode12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5aef86e..4690c43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # * https://www.objc.io/issues/6-build-tools/travis-ci/ # * https://github.com/supermarin/xcpretty#usage -osx_image: xcode10.2 +osx_image: xcode12 language: swift # cache: cocoapods # podfile: Example/Podfile From 5997d33ae2367cf94e458bce12250fb39640a76d Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 11:34:19 -0400 Subject: [PATCH 13/20] In travis, update sdk to iphonesimulator14.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4690c43..ae15939 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,5 @@ before_install: script: - xcodebuild -version - xcodebuild -showsdks -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator12.2 ONLY_ACTIVE_ARCH=NO | xcpretty +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint From d4f52971b9510fc6b66ca35e84e68011b073e454 Mon Sep 17 00:00:00 2001 From: merlos Date: Sat, 3 Oct 2020 11:49:02 -0400 Subject: [PATCH 14/20] added destination in build and list devices via xcrun --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae15939..4d204a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,12 @@ before_install: # - pod install --project-directory=Example - gem install xcpretty script: + +# Display some environment info. - xcodebuild -version - xcodebuild -showsdks -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 ONLY_ACTIVE_ARCH=NO | xcpretty +- xcrun xctrace list devices + +# Build-a-bear +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint From 3002acf572c7a3e803bd1c652eccb5a99caf47fe Mon Sep 17 00:00:00 2001 From: merlos Date: Sun, 4 Oct 2020 06:32:29 -0400 Subject: [PATCH 15/20] changed default timeout and poll interval of nimble. Test with async in CI failing tests --- Example/Tests/DiskCache/DiskCacheSpecs.swift | 25 ++++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Example/Tests/DiskCache/DiskCacheSpecs.swift b/Example/Tests/DiskCache/DiskCacheSpecs.swift index 2e2a4c2..42a0bd4 100644 --- a/Example/Tests/DiskCache/DiskCacheSpecs.swift +++ b/Example/Tests/DiskCache/DiskCacheSpecs.swift @@ -11,9 +11,15 @@ import Nimble @testable import MapCache /// Unit Testing for `DiskCache` + class DiskCacheSpecs: QuickSpec { + override func spec() { - + // Increase the global timeout to 5 seconds: + Nimble.AsyncDefaults.timeout = .seconds(5) + // Slow the polling interval to 0.2 seconds: + Nimble.AsyncDefaults.pollInterval = .milliseconds(200) + describe("DiskCache initialization") { it("can create the cache folder") { let diskCache = DiskCache(withName: "path") @@ -79,7 +85,7 @@ class DiskCacheSpecs: QuickSpec { diskCache.setData(data!, forKey: filename) let filePath = diskCache.folderURL.appendingPathComponent(filename.MD5Filename()).path - expect(FileManager.default.fileExists(atPath: filePath)).toEventually(equal(true)) + expect(FileManager.default.fileExists(atPath: filePath)).toEventually(equal(true), timeout: .seconds(2)) } it("keeps track of its disk size") { @@ -120,13 +126,6 @@ class DiskCacheSpecs: QuickSpec { expect(errorCode).toEventually(equal(NSFileReadNoSuchFileError), timeout: .seconds(1)) } - //it("can handle weird names2") { - // let diskCache2 = DiskCache(withName: "weird") - // let weird1 = "ºª|!@#·$%&¬/()= ?'¿¡^`[]+*¨´{}ç;,.-<>€" - // print("weird: \(diskCache2.path(forKey: weird1))") - // diskCache2.setData(data1!, forKey: weird1) - //} - it("can add files with weird names") { let weird1 = "ºª|!@#·$%&¬/()= ?'¿¡^`[]+*¨´{}ç;,.-<>€" // print("weird: \(diskCache.path(forKey: weird1))") @@ -142,14 +141,14 @@ class DiskCacheSpecs: QuickSpec { result = $0 }) - expect(result).toEventually(equal(data1!), timeout: .seconds(1)) + expect(result).toEventually(equal(data1!), timeout: .seconds(2)) } it("can remove the file from the cache") { // add the file expect(diskCache.diskSize).to(equal(0)) diskCache.setDataSync(data1!, forKey: filename1) - expect(diskCache.diskSize).to(equal(4096)) + expect(diskCache.diskSize).toEventually(equal(4096)) // remove the file diskCache.removeData(withKey: filename1) @@ -165,9 +164,9 @@ class DiskCacheSpecs: QuickSpec { it("can remove all items from the cache") { expect(diskCache.diskSize).to(equal(0)) diskCache.setDataSync(data1!, forKey: filename1) - expect(diskCache.diskSize).to(equal(4096)) + expect(diskCache.diskSize).toEventually(equal(4096)) diskCache.setDataSync(data1!, forKey: longFileName) - expect(diskCache.diskSize).to(equal(8192)) + expect(diskCache.diskSize).toEventually(equal(8192)) diskCache.removeAllData({}) expect(diskCache.calculateDiskSize()).toEventually(equal(0)) } From 9d2a1271fe7e0ce34b8e8634b20f64dacf85b62f Mon Sep 17 00:00:00 2001 From: merlos Date: Sun, 4 Oct 2020 08:10:12 -0400 Subject: [PATCH 16/20] added debug messages for debugging travis CI --- .travis.yml | 4 +++- Example/Tests/DiskCache/DiskCacheSpecs.swift | 8 +++++--- MapCache/Classes/DiskCache/DiskCache.swift | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d204a0..0aa268b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,5 +18,7 @@ script: - xcrun xctrace list devices # Build-a-bear +- xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO + - set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty -- pod lib lint +- pod lib lint --allow-warnings diff --git a/Example/Tests/DiskCache/DiskCacheSpecs.swift b/Example/Tests/DiskCache/DiskCacheSpecs.swift index 42a0bd4..fa82d5b 100644 --- a/Example/Tests/DiskCache/DiskCacheSpecs.swift +++ b/Example/Tests/DiskCache/DiskCacheSpecs.swift @@ -145,10 +145,11 @@ class DiskCacheSpecs: QuickSpec { } it("can remove the file from the cache") { + print("----------------------------") // add the file expect(diskCache.diskSize).to(equal(0)) diskCache.setDataSync(data1!, forKey: filename1) - expect(diskCache.diskSize).toEventually(equal(4096)) + expect(diskCache.diskSize).to(equal(4096)) // remove the file diskCache.removeData(withKey: filename1) @@ -162,11 +163,12 @@ class DiskCacheSpecs: QuickSpec { } it("can remove all items from the cache") { + print("folder URL", diskCache.folderURL) expect(diskCache.diskSize).to(equal(0)) diskCache.setDataSync(data1!, forKey: filename1) - expect(diskCache.diskSize).toEventually(equal(4096)) + expect(diskCache.diskSize).to(equal(4096)) diskCache.setDataSync(data1!, forKey: longFileName) - expect(diskCache.diskSize).toEventually(equal(8192)) + expect(diskCache.diskSize).to(equal(8192)) diskCache.removeAllData({}) expect(diskCache.calculateDiskSize()).toEventually(equal(0)) } diff --git a/MapCache/Classes/DiskCache/DiskCache.swift b/MapCache/Classes/DiskCache/DiskCache.swift index 10b333a..20d2dc1 100644 --- a/MapCache/Classes/DiskCache/DiskCache.swift +++ b/MapCache/Classes/DiskCache/DiskCache.swift @@ -107,7 +107,7 @@ open class DiskCache { /// Sets the data for the key synchronously. open func setDataSync(_ data: Data, forKey key: String) { let filePath = path(forKey: key) - + Log.debug(message: "DiskCache::setDataSync filePath: \(filePath) data count: \(data.count) key: \(key) diskBlocks:\(Double(data.count) / 4096.0)") //If the file exists get the current file diskSize. let fileURL = URL(fileURLWithPath: filePath) do { @@ -117,7 +117,7 @@ open class DiskCache { do { try data.write(to: URL(fileURLWithPath: filePath), options: Data.WritingOptions.atomicWrite) } catch { - Log.error(message: "Failed to write key \(key)", error: error) + Log.error(message: "setDataSync Failed to write key: \(key) filepath: \(filePath)", error: error) } //Now add to the diskSize the file size var diskBlocks = Double(data.count) / 4096.0 From fabfeb3372740c8bdb38c390edb3c77fbfa3f2c7 Mon Sep 17 00:00:00 2001 From: merlos Date: Sun, 4 Oct 2020 09:02:37 -0400 Subject: [PATCH 17/20] Consolidated debug / error message format of DiskCache --- MapCache/Classes/DiskCache/DiskCache.swift | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MapCache/Classes/DiskCache/DiskCache.swift b/MapCache/Classes/DiskCache/DiskCache.swift index 20d2dc1..0f31a1f 100644 --- a/MapCache/Classes/DiskCache/DiskCache.swift +++ b/MapCache/Classes/DiskCache/DiskCache.swift @@ -80,7 +80,7 @@ open class DiskCache { do { try FileManager.default.createDirectory(at: self.folderURL, withIntermediateDirectories: true, attributes: nil) } catch { - Log.error(message: "Failed to create directory \(folderURL.absoluteString)", error: error) + Log.error(message: "DiskCache::init --- Failed to create directory \(folderURL.absoluteString)", error: error) } self.capacity = capacity cacheQueue.async(execute: { @@ -107,7 +107,7 @@ open class DiskCache { /// Sets the data for the key synchronously. open func setDataSync(_ data: Data, forKey key: String) { let filePath = path(forKey: key) - Log.debug(message: "DiskCache::setDataSync filePath: \(filePath) data count: \(data.count) key: \(key) diskBlocks:\(Double(data.count) / 4096.0)") + Log.debug(message: "DiskCache::setDataSync --- filePath: \(filePath) data count: \(data.count) key: \(key) diskBlocks:\(Double(data.count) / 4096.0)") //If the file exists get the current file diskSize. let fileURL = URL(fileURLWithPath: filePath) do { @@ -117,7 +117,7 @@ open class DiskCache { do { try data.write(to: URL(fileURLWithPath: filePath), options: Data.WritingOptions.atomicWrite) } catch { - Log.error(message: "setDataSync Failed to write key: \(key) filepath: \(filePath)", error: error) + Log.error(message: "DiskCache::setDataSync --- Failed to write key: \(key) filepath: \(filePath)", error: error) } //Now add to the diskSize the file size var diskBlocks = Double(data.count) / 4096.0 @@ -166,15 +166,15 @@ open class DiskCache { let filePath = self.folderURL.appendingPathComponent(filename).path do { try fileManager.removeItem(atPath: filePath) - print(" ------------- Removed path \(filename)") + Log.debug(message: "DiskCache::removeAllData --- Removed path \(filename)") } catch { - Log.error(message: "Failed to remove path \(filePath)", error: error) + Log.error(message: "DiskCache::removeAllData --- Failed to remove path \(filePath)", error: error) } } self.diskSize = self.calculateDiskSize() - print("++++++++++++++++ Size at the end \(self.diskSize)") + Log.debug(message: "DiskCache::removeAllData --- Size at the end \(self.diskSize)") } catch { - Log.error(message: "Failed to list directory", error: error) + Log.error(message: "DiskCache::removeAllData --- Failed to list directory", error: error) } if let completion = completion { DispatchQueue.main.async { @@ -193,7 +193,7 @@ open class DiskCache { do { try FileManager.default.removeItem(at: self.folderURL) } catch { - Log.error(message: "ERROR removing DiskCache folder", error: error) + Log.error(message: "Diskcache::removeCache --- Error removing DiskCache folder", error: error) } } @@ -206,7 +206,7 @@ open class DiskCache { if let data = getData() { self.setDataSync(data, forKey: key) } else { - Log.error(message: "Failed to get data for key \(key)") + Log.error(message: "DiskCache::updateAccessDate --- Failed to get data for key \(key)") } } }) @@ -220,7 +220,7 @@ open class DiskCache { currentSize = try fileManager.allocatedDiskSizeForDirectory(at: folderURL) } catch { - Log.error(message: "Failed to get diskSize of directory", error: error) + Log.error(message: "DiskCache::calculateDiskSize --- Failed to get diskSize of directory", error: error) } return currentSize } @@ -249,7 +249,7 @@ open class DiskCache { try fileManager.setAttributes([FileAttributeKey.modificationDate : now], ofItemAtPath: path) return true } catch { - Log.error(message: "Failed to update access date", error: error) + Log.error(message: "DiskCache::updateDiskAccessDate --- Failed to update access date", error: error) return false } } @@ -264,9 +264,9 @@ open class DiskCache { substract(diskSize: fileSize) } catch { if isNoSuchFileError(error) { - Log.error(message: "Failed to remove file. File not found", error: error) + Log.error(message: "DiskCache::removeFile --- Failed to remove file. File not found", error: error) } else { - Log.error(message: "Failed to remove file. Size or other error", error: error) + Log.error(message: "DiskCache::removeFile --- Failed to remove file. Size or other error", error: error) } } } @@ -279,7 +279,7 @@ open class DiskCache { if (self.diskSize >= diskSize) { self.diskSize -= diskSize } else { - Log.error(message: "Disk cache diskSize (\(self.diskSize)) is smaller than diskSize to substract (\(diskSize))") + Log.error(message: "DiskCache::diskSize --- (\(self.diskSize)) is smaller than diskSize to substract (\(diskSize))") self.diskSize = 0 } } From 6f652c2e0622fb378788ed8d75154ed6a11d4fc4 Mon Sep 17 00:00:00 2001 From: merlos Date: Sun, 4 Oct 2020 09:03:05 -0400 Subject: [PATCH 18/20] filter travis output to avoid excess log size --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0aa268b..73da216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,8 @@ script: - xcrun xctrace list devices # Build-a-bear -- xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO + +- xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | grep -E "Test Case |cache|DEBUG|MAPCACHE" - set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint --allow-warnings From 574e0ae9666c51b8060d20a046418ed1e413c62c Mon Sep 17 00:00:00 2001 From: merlos Date: Sun, 4 Oct 2020 09:44:09 -0400 Subject: [PATCH 19/20] better filtering and set -o pipefail added to first build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73da216..a744866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ script: # Build-a-bear -- xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | grep -E "Test Case |cache|DEBUG|MAPCACHE" +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | grep -E "Test Case |\[MAPCACHE\]|error:" - set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint --allow-warnings From 92e340d125ceb3330d039e03d45d61fba5cf9ca9 Mon Sep 17 00:00:00 2001 From: merlos Date: Sun, 4 Oct 2020 10:14:50 -0400 Subject: [PATCH 20/20] removed debug line in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a744866..c09d8c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ script: # Build-a-bear -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | grep -E "Test Case |\[MAPCACHE\]|error:" +#- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | grep -E "Test Case |\[MAPCACHE\]|error:" - set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint --allow-warnings