diff --git a/.travis.yml b/.travis.yml index 76c6450..fb0a86d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # * http://www.objc.io/issue-6/travis-ci.html # * https://github.com/supermarin/xcpretty#usage -osx_image: xcode7.3 +osx_image: xcode9.4 language: objective-c # cache: cocoapods # podfile: Example/Podfile @@ -10,5 +10,5 @@ language: objective-c # - gem install cocoapods # Since Travis is not always on latest version # - pod install --project-directory=Example script: -- set -o pipefail && xcodebuild test -workspace Example/MLKit.xcworkspace -scheme MLKit-Example -sdk iphonesimulator9.3 ONLY_ACTIVE_ARCH=NO | xcpretty +- set -o pipefail && xcodebuild test -workspace Example/MLKit.xcworkspace -scheme MLKit-Example -sdk iphonesimulator11.4 ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint diff --git a/Example/MLKit.xcodeproj/project.pbxproj b/Example/MLKit.xcodeproj/project.pbxproj index f1e0c68..63c337f 100644 --- a/Example/MLKit.xcodeproj/project.pbxproj +++ b/Example/MLKit.xcodeproj/project.pbxproj @@ -8,17 +8,8 @@ /* Begin PBXBuildFile section */ 16C9F55B9FB2BEAF643302B4 /* Pods_MLKit_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8829C99A800D59865185C8D0 /* Pods_MLKit_Example.framework */; }; - 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; }; - 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; }; - 607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; }; - 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; }; 7D7064C9A3631B7752642915 /* Pods_MLKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F7E553BF29858564109C95C /* Pods_MLKit_Tests.framework */; }; 9A2618FF1E6F1C5E006B9D6E /* GeneticSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2618FD1E6F1C4E006B9D6E /* GeneticSpec.swift */; }; - 9A5294461E6F22BA00506C2A /* GameScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = 9A5294451E6F22BA00506C2A /* GameScene.sks */; }; - 9A5294481E6F22C000506C2A /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5294471E6F22C000506C2A /* GameScene.swift */; }; - 9A52944A1E6F22C800506C2A /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5294491E6F22C800506C2A /* GameViewController.swift */; }; - 9A52944C1E6F232F00506C2A /* bird.atlas in Resources */ = {isa = PBXBuildFile; fileRef = 9A52944B1E6F232F00506C2A /* bird.atlas */; }; - 9A5294501E6F44E200506C2A /* GeneticOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A52944F1E6F44E200506C2A /* GeneticOperations.swift */; }; 9A54B3B81E5B5D6D0059B577 /* kc_house_data.csv in Resources */ = {isa = PBXBuildFile; fileRef = 9A54B3B71E5B5D6D0059B577 /* kc_house_data.csv */; }; 9A92AE061E6DB958000DBC84 /* LassoRegressionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A92AE051E6DB958000DBC84 /* LassoRegressionSpec.swift */; }; 9A92AE081E6DB96B000DBC84 /* MLDataManagerSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A92AE071E6DB96B000DBC84 /* MLDataManagerSpec.swift */; }; @@ -27,6 +18,16 @@ 9A92AE0E1E6DB9A4000DBC84 /* RidgeRegressionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A92AE0D1E6DB9A4000DBC84 /* RidgeRegressionSpec.swift */; }; 9A92AE101E6DB9B1000DBC84 /* NeuralNetworkSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A92AE0F1E6DB9B1000DBC84 /* NeuralNetworkSpec.swift */; }; 9A92AE141E6DBD9A000DBC84 /* CSVReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A92AE131E6DBD9A000DBC84 /* CSVReader.swift */; }; + E10B1DC72135EE7A0076E94D /* LaunchImage.png in Resources */ = {isa = PBXBuildFile; fileRef = E10B1DC62135EE7A0076E94D /* LaunchImage.png */; }; + E10B1DCA2135EEEF0076E94D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E10B1DC82135EEEE0076E94D /* LaunchScreen.storyboard */; }; + E163E7B221352514002310EB /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E163E79921352514002310EB /* GameViewController.swift */; }; + E163E7B521352514002310EB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E163E79E21352514002310EB /* Images.xcassets */; }; + E163E7B621352514002310EB /* GameScene.sks in Resources */ = {isa = PBXBuildFile; fileRef = E163E79F21352514002310EB /* GameScene.sks */; }; + E163E7B721352514002310EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E163E7A021352514002310EB /* AppDelegate.swift */; }; + E163E7B821352514002310EB /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = E163E7A121352514002310EB /* GameScene.swift */; }; + E163E7B921352514002310EB /* GeneticOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = E163E7A221352514002310EB /* GeneticOperations.swift */; }; + E163E7CB21352561002310EB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E163E7C721352561002310EB /* Main.storyboard */; }; + E163E7CC21352561002310EB /* bird.atlas in Resources */ = {isa = PBXBuildFile; fileRef = E163E7C921352561002310EB /* bird.atlas */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -58,23 +59,12 @@ 4F7E553BF29858564109C95C /* Pods_MLKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MLKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 533ED56CBC06E518D99EE4BE /* Pods-MLKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MLKit_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.debug.xcconfig"; sourceTree = ""; }; 607FACD01AFB9204008FA782 /* MLKit_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MLKit_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 607FACE51AFB9204008FA782 /* MLKit_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MLKit_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 65CE8F014155800F07E3652F /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; 6FE1BF7F8EF374CFB92CBB77 /* Pods-MLKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MLKit_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.release.xcconfig"; sourceTree = ""; }; 8829C99A800D59865185C8D0 /* Pods_MLKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MLKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9A2618FD1E6F1C4E006B9D6E /* GeneticSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneticSpec.swift; sourceTree = ""; }; - 9A4707A91E5C8F51002C2268 /* MLKit-PlayGround.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = "MLKit-PlayGround.playground"; path = "../MLKit-PlayGround.playground"; sourceTree = ""; }; - 9A5294451E6F22BA00506C2A /* GameScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = GameScene.sks; sourceTree = ""; }; - 9A5294471E6F22C000506C2A /* GameScene.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = ""; }; - 9A5294491E6F22C800506C2A /* GameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = ""; }; - 9A52944B1E6F232F00506C2A /* bird.atlas */ = {isa = PBXFileReference; lastKnownFileType = folder.skatlas; path = bird.atlas; sourceTree = ""; }; - 9A52944F1E6F44E200506C2A /* GeneticOperations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneticOperations.swift; sourceTree = ""; }; 9A54B3B71E5B5D6D0059B577 /* kc_house_data.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = kc_house_data.csv; sourceTree = ""; }; 9A92AE051E6DB958000DBC84 /* LassoRegressionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LassoRegressionSpec.swift; sourceTree = ""; }; 9A92AE071E6DB96B000DBC84 /* MLDataManagerSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLDataManagerSpec.swift; sourceTree = ""; }; @@ -84,7 +74,18 @@ 9A92AE0F1E6DB9B1000DBC84 /* NeuralNetworkSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeuralNetworkSpec.swift; sourceTree = ""; }; 9A92AE131E6DBD9A000DBC84 /* CSVReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSVReader.swift; sourceTree = ""; }; AD54BBE1B07E33FF3F5DD543 /* Pods-MLKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MLKit_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.release.xcconfig"; sourceTree = ""; }; - BCFC43680C2D8165DD3A9F1E /* MachineLearningKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = MachineLearningKit.podspec; path = ../MachineLearningKit.podspec; sourceTree = ""; }; + BCFC43680C2D8165DD3A9F1E /* MachineLearningKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = MachineLearningKit.podspec; path = ../MachineLearningKit.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + E10B1DC62135EE7A0076E94D /* LaunchImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LaunchImage.png; sourceTree = ""; }; + E10B1DC92135EEEE0076E94D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = LaunchScreen.storyboard; sourceTree = ""; }; + E163E79921352514002310EB /* GameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = ""; }; + E163E79E21352514002310EB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + E163E79F21352514002310EB /* GameScene.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = GameScene.sks; sourceTree = ""; }; + E163E7A021352514002310EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + E163E7A121352514002310EB /* GameScene.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = ""; }; + E163E7A221352514002310EB /* GeneticOperations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneticOperations.swift; sourceTree = ""; }; + E163E7A321352514002310EB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E163E7C821352561002310EB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Main.storyboard; sourceTree = ""; }; + E163E7C921352561002310EB /* bird.atlas */ = {isa = PBXFileReference; lastKnownFileType = folder.skatlas; path = bird.atlas; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -130,9 +131,10 @@ 607FACC71AFB9204008FA782 = { isa = PBXGroup; children = ( - 9A4707A91E5C8F51002C2268 /* MLKit-PlayGround.playground */, - 607FACF51AFB993E008FA782 /* Podspec Metadata */, - 607FACD21AFB9204008FA782 /* Example for MLKit */, + 1C1CAD4BD2BE393928F7BE50 /* LICENSE */, + BCFC43680C2D8165DD3A9F1E /* MachineLearningKit.podspec */, + 65CE8F014155800F07E3652F /* README.md */, + E163E79721352514002310EB /* MLKit */, 607FACE81AFB9204008FA782 /* Tests */, 607FACD11AFB9204008FA782 /* Products */, 2BB0D1DA9E4FBF6A18F70F15 /* Pods */, @@ -149,65 +151,47 @@ name = Products; sourceTree = ""; }; - 607FACD21AFB9204008FA782 /* Example for MLKit */ = { - isa = PBXGroup; - children = ( - 607FACD51AFB9204008FA782 /* AppDelegate.swift */, - 9A5294451E6F22BA00506C2A /* GameScene.sks */, - 9A52944F1E6F44E200506C2A /* GeneticOperations.swift */, - 9A5294471E6F22C000506C2A /* GameScene.swift */, - 9A5294491E6F22C800506C2A /* GameViewController.swift */, - 607FACD91AFB9204008FA782 /* Main.storyboard */, - 9A52944B1E6F232F00506C2A /* bird.atlas */, - 607FACDC1AFB9204008FA782 /* Images.xcassets */, - 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */, - 607FACD31AFB9204008FA782 /* Supporting Files */, - ); - name = "Example for MLKit"; - path = MLKit; - sourceTree = ""; - }; - 607FACD31AFB9204008FA782 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 607FACD41AFB9204008FA782 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; 607FACE81AFB9204008FA782 /* Tests */ = { isa = PBXGroup; children = ( 9A92AE131E6DBD9A000DBC84 /* CSVReader.swift */, + 9A2618FD1E6F1C4E006B9D6E /* GeneticSpec.swift */, + 607FACEA1AFB9204008FA782 /* Info.plist */, + 9A54B3B71E5B5D6D0059B577 /* kc_house_data.csv */, 9A92AE051E6DB958000DBC84 /* LassoRegressionSpec.swift */, 9A92AE071E6DB96B000DBC84 /* MLDataManagerSpec.swift */, + 9A92AE0F1E6DB9B1000DBC84 /* NeuralNetworkSpec.swift */, 9A92AE091E6DB984000DBC84 /* PolynomialRegressionSpec.swift */, - 9A92AE0B1E6DB995000DBC84 /* SimpleLinearRegressionSpec.swift */, 9A92AE0D1E6DB9A4000DBC84 /* RidgeRegressionSpec.swift */, - 9A92AE0F1E6DB9B1000DBC84 /* NeuralNetworkSpec.swift */, - 9A2618FD1E6F1C4E006B9D6E /* GeneticSpec.swift */, - 607FACE91AFB9204008FA782 /* Supporting Files */, + 9A92AE0B1E6DB995000DBC84 /* SimpleLinearRegressionSpec.swift */, ); path = Tests; sourceTree = ""; }; - 607FACE91AFB9204008FA782 /* Supporting Files */ = { + E163E79721352514002310EB /* MLKit */ = { isa = PBXGroup; children = ( - 9A54B3B71E5B5D6D0059B577 /* kc_house_data.csv */, - 607FACEA1AFB9204008FA782 /* Info.plist */, + E163E7A021352514002310EB /* AppDelegate.swift */, + E163E7C421352561002310EB /* Base.lproj */, + E163E7C921352561002310EB /* bird.atlas */, + E163E79F21352514002310EB /* GameScene.sks */, + E163E7A121352514002310EB /* GameScene.swift */, + E163E79921352514002310EB /* GameViewController.swift */, + E163E7A221352514002310EB /* GeneticOperations.swift */, + E163E79E21352514002310EB /* Images.xcassets */, + E163E7A321352514002310EB /* Info.plist */, + E10B1DC62135EE7A0076E94D /* LaunchImage.png */, ); - name = "Supporting Files"; + path = MLKit; sourceTree = ""; }; - 607FACF51AFB993E008FA782 /* Podspec Metadata */ = { + E163E7C421352561002310EB /* Base.lproj */ = { isa = PBXGroup; children = ( - BCFC43680C2D8165DD3A9F1E /* MachineLearningKit.podspec */, - 65CE8F014155800F07E3652F /* README.md */, - 1C1CAD4BD2BE393928F7BE50 /* LICENSE */, + E10B1DC82135EEEE0076E94D /* LaunchScreen.storyboard */, + E163E7C721352561002310EB /* Main.storyboard */, ); - name = "Podspec Metadata"; + path = Base.lproj; sourceTree = ""; }; /* End PBXGroup section */ @@ -222,7 +206,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, B2A28970539C0F840B7FC745 /* [CP] Embed Pods Frameworks */, - 3A8A5DE2CE9B29776BD52FBD /* [CP] Copy Pods Resources */, 9A4707BB1E5C8FCB002C2268 /* Embed Frameworks */, ); buildRules = ( @@ -243,7 +226,6 @@ 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, 24A3EFCC92C196B1ED88B40B /* [CP] Embed Pods Frameworks */, - E0D9FAAD7A176A48DE5B1E39 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -262,18 +244,18 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0820; + LastSwiftMigration = 0940; ProvisioningStyle = Automatic; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = DZV4MYF2U6; - LastSwiftMigration = 0820; + LastSwiftMigration = 0940; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -302,11 +284,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9A5294461E6F22BA00506C2A /* GameScene.sks in Resources */, - 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */, - 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */, - 9A52944C1E6F232F00506C2A /* bird.atlas in Resources */, - 607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */, + E163E7CB21352561002310EB /* Main.storyboard in Resources */, + E163E7B521352514002310EB /* Images.xcassets in Resources */, + E10B1DC72135EE7A0076E94D /* LaunchImage.png in Resources */, + E163E7B621352514002310EB /* GameScene.sks in Resources */, + E10B1DCA2135EEEF0076E94D /* LaunchScreen.storyboard in Resources */, + E163E7CC21352561002310EB /* bird.atlas in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -327,39 +310,34 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", + "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 3A8A5DE2CE9B29776BD52FBD /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; B2A28970539C0F840B7FC745 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/MachineLearningKit/MachineLearningKit.framework", + "${BUILT_PRODUCTS_DIR}/Upsurge/Upsurge.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MachineLearningKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Upsurge.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -372,13 +350,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MLKit_Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; CBF04E3B88BDFD9CA04873B6 /* [CP] Check Pods Manifest.lock */ = { @@ -387,28 +368,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MLKit_Example-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - E0D9FAAD7A176A48DE5B1E39 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -418,10 +387,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9A5294481E6F22C000506C2A /* GameScene.swift in Sources */, - 9A5294501E6F44E200506C2A /* GeneticOperations.swift in Sources */, - 9A52944A1E6F22C800506C2A /* GameViewController.swift in Sources */, - 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */, + E163E7B821352514002310EB /* GameScene.swift in Sources */, + E163E7B921352514002310EB /* GeneticOperations.swift in Sources */, + E163E7B721352514002310EB /* AppDelegate.swift in Sources */, + E163E7B221352514002310EB /* GameViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -451,20 +420,20 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 607FACD91AFB9204008FA782 /* Main.storyboard */ = { + E10B1DC82135EEEE0076E94D /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 607FACDA1AFB9204008FA782 /* Base */, + E10B1DC92135EEEE0076E94D /* Base */, ); - name = Main.storyboard; + name = LaunchScreen.storyboard; sourceTree = ""; }; - 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */ = { + E163E7C721352561002310EB /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 607FACDF1AFB9204008FA782 /* Base */, + E163E7C821352561002310EB /* Base */, ); - name = LaunchScreen.xib; + name = Main.storyboard; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -478,14 +447,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -509,7 +486,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -525,14 +502,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -549,7 +534,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -562,6 +547,7 @@ baseConfigurationReference = 533ED56CBC06E518D99EE4BE /* Pods-MLKit_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = MLKit/Info.plist; @@ -570,7 +556,8 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -579,6 +566,7 @@ baseConfigurationReference = AD54BBE1B07E33FF3F5DD543 /* Pods-MLKit_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = MLKit/Info.plist; @@ -587,7 +575,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -595,9 +583,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0A3DE73AE01ACF9939D79E62 /* Pods-MLKit_Tests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEVELOPMENT_TEAM = DZV4MYF2U6; FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", + "$(SDKROOT)/System/Library/Frameworks", "$(inherited)", ); GCC_PREPROCESSOR_DEFINITIONS = ( @@ -609,7 +598,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MLKit_Example.app/MLKit_Example"; }; name = Debug; @@ -618,9 +607,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 6FE1BF7F8EF374CFB92CBB77 /* Pods-MLKit_Tests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEVELOPMENT_TEAM = DZV4MYF2U6; FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", + "$(SDKROOT)/System/Library/Frameworks", "$(inherited)", ); INFOPLIST_FILE = Tests/Info.plist; @@ -628,7 +618,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MLKit_Example.app/MLKit_Example"; }; name = Release; diff --git a/Example/MLKit.xcodeproj/xcshareddata/xcschemes/MLKit-Example.xcscheme b/Example/MLKit.xcodeproj/xcshareddata/xcschemes/MLKit-Example.xcscheme index a2b7ab9..f247345 100644 --- a/Example/MLKit.xcodeproj/xcshareddata/xcschemes/MLKit-Example.xcscheme +++ b/Example/MLKit.xcodeproj/xcshareddata/xcschemes/MLKit-Example.xcscheme @@ -1,6 +1,6 @@ + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/MLKit/Base.lproj/LaunchScreen.storyboard b/Example/MLKit/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..8ed1290 --- /dev/null +++ b/Example/MLKit/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/MLKit/Base.lproj/LaunchScreen.xib b/Example/MLKit/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 86170b7..0000000 --- a/Example/MLKit/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/MLKit/GameScene.swift b/Example/MLKit/GameScene.swift index ebf4b47..9a6e9bf 100755 --- a/Example/MLKit/GameScene.swift +++ b/Example/MLKit/GameScene.swift @@ -310,10 +310,10 @@ class GameScene: SKScene, SKPhysicsContactDelegate { if bird.fitness >= 9.0 { print("FOUND RARE BIRD") - print(bird.brain?.layers[0].weights) - print(bird.brain?.layers[1].weights) - print(bird.brain?.layers[0].bias) - print(bird.brain?.layers[1].bias) + print(bird.brain?.layers[0].weights as Any) + print(bird.brain?.layers[1].weights as Any) + print(bird.brain?.layers[0].bias as Any) + print(bird.brain?.layers[1].bias as Any) } } @@ -396,7 +396,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate { if generation.count > currentFlappy { currentBird = generation[currentFlappy] } else { - if let bestBird = maxBird { + if maxBird != nil { currentBird = maxBird } } @@ -549,7 +549,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate { moving.speed = 0 bird.physicsBody?.collisionBitMask = worldCategory - bird.run( SKAction.rotate(byAngle: CGFloat(M_PI) * CGFloat(bird.position.y) * 0.01, duration:1), completion: {self.bird.speed = 0 }) + bird.run( SKAction.rotate(byAngle: CGFloat.pi * CGFloat(bird.position.y) * 0.01, duration:1), completion: {self.bird.speed = 0 }) // Flash background if contact is detected self.removeAction(forKey: "flash") @@ -587,7 +587,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate { moving.speed = 0 bird.physicsBody?.collisionBitMask = worldCategory - bird.run( SKAction.rotate(byAngle: CGFloat(M_PI) * CGFloat(bird.position.y) * 0.01, duration:1), completion: {self.bird.speed = 0 }) + bird.run( SKAction.rotate(byAngle: CGFloat.pi * CGFloat(bird.position.y) * 0.01, duration:1), completion: {self.bird.speed = 0 }) // Flash background if contact is detected self.removeAction(forKey: "flash") diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Contents.json index b8236c6..c8477e6 100644 --- a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,48 +1,158 @@ { + "info" : { + "author" : "xcode", + "version" : 1 + }, "images" : [ { - "idiom" : "iphone", - "size" : "20x20", + "filename" : "Icon-40.png", + "size" : "40x40", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-40@2x.png", + "size" : "40x40", + "idiom" : "ipad", "scale" : "2x" }, { + "filename" : "Icon-60@2x.png", + "size" : "60x60", "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" + "scale" : "2x" + }, + { + "filename" : "Icon-72.png", + "size" : "72x72", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-72@2x.png", + "size" : "72x72", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-76.png", + "size" : "76x76", + "idiom" : "ipad", + "scale" : "1x" }, { + "filename" : "Icon-76@2x.png", + "size" : "76x76", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-Small-50.png", + "size" : "50x50", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-Small-50@2x.png", + "size" : "50x50", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-Small.png", + "size" : "29x29", "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "Icon-Small@2x.png", "size" : "29x29", + "idiom" : "iphone", "scale" : "2x" }, { + "filename" : "Icon.png", + "size" : "57x57", "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "1x" }, { + "filename" : "Icon@2x.png", + "size" : "57x57", "idiom" : "iphone", - "size" : "40x40", "scale" : "2x" }, { + "filename" : "Icon-Small@3x.png", + "size" : "29x29", "idiom" : "iphone", - "size" : "40x40", "scale" : "3x" }, { + "filename" : "Icon-40@3x.png", + "size" : "40x40", "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Icon-60@3x.png", "size" : "60x60", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Icon-40@2x.png", + "size" : "40x40", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "Icon-Small.png", + "size" : "29x29", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Icon-Small@2x.png", + "size" : "29x29", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "Icon-83.5@2x.png", + "size" : "83.5x83.5", + "idiom" : "ipad", "scale" : "2x" }, { + "filename" : "NotificationIcon@2x.png", + "size" : "20x20", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "NotificationIcon@3x.png", + "size" : "20x20", "idiom" : "iphone", - "size" : "60x60", "scale" : "3x" + }, + { + "filename" : "NotificationIcon~ipad.png", + "size" : "20x20", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "NotificationIcon~ipad@2x.png", + "size" : "20x20", + "idiom" : "ipad", + "scale" : "2x" + }, + { + "filename" : "ios-marketing.png", + "size" : "1024x1024", + "idiom" : "ios-marketing", + "scale" : "1x" } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } + ] } \ No newline at end of file diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 0000000..46d8e1e Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 0000000..f7b66ba Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png new file mode 100644 index 0000000..fa2cb5c Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 0000000..fa2cb5c Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 0000000..c3203e8 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-72.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-72.png new file mode 100644 index 0000000..dbfad42 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-72.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png new file mode 100644 index 0000000..b7647d6 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000..03f4c8e Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 0000000..7fa69bf Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 0000000..27a09d8 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png new file mode 100644 index 0000000..00dbb55 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png new file mode 100644 index 0000000..750ba39 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small.png new file mode 100644 index 0000000..d9e1d5c Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png new file mode 100644 index 0000000..75ba309 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png new file mode 100644 index 0000000..1a27ce0 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon.png new file mode 100644 index 0000000..1185023 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon@2x.png new file mode 100644 index 0000000..bbdaf22 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/Icon@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon@2x.png new file mode 100644 index 0000000..46d8e1e Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon@3x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon@3x.png new file mode 100644 index 0000000..0f5e6ca Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon@3x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png new file mode 100644 index 0000000..fdd9ca9 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png new file mode 100644 index 0000000..46d8e1e Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/NotificationIcon~ipad@2x.png differ diff --git a/Example/MLKit/Images.xcassets/AppIcon.appiconset/ios-marketing.png b/Example/MLKit/Images.xcassets/AppIcon.appiconset/ios-marketing.png new file mode 100644 index 0000000..72bcd82 Binary files /dev/null and b/Example/MLKit/Images.xcassets/AppIcon.appiconset/ios-marketing.png differ diff --git a/Example/MLKit/LaunchImage.png b/Example/MLKit/LaunchImage.png new file mode 100644 index 0000000..ec436e9 Binary files /dev/null and b/Example/MLKit/LaunchImage.png differ diff --git a/Example/Podfile b/Example/Podfile index 6fb3fc1..c522415 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -13,7 +13,7 @@ target 'MLKit_Example' do post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '3.0' + config.build_settings['SWIFT_VERSION'] = '4.0' end end end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index c0288ad..db22dea 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - MachineLearningKit (0.1.7): + - MachineLearningKit (0.1.8): - Upsurge - - Nimble (6.0.1) - - Quick (1.1.0) - - Upsurge (0.8.0) + - Nimble (7.1.3) + - Quick (1.3.1) + - Upsurge (0.10.2) DEPENDENCIES: - MachineLearningKit (from `../`) @@ -11,16 +11,22 @@ DEPENDENCIES: - Quick - Upsurge +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Nimble + - Quick + - Upsurge + EXTERNAL SOURCES: MachineLearningKit: - :path: ../ + :path: "../" SPEC CHECKSUMS: - MachineLearningKit: 040457b6d6afce606454c16008b954f3952a0d32 - Nimble: 1527fd1bd2b4cf0636251a36bc8ab37e81da8347 - Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d - Upsurge: 614412863a3b5470b31636a004654b6ef3a34f47 + MachineLearningKit: 24cf37aed754e3fab2b5c0c823e3e82a0063f905 + Nimble: 2839b01d1b31f6a6a7777a221f0d91cf52e8e27b + Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a + Upsurge: 5866beadc3da27f91c5df4ac795deb3f3238d678 -PODFILE CHECKSUM: 6efa57e13fa4fabb331b61a3a84a43c047bb3113 +PODFILE CHECKSUM: 6f086d02cdc4ed10abc56279cba6e00448c35830 -COCOAPODS: 1.2.0 +COCOAPODS: 1.5.3 diff --git a/Example/Pods/Local Podspecs/MLKit.podspec.json b/Example/Pods/Local Podspecs/MLKit.podspec.json deleted file mode 100644 index fcf3edc..0000000 --- a/Example/Pods/Local Podspecs/MLKit.podspec.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "MLKit", - "version": "0.1.0", - "summary": "A simple machine learning framework written in Swift 🤖", - "description": "MLKit is a simple machine learning framework written in Swift. Currently MLKit features machine learning algorithms that deal with the topic of regression, but the framework will expand over time with topics such as classification, clustering, recommender systems, and deep learning. The vision and goal of this framework is to provide developers with a toolkit to create products that can learn from data. MLKit is a side project of mine in order to make it easier for developers to implement machine learning algorithms on the go, and to familiarlize myself with machine learning concepts.", - "homepage": "https://github.com/Somnibyte/MLKit", - "license": { - "type": "MIT", - "file": "LICENSE" - }, - "authors": { - "Guled Ahmed": "guledahmed777@gmail.com" - }, - "source": { - "git": "https://github.com/Somnibyte/MLKit.git", - "tag": "0.1.0" - }, - "platforms": { - "ios": "9.0", - "watchos": "3.1", - "tvos": "10.1" - }, - "source_files": "MLKit/Classes/**/*", - "frameworks": [ - "UIKit", - "MapKit" - ], - "dependencies": { - "Upsurge": [ - - ] - } -} diff --git a/Example/Pods/Local Podspecs/MachineLearningKit.podspec.json b/Example/Pods/Local Podspecs/MachineLearningKit.podspec.json index 2443d3f..7a006a8 100644 --- a/Example/Pods/Local Podspecs/MachineLearningKit.podspec.json +++ b/Example/Pods/Local Podspecs/MachineLearningKit.podspec.json @@ -1,6 +1,6 @@ { "name": "MachineLearningKit", - "version": "0.1.7", + "version": "0.1.8", "summary": "A simple machine learning framework written in Swift 🤖", "description": "MLKit is a simple machine learning framework written in Swift. Currently MLKit features machine learning algorithms that deal with the topic of regression, but the framework will expand over time with topics such as classification, clustering, recommender systems, and deep learning. The vision and goal of this framework is to provide developers with a toolkit to create products that can learn from data. MLKit is a side project of mine in order to make it easier for developers to implement machine learning algorithms on the go, and to familiarlize myself with machine learning concepts.", "homepage": "https://github.com/Somnibyte/MLKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/Somnibyte/MLKit.git", - "tag": "0.1.7" + "tag": "0.1.8" }, "platforms": { "ios": "9.0", diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index c0288ad..db22dea 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,9 +1,9 @@ PODS: - - MachineLearningKit (0.1.7): + - MachineLearningKit (0.1.8): - Upsurge - - Nimble (6.0.1) - - Quick (1.1.0) - - Upsurge (0.8.0) + - Nimble (7.1.3) + - Quick (1.3.1) + - Upsurge (0.10.2) DEPENDENCIES: - MachineLearningKit (from `../`) @@ -11,16 +11,22 @@ DEPENDENCIES: - Quick - Upsurge +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Nimble + - Quick + - Upsurge + EXTERNAL SOURCES: MachineLearningKit: - :path: ../ + :path: "../" SPEC CHECKSUMS: - MachineLearningKit: 040457b6d6afce606454c16008b954f3952a0d32 - Nimble: 1527fd1bd2b4cf0636251a36bc8ab37e81da8347 - Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d - Upsurge: 614412863a3b5470b31636a004654b6ef3a34f47 + MachineLearningKit: 24cf37aed754e3fab2b5c0c823e3e82a0063f905 + Nimble: 2839b01d1b31f6a6a7777a221f0d91cf52e8e27b + Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a + Upsurge: 5866beadc3da27f91c5df4ac795deb3f3238d678 -PODFILE CHECKSUM: 6efa57e13fa4fabb331b61a3a84a43c047bb3113 +PODFILE CHECKSUM: 6f086d02cdc4ed10abc56279cba6e00448c35830 -COCOAPODS: 1.2.0 +COCOAPODS: 1.5.3 diff --git a/Example/Pods/Nimble/README.md b/Example/Pods/Nimble/README.md index ecf9501..19c562f 100644 --- a/Example/Pods/Nimble/README.md +++ b/Example/Pods/Nimble/README.md @@ -1,5 +1,10 @@ # Nimble +[![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) +[![Platforms](https://img.shields.io/cocoapods/p/Nimble.svg)](https://cocoapods.org/pods/Nimble) + Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by [Cedar](https://github.com/pivotal/cedar). @@ -42,16 +47,25 @@ expect(ocean.isClean).toEventually(beTruthy()) - [Exceptions](#exceptions) - [Collection Membership](#collection-membership) - [Strings](#strings) - - [Checking if all elements of a collection pass a condition](#checking-if-all-elements-of-a-collection-pass-a-condition) - - [Verify collection count](#verify-collection-count) - - [Verify a notification was posted](#verifying-a-notification-was-posted) + - [Collection Elements](#collection-elements) + - [Collection Count](#collection-count) + - [Notifications](#notifications) - [Matching a value to any of a group of matchers](#matching-a-value-to-any-of-a-group-of-matchers) + - [Custom Validation](#custom-validation) - [Writing Your Own Matchers](#writing-your-own-matchers) + - [PredicateResult](#predicateresult) - [Lazy Evaluation](#lazy-evaluation) - [Type Checking via Swift Generics](#type-checking-via-swift-generics) - [Customizing Failure Messages](#customizing-failure-messages) + - [Basic Customization](#basic-customization) + - [Full Customization](#full-customization) - [Supporting Objective-C](#supporting-objective-c) - [Properly Handling `nil` in Objective-C Matchers](#properly-handling-nil-in-objective-c-matchers) + - [Migrating from the Old Matcher API](#migrating-from-the-old-matcher-api) + - [Minimal Step - Use `.predicate`](#minimal-step---use-predicate) + - [Convert to use `Predicate` Type with Old Matcher Constructor](#convert-to-use-predicate-type-with-old-matcher-constructor) + - [Convert to `Predicate` Type with Preferred Constructor](#convert-to-predicate-type-with-preferred-constructor) + - [Deprecation Roadmap](#deprecation-roadmap) - [Installing Nimble](#installing-nimble) - [Installing Nimble as a Submodule](#installing-nimble-as-a-submodule) - [Installing Nimble via CocoaPods](#installing-nimble-via-cocoapods) @@ -212,9 +226,9 @@ exception once evaluated: // that Nimble will catch. // (see https://github.com/Quick/Nimble/issues/220#issuecomment-172667064) let exception = NSException( - name: NSInternalInconsistencyException, - reason: "Not enough fish in the sea.", - userInfo: ["something": "is fishy"]) + name: NSInternalInconsistencyException, + reason: "Not enough fish in the sea.", + userInfo: ["something": "is fishy"]) expect { exception.raise() }.to(raiseException()) // Also, you can customize raiseException to be more specific @@ -282,9 +296,9 @@ expect(1 as CInt).to(equal(1)) make expectations on primitive C values, wrap then in an object literal: - ```objc - expect(@(1 + 1)).to(equal(@2)); - ``` +```objc +expect(@(1 + 1)).to(equal(@2)); +``` ## Asynchronous Expectations @@ -292,11 +306,22 @@ In Nimble, it's easy to make expectations on values that are updated asynchronously. Just use `toEventually` or `toEventuallyNot`: ```swift -// Swift +// Swift 3.0 and later + +DispatchQueue.main.async { + ocean.add("dolphins") + ocean.add("whales") +} +expect(ocean).toEventually(contain("dolphins", "whales")) +``` + + +```swift +// Swift 2.3 and earlier dispatch_async(dispatch_get_main_queue()) { - ocean.add("dolphins") - ocean.add("whales") + ocean.add("dolphins") + ocean.add("whales") } expect(ocean).toEventually(contain("dolphins", "whales")) ``` @@ -304,9 +329,10 @@ expect(ocean).toEventually(contain("dolphins", "whales")) ```objc // Objective-C + dispatch_async(dispatch_get_main_queue(), ^{ - [ocean add:@"dolphins"]; - [ocean add:@"whales"]; + [ocean add:@"dolphins"]; + [ocean add:@"whales"]; }); expect(ocean).toEventually(contain(@"dolphins", @"whales")); ``` @@ -348,9 +374,10 @@ You can also provide a callback by using the `waitUntil` function: // Swift waitUntil { done in - // do some stuff that takes a while... - NSThread.sleepForTimeInterval(0.5) - done() + ocean.goFish { success in + expect(success).to(beTrue()) + done() + } } ``` @@ -358,9 +385,10 @@ waitUntil { done in // Objective-C waitUntil(^(void (^done)(void)){ - // do some stuff that takes a while... - [NSThread sleepForTimeInterval:0.5]; - done(); + [ocean goFishWithHandler:^(BOOL success){ + expect(success).to(beTrue()); + done(); + }]; }); ``` @@ -370,9 +398,10 @@ waitUntil(^(void (^done)(void)){ // Swift waitUntil(timeout: 10) { done in - // do some stuff that takes a while... - NSThread.sleepForTimeInterval(1) - done() + ocean.goFish { success in + expect(success).to(beTrue()) + done() + } } ``` @@ -380,13 +409,14 @@ waitUntil(timeout: 10) { done in // Objective-C waitUntilTimeout(10, ^(void (^done)(void)){ - // do some stuff that takes a while... - [NSThread sleepForTimeInterval:1]; - done(); + [ocean goFishWithHandler:^(BOOL success){ + expect(success).to(beTrue()); + done(); + }]; }); ``` -Note: waitUntil triggers its timeout code on the main thread. Blocking the main +Note: `waitUntil` triggers its timeout code on the main thread. Blocking the main thread will cause Nimble to stop the run loop to continue. This can cause test pollution for whatever incomplete code that was running on the main thread. Blocking the main thread can be caused by blocking IO, calls to sleep(), @@ -496,25 +526,25 @@ Nimble supports checking the type membership of any kind of object, whether Objective-C conformant or not: ```swift -// Swift +// Swift protocol SomeProtocol{} class SomeClassConformingToProtocol: SomeProtocol{} struct SomeStructConformingToProtocol: SomeProtocol{} // The following tests pass -expect(1).to(beKindOf(Int.self)) -expect("turtle").to(beKindOf(String.self)) +expect(1).to(beAKindOf(Int.self)) +expect("turtle").to(beAKindOf(String.self)) let classObject = SomeClassConformingToProtocol() -expect(classObject).to(beKindOf(SomeProtocol.self)) -expect(classObject).to(beKindOf(SomeClassConformingToProtocol.self)) -expect(classObject).toNot(beKindOf(SomeStructConformingToProtocol.self)) +expect(classObject).to(beAKindOf(SomeProtocol.self)) +expect(classObject).to(beAKindOf(SomeClassConformingToProtocol.self)) +expect(classObject).toNot(beAKindOf(SomeStructConformingToProtocol.self)) let structObject = SomeStructConformingToProtocol() -expect(structObject).to(beKindOf(SomeProtocol.self)) -expect(structObject).to(beKindOf(SomeStructConformingToProtocol.self)) -expect(structObject).toNot(beKindOf(SomeClassConformingToProtocol.self)) +expect(structObject).to(beAKindOf(SomeProtocol.self)) +expect(structObject).to(beAKindOf(SomeStructConformingToProtocol.self)) +expect(structObject).toNot(beAKindOf(SomeClassConformingToProtocol.self)) ``` ```objc @@ -527,16 +557,17 @@ expect(@1).toNot(beAKindOf([NSNull class])); ``` Objects can be tested for their exact types using the `beAnInstanceOf` matcher: + ```swift -// Swift +// Swift protocol SomeProtocol{} class SomeClassConformingToProtocol: SomeProtocol{} struct SomeStructConformingToProtocol: SomeProtocol{} -// Unlike the 'beKindOf' matcher, the 'beAnInstanceOf' matcher only +// Unlike the 'beKindOf' matcher, the 'beAnInstanceOf' matcher only // passes if the object is the EXACT type requested. The following -// tests pass -- note its behavior when working in an inheritance hierarchy. +// tests pass -- note its behavior when working in an inheritance hierarchy. expect(1).to(beAnInstanceOf(Int.self)) expect("turtle").to(beAnInstanceOf(String.self)) @@ -549,18 +580,18 @@ let structObject = SomeStructConformingToProtocol() expect(structObject).toNot(beAnInstanceOf(SomeProtocol.self)) expect(structObject).to(beAnInstanceOf(SomeStructConformingToProtocol.self)) expect(structObject).toNot(beAnInstanceOf(SomeClassConformingToProtocol.self)) -```` +``` ## Equivalence ```swift // Swift -// Passes if actual is equivalent to expected: +// Passes if 'actual' is equivalent to 'expected': expect(actual).to(equal(expected)) expect(actual) == expected -// Passes if actual is not equivalent to expected: +// Passes if 'actual' is not equivalent to 'expected': expect(actual).toNot(equal(expected)) expect(actual) != expected ``` @@ -568,10 +599,10 @@ expect(actual) != expected ```objc // Objective-C -// Passes if actual is equivalent to expected: +// Passes if 'actual' is equivalent to 'expected': expect(actual).to(equal(expected)) -// Passes if actual is not equivalent to expected: +// Passes if 'actual' is not equivalent to 'expected': expect(actual).toNot(equal(expected)) ``` @@ -583,25 +614,33 @@ Values must be `Equatable`, `Comparable`, or subclasses of `NSObject`. ```swift // Swift -// Passes if actual has the same pointer address as expected: +// Passes if 'actual' has the same pointer address as 'expected': expect(actual).to(beIdenticalTo(expected)) expect(actual) === expected -// Passes if actual does not have the same pointer address as expected: +// Passes if 'actual' does not have the same pointer address as 'expected': expect(actual).toNot(beIdenticalTo(expected)) expect(actual) !== expected ``` -Its important to remember that `beIdenticalTo` only makes sense when comparing types with reference semantics, which have a notion of identity. In Swift, that means a `class`. This matcher will not work with types with value semantics such as `struct` or `enum`. If you need to compare two value types, you can either compare individual properties or if it makes sense to do so, make your type implement `Equatable` and use Nimble's equivalence matchers instead. +It is important to remember that `beIdenticalTo` only makes sense when comparing +types with reference semantics, which have a notion of identity. In Swift, +that means types that are defined as a `class`. + +This matcher will not work when comparing types with value semantics such as +those defined as a `struct` or `enum`. If you need to compare two value types, +consider what it means for instances of your type to be identical. This may mean +comparing individual properties or, if it makes sense to do so, conforming your type +to `Equatable` and using Nimble's equivalence matchers instead. ```objc // Objective-C -// Passes if actual has the same pointer address as expected: +// Passes if 'actual' has the same pointer address as 'expected': expect(actual).to(beIdenticalTo(expected)); -// Passes if actual does not have the same pointer address as expected: +// Passes if 'actual' does not have the same pointer address as 'expected': expect(actual).toNot(beIdenticalTo(expected)); ``` @@ -675,7 +714,7 @@ expect(actual) ≈ expected expect(actual) ≈ (expected, delta) ``` -(Type Option-x to get ≈ on a U.S. keyboard) +(Type option+x to get `≈` on a U.S. keyboard) The former version uses the default delta of 0.0001. Here is yet another way to do this: @@ -686,7 +725,7 @@ expect(actual) ≈ expected ± delta expect(actual) == expected ± delta ``` -(Type Option-Shift-= to get ± on a U.S. keyboard) +(Type option+shift+= to get `±` on a U.S. keyboard) If you are comparing arrays of floating point numbers, you'll find the following useful: @@ -706,20 +745,20 @@ expect([0.0, 2.0]).to(beCloseTo([0.1, 2.1], within: 0.1)) ```swift // Swift -// Passes if instance is an instance of aClass: +// Passes if 'instance' is an instance of 'aClass': expect(instance).to(beAnInstanceOf(aClass)) -// Passes if instance is an instance of aClass or any of its subclasses: +// Passes if 'instance' is an instance of 'aClass' or any of its subclasses: expect(instance).to(beAKindOf(aClass)) ``` ```objc // Objective-C -// Passes if instance is an instance of aClass: +// Passes if 'instance' is an instance of 'aClass': expect(instance).to(beAnInstanceOf(aClass)); -// Passes if instance is an instance of aClass or any of its subclasses: +// Passes if 'instance' is an instance of 'aClass' or any of its subclasses: expect(instance).to(beAKindOf(aClass)); ``` @@ -746,38 +785,38 @@ expect(dolphin).to(beAKindOf([Mammal class])); ## Truthiness ```swift -// Passes if actual is not nil, true, or an object with a boolean value of true: +// Passes if 'actual' is not nil, true, or an object with a boolean value of true: expect(actual).to(beTruthy()) -// Passes if actual is only true (not nil or an object conforming to Boolean true): +// Passes if 'actual' is only true (not nil or an object conforming to Boolean true): expect(actual).to(beTrue()) -// Passes if actual is nil, false, or an object with a boolean value of false: +// Passes if 'actual' is nil, false, or an object with a boolean value of false: expect(actual).to(beFalsy()) -// Passes if actual is only false (not nil or an object conforming to Boolean false): +// Passes if 'actual' is only false (not nil or an object conforming to Boolean false): expect(actual).to(beFalse()) -// Passes if actual is nil: +// Passes if 'actual' is nil: expect(actual).to(beNil()) ``` ```objc // Objective-C -// Passes if actual is not nil, true, or an object with a boolean value of true: +// Passes if 'actual' is not nil, true, or an object with a boolean value of true: expect(actual).to(beTruthy()); -// Passes if actual is only true (not nil or an object conforming to Boolean true): +// Passes if 'actual' is only true (not nil or an object conforming to Boolean true): expect(actual).to(beTrue()); -// Passes if actual is nil, false, or an object with a boolean value of false: +// Passes if 'actual' is nil, false, or an object with a boolean value of false: expect(actual).to(beFalsy()); -// Passes if actual is only false (not nil or an object conforming to Boolean false): +// Passes if 'actual' is only false (not nil or an object conforming to Boolean false): expect(actual).to(beFalse()); -// Passes if actual is nil: +// Passes if 'actual' is nil: expect(actual).to(beNil()); ``` @@ -788,14 +827,16 @@ If you're using Swift, you can use the `throwAssertion` matcher to check if an a ```swift // Swift -// Passes if somethingThatThrows() throws an assertion, such as calling fatalError() or precondition fails: +// Passes if 'somethingThatThrows()' throws an assertion, +// such as by calling 'fatalError()' or if a precondition fails: +expect { try somethingThatThrows() }.to(throwAssertion()) expect { () -> Void in fatalError() }.to(throwAssertion()) expect { precondition(false) }.to(throwAssertion()) -// Passes if throwing a NSError is not equal to throwing an assertion: +// Passes if throwing an NSError is not equal to throwing an assertion: expect { throw NSError(domain: "test", code: 0, userInfo: nil) }.toNot(throwAssertion()) -// Passes if the post assertion code is not run: +// Passes if the code after the precondition check is not run: var reachedPoint1 = false var reachedPoint2 = false expect { @@ -816,40 +857,53 @@ Notes: ## Swift Error Handling -If you're using Swift 2.0+, you can use the `throwError` matcher to check if an error is thrown. +If you're using Swift 2.0 or newer, you can use the `throwError` matcher to check if an error is thrown. + +Note: +The following code sample references the `Swift.Error` protocol. +This is `Swift.ErrorProtocol` in versions of Swift prior to version 3.0. ```swift // Swift -// Passes if somethingThatThrows() throws an ErrorProtocol: -expect{ try somethingThatThrows() }.to(throwError()) +// Passes if 'somethingThatThrows()' throws an 'Error': +expect { try somethingThatThrows() }.to(throwError()) -// Passes if somethingThatThrows() throws an error with a given domain: -expect{ try somethingThatThrows() }.to(throwError { (error: ErrorProtocol) in +// Passes if 'somethingThatThrows()' throws an error within a particular domain: +expect { try somethingThatThrows() }.to(throwError { (error: Error) in expect(error._domain).to(equal(NSCocoaErrorDomain)) }) -// Passes if somethingThatThrows() throws an error with a given case: -expect{ try somethingThatThrows() }.to(throwError(NSCocoaError.PropertyListReadCorruptError)) +// Passes if 'somethingThatThrows()' throws a particular error enum case: +expect { try somethingThatThrows() }.to(throwError(NSCocoaError.PropertyListReadCorruptError)) -// Passes if somethingThatThrows() throws an error with a given type: -expect{ try somethingThatThrows() }.to(throwError(errorType: NimbleError.self)) +// Passes if 'somethingThatThrows()' throws an error of a particular type: +expect { try somethingThatThrows() }.to(throwError(errorType: NimbleError.self)) ``` -If you are working directly with `ErrorProtocol` values, as is sometimes the case when using `Result` or `Promise` types, you can use the `matchError` matcher to check if the error is the same error is is supposed to be, without requiring explicit casting. +When working directly with `Error` values, using the `matchError` matcher +allows you to perform certain checks on the error itself without having to +explicitly cast the error. + +The `matchError` matcher allows you to check whether or not the error: + +- is the same _type_ of error you are expecting. +- represents a particular error value that you are expecting. + +This can be useful when using `Result` or `Promise` types, for example. ```swift // Swift -let actual: ErrorProtocol = … +let actual: Error = ... -// Passes if actual contains any error value from the NimbleErrorEnum type: -expect(actual).to(matchError(NimbleErrorEnum)) +// Passes if 'actual' represents any error value from the NimbleErrorEnum type: +expect(actual).to(matchError(NimbleErrorEnum.self)) -// Passes if actual contains the Timeout value from the NimbleErrorEnum type: -expect(actual).to(matchError(NimbleErrorEnum.Timeout)) +// Passes if 'actual' represents the case 'timeout' from the NimbleErrorEnum type: +expect(actual).to(matchError(NimbleErrorEnum.timeout)) -// Passes if actual contains an NSError equal to the given one: +// Passes if 'actual' contains an NSError equal to the one provided: expect(actual).to(matchError(NSError(domain: "err", code: 123, userInfo: nil))) ``` @@ -860,17 +914,17 @@ Note: This feature is only available in Swift. ```swift // Swift -// Passes if actual, when evaluated, raises an exception: +// Passes if 'actual', when evaluated, raises an exception: expect(actual).to(raiseException()) -// Passes if actual raises an exception with the given name: +// Passes if 'actual' raises an exception with the given name: expect(actual).to(raiseException(named: name)) -// Passes if actual raises an exception with the given name and reason: +// Passes if 'actual' raises an exception with the given name and reason: expect(actual).to(raiseException(named: name, reason: reason)) -// Passes if actual raises an exception and it passes expectations in the block -// (in this case, if name begins with 'a r') +// Passes if 'actual' raises an exception which passes expectations defined in the given closure: +// (in this case, if the exception's name begins with "a r") expect { exception.raise() }.to(raiseException { (exception: NSException) in expect(exception.name).to(beginWith("a r")) }) @@ -879,44 +933,44 @@ expect { exception.raise() }.to(raiseException { (exception: NSException) in ```objc // Objective-C -// Passes if actual, when evaluated, raises an exception: +// Passes if 'actual', when evaluated, raises an exception: expect(actual).to(raiseException()) -// Passes if actual raises an exception with the given name +// Passes if 'actual' raises an exception with the given name expect(actual).to(raiseException().named(name)) -// Passes if actual raises an exception with the given name and reason: +// Passes if 'actual' raises an exception with the given name and reason: expect(actual).to(raiseException().named(name).reason(reason)) -// Passes if actual raises an exception and it passes expectations in the block -// (in this case, if name begins with 'a r') +// Passes if 'actual' raises an exception and it passes expectations defined in the given block: +// (in this case, if name begins with "a r") expect(actual).to(raiseException().satisfyingBlock(^(NSException *exception) { expect(exception.name).to(beginWith(@"a r")); })); ``` -Note: Swift currently doesn't have exceptions (see [#220](https://github.com/Quick/Nimble/issues/220#issuecomment-172667064)). Only Objective-C code can raise -exceptions that Nimble will catch. +Note: Swift currently doesn't have exceptions (see [#220](https://github.com/Quick/Nimble/issues/220#issuecomment-172667064)). +Only Objective-C code can raise exceptions that Nimble will catch. ## Collection Membership ```swift // Swift -// Passes if all of the expected values are members of actual: +// Passes if all of the expected values are members of 'actual': expect(actual).to(contain(expected...)) -// Passes if actual is an empty collection (it contains no elements): +// Passes if 'actual' is empty (i.e. it contains no elements): expect(actual).to(beEmpty()) ``` ```objc // Objective-C -// Passes if expected is a member of actual: +// Passes if expected is a member of 'actual': expect(actual).to(contain(expected)); -// Passes if actual is an empty collection (it contains no elements): +// Passes if 'actual' is empty (i.e. it contains no elements): expect(actual).to(beEmpty()); ``` @@ -949,20 +1003,20 @@ an ordered collection, use `beginWith` and `endWith`: ```swift // Swift -// Passes if the elements in expected appear at the beginning of actual: +// Passes if the elements in expected appear at the beginning of 'actual': expect(actual).to(beginWith(expected...)) -// Passes if the the elements in expected come at the end of actual: +// Passes if the the elements in expected come at the end of 'actual': expect(actual).to(endWith(expected...)) ``` ```objc // Objective-C -// Passes if the elements in expected appear at the beginning of actual: +// Passes if the elements in expected appear at the beginning of 'actual': expect(actual).to(beginWith(expected)); -// Passes if the the elements in expected come at the end of actual: +// Passes if the the elements in expected come at the end of 'actual': expect(actual).to(endWith(expected)); ``` @@ -977,19 +1031,22 @@ For code that returns collections of complex objects without a strict ordering, there is the `containElementSatisfying` matcher: ```swift +// Swift + struct Turtle { - var color: String! + let color: String } -var turtles = functionThatReturnsSomeTurtlesInAnyOrder() +let turtles: [Turtle] = functionThatReturnsSomeTurtlesInAnyOrder() + +// This set of matchers passes regardless of whether the array is +// [{color: "blue"}, {color: "green"}] or [{color: "green"}, {color: "blue"}]: -// This set of matchers passes whether the array is [{color: "blue"}, {color: "green"}] -// or [{color: "green"}, {color: "blue"}] expect(turtles).to(containElementSatisfying({ turtle in - return turtle.color == "green" + return turtle.color == "green" })) expect(turtles).to(containElementSatisfying({ turtle in - return turtle.color == "blue" + return turtle.color == "blue" }, "that is a turtle with color 'blue'")) // The second matcher will incorporate the provided string in the error message @@ -997,20 +1054,25 @@ expect(turtles).to(containElementSatisfying({ turtle in ``` ```objc -@interface Turtle: NSObject -@property(nonatomic) NSString *color; +// Objective-C + +@interface Turtle : NSObject +@property (nonatomic, readonly, nonnull) NSString *color; +@end + +@implementation Turtle @end -@implementation Turtle @end -NSArray *turtles = functionThatReturnsSomeTurtlesInAnyOrder(); +NSArray * __nonnull turtles = functionThatReturnsSomeTurtlesInAnyOrder(); -// This set of matchers passes whether the array is [{color: "blue"}, {color: "green"}] -// or [{color: "green"}, {color: "blue"}] -expect(turtles).to(containElementSatisfying(^BOOL(id object) { - return [turtle.color isEqualToString:@"green"]; +// This set of matchers passes regardless of whether the array is +// [{color: "blue"}, {color: "green"}] or [{color: "green"}, {color: "blue"}]: + +expect(turtles).to(containElementSatisfying(^BOOL(id __nonnull object) { + return [[turtle color] isEqualToString:@"green"]; })); -expect(turtles).to(containElementSatisfying(^BOOL(id object) { - return [turtle.color isEqualToString:@"blue"]; +expect(turtles).to(containElementSatisfying(^BOOL(id __nonnull object) { + return [[turtle color] isEqualToString:@"blue"]; })); ``` @@ -1019,93 +1081,108 @@ expect(turtles).to(containElementSatisfying(^BOOL(id object) { ```swift // Swift -// Passes if actual contains substring expected: -expect(actual).to(contain(expected)) +// Passes if 'actual' contains 'substring': +expect(actual).to(contain(substring)) -// Passes if actual begins with substring: -expect(actual).to(beginWith(expected)) +// Passes if 'actual' begins with 'prefix': +expect(actual).to(beginWith(prefix)) -// Passes if actual ends with substring: -expect(actual).to(endWith(expected)) +// Passes if 'actual' ends with 'suffix': +expect(actual).to(endWith(suffix)) -// Passes if actual is an empty string, "": +// Passes if 'actual' represents the empty string, "": expect(actual).to(beEmpty()) -// Passes if actual matches the regular expression defined in expected: +// Passes if 'actual' matches the regular expression defined in 'expected': expect(actual).to(match(expected)) ``` ```objc // Objective-C -// Passes if actual contains substring expected: +// Passes if 'actual' contains 'substring': expect(actual).to(contain(expected)); -// Passes if actual begins with substring: -expect(actual).to(beginWith(expected)); +// Passes if 'actual' begins with 'prefix': +expect(actual).to(beginWith(prefix)); -// Passes if actual ends with substring: -expect(actual).to(endWith(expected)); +// Passes if 'actual' ends with 'suffix': +expect(actual).to(endWith(suffix)); -// Passes if actual is an empty string, "": +// Passes if 'actual' represents the empty string, "": expect(actual).to(beEmpty()); -// Passes if actual matches the regular expression defined in expected: +// Passes if 'actual' matches the regular expression defined in 'expected': expect(actual).to(match(expected)) ``` -## Checking if all elements of a collection pass a condition +## Collection Elements + +Nimble provides a means to check that all elements of a collection pass a given expectation. + +### Swift + +In Swift, the collection must be an instance of a type conforming to +`Sequence`. ```swift // Swift -// with a custom function: -expect([1,2,3,4]).to(allPass({$0 < 5})) +// Providing a custom function: +expect([1, 2, 3, 4]).to(allPass { $0! < 5 }) -// with another matcher: -expect([1,2,3,4]).to(allPass(beLessThan(5))) +// Composing the expectation with another matcher: +expect([1, 2, 3, 4]).to(allPass(beLessThan(5))) ``` +### Objective-C + +In Objective-C, the collection must be an instance of a type which implements +the `NSFastEnumeration` protocol, and whose elements are instances of a type +which subclasses `NSObject`. + +Additionally, unlike in Swift, there is no override to specify a custom +matcher function. + ```objc // Objective-C -expect(@[@1, @2, @3,@4]).to(allPass(beLessThan(@5))); +expect(@[@1, @2, @3, @4]).to(allPass(beLessThan(@5))); ``` -For Swift the actual value has to be a Sequence, e.g. an array, a set or a custom seqence type. - -For Objective-C the actual value has to be a NSFastEnumeration, e.g. NSArray and NSSet, of NSObjects and only the variant which -uses another matcher is available here. - -## Verify collection count +## Collection Count ```swift // Swift -// passes if actual collection's count is equal to expected +// Passes if 'actual' contains the 'expected' number of elements: expect(actual).to(haveCount(expected)) -// passes if actual collection's count is not equal to expected +// Passes if 'actual' does _not_ contain the 'expected' number of elements: expect(actual).notTo(haveCount(expected)) ``` ```objc // Objective-C -// passes if actual collection's count is equal to expected +// Passes if 'actual' contains the 'expected' number of elements: expect(actual).to(haveCount(expected)) -// passes if actual collection's count is not equal to expected +// Passes if 'actual' does _not_ contain the 'expected' number of elements: expect(actual).notTo(haveCount(expected)) ``` -For Swift the actual value must be a `Collection` such as array, dictionary or set. +For Swift, the actual value must be an instance of a type conforming to `Collection`. +For example, instances of `Array`, `Dictionary`, or `Set`. -For Objective-C the actual value has to be one of the following classes `NSArray`, `NSDictionary`, `NSSet`, `NSHashTable` or one of their subclasses. +For Objective-C, the actual value must be one of the following classes, or their subclasses: -## Foundation + - `NSArray`, + - `NSDictionary`, + - `NSSet`, or + - `NSHashTable`. -### Verifying a Notification was posted +## Notifications ```swift // Swift @@ -1130,6 +1207,8 @@ expect { ## Matching a value to any of a group of matchers ```swift +// Swift + // passes if actual is either less than 10 or greater than 20 expect(actual).to(satisfyAnyOf(beLessThan(10), beGreaterThan(20))) @@ -1142,6 +1221,8 @@ expect(82).to(beLessThan(50) || beGreaterThan(80)) ``` ```objc +// Objective-C + // passes if actual is either less than 10 or greater than 20 expect(actual).to(satisfyAnyOf(beLessThan(@10), beGreaterThan(@20))) @@ -1155,33 +1236,70 @@ Note: This matcher allows you to chain any number of matchers together. This pro could instead refactor that single test into multiple, more precisely focused tests for better coverage. +## Custom Validation + +```swift +// Swift + +// passes if .succeeded is returned from the closure +expect({ + guard case .enumCaseWithAssociatedValueThatIDontCareAbout = actual else { + return .failed(reason: "wrong enum case") + } + + return .succeeded +}).to(succeed()) + +// passes if .failed is returned from the closure +expect({ + guard case .enumCaseWithAssociatedValueThatIDontCareAbout = actual else { + return .failed(reason: "wrong enum case") + } + + return .succeeded +}).notTo(succeed()) +``` + +The `String` provided with `.failed()` is shown when the test fails. + +When using `toEventually()` be careful not to make state changes or run process intensive code since this closure will be ran many times. + # Writing Your Own Matchers In Nimble, matchers are Swift functions that take an expected -value and return a `MatcherFunc` closure. Take `equal`, for example: +value and return a `Predicate` closure. Take `equal`, for example: ```swift // Swift -public func equal(expectedValue: T?) -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "equal <\(expectedValue)>" - if let actualValue = try actualExpression.evaluate() { - return actualValue == expectedValue - } else { - return false +public func equal(expectedValue: T?) -> Predicate { + // Can be shortened to: + // Predicate { actual in ... } + // + // But shown with types here for clarity. + return Predicate { (actual: Expression) throws -> PredicateResult in + let msg = ExpectationMessage.expectedActualValueTo("equal <\(expectedValue)>") + if let actualValue = try actualExpression.evaluate() { + return PredicateResult( + bool: actualValue == expectedValue!, + message: msg + ) + } else { + return PredicateResult( + status: .fail, + message: msg.appendedBeNilHint() + ) + } } - } } ``` -The return value of a `MatcherFunc` closure is a `Bool` that indicates -whether the actual value matches the expectation: `true` if it does, or -`false` if it doesn't. +The return value of a `Predicate` closure is a `PredicateResult` that indicates +whether the actual value matches the expectation and what error message to +display on failure. -> The actual `equal` matcher function does not match when either - `actual` or `expected` are nil; the example above has been edited for - brevity. +> The actual `equal` matcher function does not match when + `expected` are nil; the example above has been edited for brevity. Since matchers are just Swift functions, you can define them anywhere: at the top of your test file, in a file shared by all of your tests, or @@ -1196,6 +1314,63 @@ For examples of how to write your own matchers, just check out the to see how Nimble's built-in set of matchers are implemented. You can also check out the tips below. +## PredicateResult + +`PredicateResult` is the return struct that `Predicate` return to indicate +success and failure. A `PredicateResult` is made up of two values: +`PredicateStatus` and `ExpectationMessage`. + +Instead of a boolean, `PredicateStatus` captures a trinary set of values: + +```swift +// Swift + +public enum PredicateStatus { +// The predicate "passes" with the given expression +// eg - expect(1).to(equal(1)) +case matches + +// The predicate "fails" with the given expression +// eg - expect(1).toNot(equal(1)) +case doesNotMatch + +// The predicate never "passes" with the given expression, even if negated +// eg - expect(nil as Int?).toNot(equal(1)) +case fail + +// ... +} +``` + +Meanwhile, `ExpectationMessage` provides messaging semantics for error reporting. + +```swift +// Swift + +public indirect enum ExpectationMessage { +// Emits standard error message: +// eg - "expected to , got " +case expectedActualValueTo(/* message: */ String) + +// Allows any free-form message +// eg - "" +case fail(/* message: */ String) + +// ... +} +``` + +Predicates should usually depend on either `.expectedActualValueTo(..)` or +`.fail(..)` when reporting errors. Special cases can be used for the other enum +cases. + +Finally, if your Predicate utilizes other Predicates, you can utilize +`.appended(details:)` and `.appended(message:)` methods to annotate an existing +error with more details. + +A common message to append is failing on nils. For that, `.appendedBeNilHint()` +can be used. + ## Lazy Evaluation `actualExpression` is a lazy, memoized closure around the value provided to the @@ -1206,22 +1381,24 @@ custom matchers should call `actualExpression.evaluate()`: ```swift // Swift -public func beNil() -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be nil" - return actualExpression.evaluate() == nil - } +public func beNil() -> Predicate { + // Predicate.simpleNilable(..) automatically generates ExpectationMessage for + // us based on the string we provide to it. Also, the 'Nilable' postfix indicates + // that this Predicate supports matching against nil actualExpressions, instead of + // always resulting in a PredicateStatus.fail result -- which is true for + // Predicate.simple(..) + return Predicate.simpleNilable("be nil") { actualExpression in + let actualValue = try actualExpression.evaluate() + return PredicateStatus(bool: actualValue == nil) + } } ``` -In the above example, `actualExpression` is not `nil`--it is a closure +In the above example, `actualExpression` is not `nil` -- it is a closure that returns a value. The value it returns, which is accessed via the `evaluate()` method, may be `nil`. If that value is `nil`, the `beNil` matcher function returns `true`, indicating that the expectation passed. -Use `expression.isClosure` to determine if the expression will be invoking -a closure to produce its value. - ## Type Checking via Swift Generics Using Swift's generics, matchers can constrain the type of the actual value @@ -1234,43 +1411,108 @@ against the one provided to the matcher function, and passes if they are the sam ```swift // Swift -public func haveDescription(description: String) -> MatcherFunc { - return MatcherFunc { actual, failureMessage in - return actual.evaluate().description == description - } +public func haveDescription(description: String) -> Predicate { + return Predicate.simple("have description") { actual in + return PredicateStatus(bool: actual.evaluate().description == description) + } } ``` ## Customizing Failure Messages -By default, Nimble outputs the following failure message when an -expectation fails: +When using `Predicate.simple(..)` or `Predicate.simpleNilable(..)`, Nimble +outputs the following failure message when an expectation fails: -``` -expected to match, got <\(actual)> +```swift +// where `message` is the first string argument and +// `actual` is the actual value received in `expect(..)` +"expected to \(message), got <\(actual)>" ``` -You can customize this message by modifying the `failureMessage` struct -from within your `MatcherFunc` closure. To change the verb "match" to -something else, update the `postfixMessage` property: +You can customize this message by modifying the way you create a `Predicate`. + +### Basic Customization + +For slightly more complex error messaging, receive the created failure message +with `Predicate.define(..)`: ```swift // Swift -// Outputs: expected to be under the sea, got <\(actual)> -failureMessage.postfixMessage = "be under the sea" +public func equal(_ expectedValue: T?) -> Predicate { + return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in + let actualValue = try actualExpression.evaluate() + let matches = actualValue == expectedValue && expectedValue != nil + if expectedValue == nil || actualValue == nil { + if expectedValue == nil && actualValue != nil { + return PredicateResult( + status: .fail, + message: msg.appendedBeNilHint() + ) + } + return PredicateResult(status: .fail, message: msg) + } + return PredicateResult(bool: matches, message: msg) + } +} ``` -You can change how the `actual` value is displayed by updating -`failureMessage.actualValue`. Or, to remove it altogether, set it to -`nil`: +In the example above, `msg` is defined based on the string given to +`Predicate.define`. The code looks akin to: ```swift // Swift -// Outputs: expected to be under the sea -failureMessage.actualValue = nil -failureMessage.postfixMessage = "be under the sea" +let msg = ExpectationMessage.expectedActualValueTo("equal <\(stringify(expectedValue))>") +``` + +### Full Customization + +To fully customize the behavior of the Predicate, use the overload that expects +a `PredicateResult` to be returned. + +Along with `PredicateResult`, there are other `ExpectationMessage` enum values you can use: + +```swift +public indirect enum ExpectationMessage { +// Emits standard error message: +// eg - "expected to , got " +case expectedActualValueTo(/* message: */ String) + +// Allows any free-form message +// eg - "" +case fail(/* message: */ String) + +// Emits standard error message with a custom actual value instead of the default. +// eg - "expected to , got " +case expectedCustomValueTo(/* message: */ String, /* actual: */ String) + +// Emits standard error message without mentioning the actual value +// eg - "expected to " +case expectedTo(/* message: */ String) + +// ... +} +``` + +For matchers that compose other matchers, there are a handful of helper +functions to annotate messages. + +`appended(message: String)` is used to append to the original failure message: + +```swift +// produces "expected to be true, got (use beFalse() for inverse)" +// appended message do show up inline in Xcode. +.expectedActualValueTo("be true").appended(message: " (use beFalse() for inverse)") +``` + +For a more comprehensive message that spans multiple lines, use +`appended(details: String)` instead: + +```swift +// produces "expected to be true, got \n\nuse beFalse() for inverse\nor use beNil()" +// details do not show inline in Xcode, but do show up in test logs. +.expectedActualValueTo("be true").appended(details: "use beFalse() for inverse\nor use beNil()") ``` ## Supporting Objective-C @@ -1284,13 +1526,13 @@ custom matcher. The example below defines the class method // 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) + 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) + } } - } } ``` @@ -1309,7 +1551,7 @@ class method: // Objective-C FOUNDATION_EXPORT id beNil() { - return [NMBObjCMatcher beNilMatcher]; + return [NMBObjCMatcher beNilMatcher]; } ``` @@ -1359,6 +1601,85 @@ extension NMBObjCMatcher { } ``` +## Migrating from the Old Matcher API + +Previously (`<7.0.0`), Nimble supported matchers via the following types: + +- `Matcher` +- `NonNilMatcherFunc` +- `MatcherFunc` + +All of those types have been replaced by `Predicate`. While migrating can be a +lot of work, Nimble currently provides several steps to aid migration of your +custom matchers: + +### Minimal Step - Use `.predicate` + +Nimble provides an extension to the old types that automatically naively +converts those types to the newer `Predicate`. + +```swift +// Swift +public func beginWith(startingElement: T) -> Predicate { + 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 + }.predicate +} +``` + +This is the simpliest way to externally support `Predicate` which allows easier +composition than the old Nimble matcher interface, with minimal effort to change. + +### Convert to use `Predicate` Type with Old Matcher Constructor + +The second most convenient step is to utilize special constructors that +`Predicate` supports that closely align to the constructors of the old Nimble +matcher types. + +```swift +// Swift +public func beginWith(startingElement: T) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + failureMessage.postfixMessage = "begin with <\(startingElement)>" + if let actualValue = actualExpression.evaluate() { + var actualGenerator = actualValue.makeIterator() + return actualGenerator.next() == startingElement + } + return false + } +} +``` + +This allows you to completely drop the old types from your code, although the +intended behavior may alter slightly to what is desired. + +### Convert to `Predicate` Type with Preferred Constructor + +Finally, you can convert to the native `Predicate` format using one of the +constructors not used to assist in the migration. + +### Deprecation Roadmap + +Nimble 7 introduces `Predicate` but will support the old types with warning +deprecations. A couple major releases of Nimble will remain backwards +compatible with the old matcher api, although new features may not be +backported. + +The deprecating plan is a 3 major versions removal. Which is as follows: + + 1. Introduce new `Predicate` API, deprecation warning for old matcher APIs. + (Nimble `v7.x.x`) + 2. Introduce warnings on migration-path features (`.predicate`, + `Predicate`-constructors with similar arguments to old API). (Nimble + `v8.x.x`) + 3. Remove old API. (Nimble `v9.x.x`) + + # Installing Nimble > Nimble can be used on its own, or in conjunction with its sister @@ -1399,7 +1720,7 @@ source 'https://github.com/CocoaPods/Specs.git' target 'YOUR_APP_NAME_HERE_Tests', :exclusive => true do use_frameworks! - pod 'Nimble', '~> 5.0.0' + pod 'Nimble', '~> 6.0.0' end ``` diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.h b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.h deleted file mode 100644 index 6ec6a29..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// CwlCatchException.h -// CwlCatchException -// -// 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 - -//! Project version number for CwlCatchException. -FOUNDATION_EXPORT double CwlCatchExceptionVersionNumber; - -//! Project version string for CwlCatchException. -FOUNDATION_EXPORT const unsigned char CwlCatchExceptionVersionString[]; - -__attribute__((visibility("hidden"))) -NSException* __nullable catchExceptionOfKind(Class __nonnull type, __attribute__((noescape)) void (^ __nonnull inBlock)()); diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.m b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.m deleted file mode 100644 index 4f9772c..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.m +++ /dev/null @@ -1,35 +0,0 @@ -// -// CwlCatchException.m -// CwlAssertionTesting -// -// 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 "CwlCatchException.h" - -__attribute__((visibility("hidden"))) -NSException* catchExceptionOfKind(Class __nonnull type, __attribute__((noescape)) void (^ __nonnull inBlock)()) { - @try { - inBlock(); - } @catch (NSException *exception) { - if ([exception isKindOfClass:type]) { - return exception; - } else { - @throw; - } - } - return nil; -} diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.swift b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.swift deleted file mode 100644 index b44a232..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// CwlCatchException.swift -// CwlAssertionTesting -// -// 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 Foundation - -// We can't simply cast to Self? in the catchInBlock method so we need this generic function wrapper to do the conversion for us. Mildly annoying. -private func catchReturnTypeConverter(_ type: T.Type, block: () -> Void) -> T? { - return catchExceptionOfKind(type, block) as? T -} - -extension NSException { - public static func catchException(in block: () -> Void) -> Self? { - return catchReturnTypeConverter(self, block: block) - } -} diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift deleted file mode 100644 index 5bf2794..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift +++ /dev/null @@ -1,76 +0,0 @@ -// -// CwlBadInstructionException.swift -// 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 Foundation - -private func raiseBadInstructionException() { - BadInstructionException().raise() -} - -/// A simple NSException subclass. It's not required to subclass NSException (since the exception type is represented in the name) but this helps for identifying the exception through runtime type. -@objc public class BadInstructionException: NSException { - static var name: String = "com.cocoawithlove.BadInstruction" - - init() { - super.init(name: NSExceptionName(rawValue: BadInstructionException.name), reason: nil, userInfo: nil) - } - - required public init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - /// 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. - public class func catch_mach_exception_raise_state(_ exception_port: mach_port_t, exception: exception_type_t, code: UnsafePointer, codeCnt: mach_msg_type_number_t, flavor: UnsafeMutablePointer, old_state: UnsafePointer, old_stateCnt: mach_msg_type_number_t, new_state: thread_state_t, new_stateCnt: UnsafeMutablePointer) -> kern_return_t { - - #if arch(x86_64) - // Make sure we've been given enough memory - if old_stateCnt != x86_THREAD_STATE64_COUNT || new_stateCnt.pointee < x86_THREAD_STATE64_COUNT { - return 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 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 KERN_SUCCESS - #else - fatalError("Unavailable for this CPU architecture") - #endif - } -} diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.h b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.h deleted file mode 100644 index 0333ed2..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.h +++ /dev/null @@ -1,61 +0,0 @@ -// -// CwlCatchBadInstruction.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. -// - -#if defined(__x86_64__) - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -// The request_mach_exception_raise_t struct is passed to mach_msg which assumes its exact layout. To avoid problems with different layouts, we keep the definition in C rather than Swift. -typedef struct -{ - mach_msg_header_t Head; - /* start of the kernel processed data */ - mach_msg_body_t msgh_body; - mach_msg_port_descriptor_t thread; - mach_msg_port_descriptor_t task; - /* end of the kernel processed data */ - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - int flavor; - mach_msg_type_number_t old_stateCnt; - natural_t old_state[224]; -} request_mach_exception_raise_t; - -// The reply_mach_exception_raise_state_t struct is passed to mach_msg which assumes its exact layout. To avoid problems with different layouts, we keep the definition in C rather than Swift. -typedef struct -{ - mach_msg_header_t Head; - NDR_record_t NDR; - kern_return_t RetCode; - int flavor; - mach_msg_type_number_t new_stateCnt; - natural_t new_state[224]; -} reply_mach_exception_raise_state_t; - -extern boolean_t mach_exc_server(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP); - -NS_ASSUME_NONNULL_END - -#endif diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m deleted file mode 100644 index 22c1377..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// CwlCatchBadInstruction.m -// 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. -// - -#if defined(__x86_64__) - -#import "CwlCatchBadInstruction.h" - -// Assuming the "PRODUCT_NAME" macro is defined, this will create the name of the Swift generated header file -#define STRINGIZE_NO_EXPANSION(A) #A -#define STRINGIZE_WITH_EXPANSION(A) STRINGIZE_NO_EXPANSION(A) -#define SWIFT_INCLUDE STRINGIZE_WITH_EXPANSION(PRODUCT_NAME-Swift.h) - -// Include the Swift generated header file -#import SWIFT_INCLUDE - -/// 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) { - return [BadInstructionException catch_mach_exception_raise_state:exception_port exception:exception code:code codeCnt:codeCnt flavor:flavor old_state:old_state old_stateCnt:old_stateCnt new_state:new_state new_stateCnt:new_stateCnt]; -} - -// 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 diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift deleted file mode 100644 index 4d82f7a..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift +++ /dev/null @@ -1,193 +0,0 @@ -// -// CwlCatchBadInstruction.swift -// 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 Foundation - -#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) - } - } - - extension execTypesCountTuple { - mutating func pointer(in block: (UnsafeMutablePointer) -> R) -> R { - return withUnsafeMutablePointer(to: &self) { p -> R in - return p.withMemoryRebound(to: T.self, capacity: EXC_TYPES_COUNT) { 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) - } - } - } - } - - /// 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 - - mutating func withUnsafeMutablePointers(in block: (UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer) -> R) -> R { - return masks.pointer { masksPtr in - return ports.pointer { portsPtr in - return behaviors.pointer { behaviorsPtr in - return flavors.pointer { flavorsPtr in - return block(masksPtr, portsPtr, behaviorsPtr, flavorsPtr) - } - } - } - } - } - } - - /// 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) - try kernCheck { request.withMsgHeaderPointer { requestPtr in - mach_msg(requestPtr, MACH_RCV_MSG | MACH_RCV_INTERRUPT, 0, request.Head.msgh_size, 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 - } - - // Send the reply - try kernCheck { reply.withMsgHeaderPointer { replyPtr in - mach_msg(replyPtr, MACH_SEND_MSG, reply.Head.msgh_size, 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: () -> 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) - } - - try kernCheck { context.withUnsafeMutablePointers { masksPtr, 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, context.currentExceptionPort, Int32(bitPattern: UInt32(EXCEPTION_STATE) | MACH_EXCEPTION_CODES), x86_THREAD_STATE64, masksPtr, &context.count, portsPtr, behaviorsPtr, flavorsPtr) - } } - - defer { context.withUnsafeMutablePointers { masksPtr, 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, &context.count, 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)") - } - return result - } - -#endif diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift deleted file mode 100644 index 35e1ad5..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift +++ /dev/null @@ -1,63 +0,0 @@ -// -// CwlDarwinDefinitions.swift -// 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 Darwin - -#if arch(x86_64) - -// From /usr/include/mach/port.h -// #define MACH_PORT_RIGHT_RECEIVE ((mach_port_right_t) 1) -let MACH_PORT_RIGHT_RECEIVE: mach_port_right_t = 1 - -// 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)) -let MACH_MSG_TYPE_MAKE_SEND: UInt32 = 20 -func MACH_MSGH_BITS_REMOTE(_ bits: UInt32) -> UInt32 { return bits & UInt32(MACH_MSGH_BITS_REMOTE_MASK) } -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) -// #define EXCEPTION_DEFAULT 1 -let EXC_BAD_INSTRUCTION: UInt32 = 2 -let EXC_MASK_BAD_INSTRUCTION: UInt32 = 1 << EXC_BAD_INSTRUCTION -let EXCEPTION_DEFAULT: Int32 = 1 - -// From /usr/include/mach/i386/thread_status.h -// #define THREAD_STATE_NONE 13 -// #define x86_THREAD_STATE64_COUNT ((mach_msg_type_number_t) \ -// ( sizeof (x86_thread_state64_t) / sizeof (int) )) -let THREAD_STATE_NONE: Int32 = 13 -let x86_THREAD_STATE64_COUNT = UInt32(MemoryLayout.size / MemoryLayout.size) - -let EXC_TYPES_COUNT = 14 -struct execTypesCountTuple { - // From /usr/include/mach/i386/exception.h - // #define EXC_TYPES_COUNT 14 /* incl. illegal exception 0 */ - 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) - init() { - } -} - -#endif diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.c b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.c deleted file mode 100644 index 2334538..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.c +++ /dev/null @@ -1,537 +0,0 @@ -/* - * IDENTIFICATION: - * stub generated Mon Jan 11 00:24:26 2016 - * with a MiG generated by bootstrap_cmds-93 - * OPTIONS: - */ - -/* Module mach_exc */ - -#if defined(__x86_64__) - -#define __MIG_check__Request__mach_exc_subsystem__ 1 - -#include "mach_excServer.h" - -#ifndef mig_internal -#define mig_internal static __inline__ -#endif /* mig_internal */ - -#ifndef mig_external -#define mig_external -#endif /* mig_external */ - -#if !defined(__MigTypeCheck) && defined(TypeCheck) -#define __MigTypeCheck TypeCheck /* Legacy setting */ -#endif /* !defined(__MigTypeCheck) */ - -#if !defined(__MigKernelSpecificCode) && defined(_MIG_KERNEL_SPECIFIC_CODE_) -#define __MigKernelSpecificCode _MIG_KERNEL_SPECIFIC_CODE_ /* Legacy setting */ -#endif /* !defined(__MigKernelSpecificCode) */ - -#ifndef LimitCheck -#define LimitCheck 0 -#endif /* LimitCheck */ - -#ifndef min -#define min(a,b) ( ((a) < (b))? (a): (b) ) -#endif /* min */ - -#if !defined(_WALIGN_) -#define _WALIGN_(x) (((x) + 3) & ~3) -#endif /* !defined(_WALIGN_) */ - -#if !defined(_WALIGNSZ_) -#define _WALIGNSZ_(x) _WALIGN_(sizeof(x)) -#endif /* !defined(_WALIGNSZ_) */ - -#ifndef UseStaticTemplates -#define UseStaticTemplates 0 -#endif /* UseStaticTemplates */ - -#ifndef __DeclareRcvRpc -#define __DeclareRcvRpc(_NUM_, _NAME_) -#endif /* __DeclareRcvRpc */ - -#ifndef __BeforeRcvRpc -#define __BeforeRcvRpc(_NUM_, _NAME_) -#endif /* __BeforeRcvRpc */ - -#ifndef __AfterRcvRpc -#define __AfterRcvRpc(_NUM_, _NAME_) -#endif /* __AfterRcvRpc */ - -#ifndef __DeclareRcvSimple -#define __DeclareRcvSimple(_NUM_, _NAME_) -#endif /* __DeclareRcvSimple */ - -#ifndef __BeforeRcvSimple -#define __BeforeRcvSimple(_NUM_, _NAME_) -#endif /* __BeforeRcvSimple */ - -#ifndef __AfterRcvSimple -#define __AfterRcvSimple(_NUM_, _NAME_) -#endif /* __AfterRcvSimple */ - -#define novalue void - -#define msgh_request_port msgh_local_port -#define MACH_MSGH_BITS_REQUEST(bits) MACH_MSGH_BITS_LOCAL(bits) -#define msgh_reply_port msgh_remote_port -#define MACH_MSGH_BITS_REPLY(bits) MACH_MSGH_BITS_REMOTE(bits) - -#define MIG_RETURN_ERROR(X, code) {\ - ((mig_reply_error_t *)X)->RetCode = code;\ - ((mig_reply_error_t *)X)->NDR = NDR_record;\ - return;\ - } - -/* Forward Declarations */ - - -mig_internal novalue _Xmach_exception_raise - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP); - -mig_internal novalue _Xmach_exception_raise_state - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP); - -mig_internal novalue _Xmach_exception_raise_state_identity - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP); - - -#if ( __MigTypeCheck ) -#if __MIG_check__Request__mach_exc_subsystem__ -#if !defined(__MIG_check__Request__mach_exception_raise_t__defined) -#define __MIG_check__Request__mach_exception_raise_t__defined - -mig_internal kern_return_t __MIG_check__Request__mach_exception_raise_t(__attribute__((__unused__)) __Request__mach_exception_raise_t *In0P) -{ - - typedef __Request__mach_exception_raise_t __Request; -#if __MigTypeCheck - unsigned int msgh_size; -#endif /* __MigTypeCheck */ - -#if __MigTypeCheck - msgh_size = In0P->Head.msgh_size; - if (!(In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) || - (In0P->msgh_body.msgh_descriptor_count != 2) || - (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 16)) || (msgh_size > (mach_msg_size_t)sizeof(__Request))) - return MIG_BAD_ARGUMENTS; -#endif /* __MigTypeCheck */ - -#if __MigTypeCheck - if (In0P->thread.type != MACH_MSG_PORT_DESCRIPTOR || - In0P->thread.disposition != 17) - return MIG_TYPE_ERROR; -#endif /* __MigTypeCheck */ - -#if __MigTypeCheck - if (In0P->task.type != MACH_MSG_PORT_DESCRIPTOR || - In0P->task.disposition != 17) - return MIG_TYPE_ERROR; -#endif /* __MigTypeCheck */ - -#if defined(__NDR_convert__int_rep__Request__mach_exception_raise_t__codeCnt__defined) - if (In0P->NDR.int_rep != NDR_record.int_rep) - __NDR_convert__int_rep__Request__mach_exception_raise_t__codeCnt(&In0P->codeCnt, In0P->NDR.int_rep); -#endif /* __NDR_convert__int_rep__Request__mach_exception_raise_t__codeCnt__defined */ -#if __MigTypeCheck - if ( In0P->codeCnt > 2 ) - return MIG_BAD_ARGUMENTS; - if (((msgh_size - (mach_msg_size_t)(sizeof(__Request) - 16)) / 8 < In0P->codeCnt) || - (msgh_size != (mach_msg_size_t)(sizeof(__Request) - 16) + (8 * In0P->codeCnt))) - return MIG_BAD_ARGUMENTS; -#endif /* __MigTypeCheck */ - - return MACH_MSG_SUCCESS; -} -#endif /* !defined(__MIG_check__Request__mach_exception_raise_t__defined) */ -#endif /* __MIG_check__Request__mach_exc_subsystem__ */ -#endif /* ( __MigTypeCheck ) */ - - -/* Routine mach_exception_raise */ -mig_internal novalue _Xmach_exception_raise - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP) -{ - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - /* start of the kernel processed data */ - mach_msg_body_t msgh_body; - mach_msg_port_descriptor_t thread; - mach_msg_port_descriptor_t task; - /* end of the kernel processed data */ - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - mach_msg_trailer_t trailer; - } Request __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - typedef __Request__mach_exception_raise_t __Request; - typedef __Reply__mach_exception_raise_t Reply __attribute__((unused)); - - /* - * typedef struct { - * mach_msg_header_t Head; - * NDR_record_t NDR; - * kern_return_t RetCode; - * } mig_reply_error_t; - */ - - Request *In0P = (Request *) InHeadP; - Reply *OutP = (Reply *) OutHeadP; -#ifdef __MIG_check__Request__mach_exception_raise_t__defined - kern_return_t check_result; -#endif /* __MIG_check__Request__mach_exception_raise_t__defined */ - - __DeclareRcvRpc(2405, "mach_exception_raise") - __BeforeRcvRpc(2405, "mach_exception_raise") - -#if defined(__MIG_check__Request__mach_exception_raise_t__defined) - check_result = __MIG_check__Request__mach_exception_raise_t((__Request *)In0P); - if (check_result != MACH_MSG_SUCCESS) - { MIG_RETURN_ERROR(OutP, check_result); } -#endif /* defined(__MIG_check__Request__mach_exception_raise_t__defined) */ - - OutP->RetCode = catch_mach_exception_raise(In0P->Head.msgh_request_port, In0P->thread.name, In0P->task.name, In0P->exception, In0P->code, In0P->codeCnt); - - OutP->NDR = NDR_record; - - - __AfterRcvRpc(2405, "mach_exception_raise") -} - -#if ( __MigTypeCheck ) -#if __MIG_check__Request__mach_exc_subsystem__ -#if !defined(__MIG_check__Request__mach_exception_raise_state_t__defined) -#define __MIG_check__Request__mach_exception_raise_state_t__defined - -mig_internal kern_return_t __MIG_check__Request__mach_exception_raise_state_t(__attribute__((__unused__)) __Request__mach_exception_raise_state_t *In0P, __attribute__((__unused__)) __Request__mach_exception_raise_state_t **In1PP) -{ - - typedef __Request__mach_exception_raise_state_t __Request; - __Request *In1P; -#if __MigTypeCheck - unsigned int msgh_size; -#endif /* __MigTypeCheck */ - unsigned int msgh_size_delta; - -#if __MigTypeCheck - msgh_size = In0P->Head.msgh_size; - if ((In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) || - (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 912)) || (msgh_size > (mach_msg_size_t)sizeof(__Request))) - return MIG_BAD_ARGUMENTS; -#endif /* __MigTypeCheck */ - -#if defined(__NDR_convert__int_rep__Request__mach_exception_raise_state_t__codeCnt__defined) - if (In0P->NDR.int_rep != NDR_record.int_rep) - __NDR_convert__int_rep__Request__mach_exception_raise_state_t__codeCnt(&In0P->codeCnt, In0P->NDR.int_rep); -#endif /* __NDR_convert__int_rep__Request__mach_exception_raise_state_t__codeCnt__defined */ - msgh_size_delta = (8 * In0P->codeCnt); -#if __MigTypeCheck - if ( In0P->codeCnt > 2 ) - return MIG_BAD_ARGUMENTS; - if (((msgh_size - (mach_msg_size_t)(sizeof(__Request) - 912)) / 8 < In0P->codeCnt) || - (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 912) + (8 * In0P->codeCnt))) - return MIG_BAD_ARGUMENTS; - msgh_size -= msgh_size_delta; -#endif /* __MigTypeCheck */ - - *In1PP = In1P = (__Request *) ((pointer_t) In0P + msgh_size_delta - 16); - -#if defined(__NDR_convert__int_rep__Request__mach_exception_raise_state_t__old_stateCnt__defined) - if (In0P->NDR.int_rep != NDR_record.int_rep) - __NDR_convert__int_rep__Request__mach_exception_raise_state_t__old_stateCnt(&In1P->old_stateCnt, In1P->NDR.int_rep); -#endif /* __NDR_convert__int_rep__Request__mach_exception_raise_state_t__old_stateCnt__defined */ -#if __MigTypeCheck - if ( In1P->old_stateCnt > 224 ) - return MIG_BAD_ARGUMENTS; - if (((msgh_size - (mach_msg_size_t)(sizeof(__Request) - 912)) / 4 < In1P->old_stateCnt) || - (msgh_size != (mach_msg_size_t)(sizeof(__Request) - 912) + (4 * In1P->old_stateCnt))) - return MIG_BAD_ARGUMENTS; -#endif /* __MigTypeCheck */ - - return MACH_MSG_SUCCESS; -} -#endif /* !defined(__MIG_check__Request__mach_exception_raise_state_t__defined) */ -#endif /* __MIG_check__Request__mach_exc_subsystem__ */ -#endif /* ( __MigTypeCheck ) */ - - -/* Routine mach_exception_raise_state */ -mig_internal novalue _Xmach_exception_raise_state - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP) -{ - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - int flavor; - mach_msg_type_number_t old_stateCnt; - natural_t old_state[224]; - mach_msg_trailer_t trailer; - } Request __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - typedef __Request__mach_exception_raise_state_t __Request; - typedef __Reply__mach_exception_raise_state_t Reply __attribute__((unused)); - - /* - * typedef struct { - * mach_msg_header_t Head; - * NDR_record_t NDR; - * kern_return_t RetCode; - * } mig_reply_error_t; - */ - - Request *In0P = (Request *) InHeadP; - Request *In1P; - Reply *OutP = (Reply *) OutHeadP; -#ifdef __MIG_check__Request__mach_exception_raise_state_t__defined - kern_return_t check_result; -#endif /* __MIG_check__Request__mach_exception_raise_state_t__defined */ - - __DeclareRcvRpc(2406, "mach_exception_raise_state") - __BeforeRcvRpc(2406, "mach_exception_raise_state") - -#if defined(__MIG_check__Request__mach_exception_raise_state_t__defined) - check_result = __MIG_check__Request__mach_exception_raise_state_t((__Request *)In0P, (__Request **)&In1P); - if (check_result != MACH_MSG_SUCCESS) - { MIG_RETURN_ERROR(OutP, check_result); } -#endif /* defined(__MIG_check__Request__mach_exception_raise_state_t__defined) */ - - OutP->new_stateCnt = 224; - - OutP->RetCode = catch_mach_exception_raise_state(In0P->Head.msgh_request_port, In0P->exception, In0P->code, In0P->codeCnt, &In1P->flavor, In1P->old_state, In1P->old_stateCnt, OutP->new_state, &OutP->new_stateCnt); - if (OutP->RetCode != KERN_SUCCESS) { - MIG_RETURN_ERROR(OutP, OutP->RetCode); - } - - OutP->NDR = NDR_record; - - - OutP->flavor = In1P->flavor; - OutP->Head.msgh_size = (mach_msg_size_t)(sizeof(Reply) - 896) + (((4 * OutP->new_stateCnt))); - - __AfterRcvRpc(2406, "mach_exception_raise_state") -} - -#if ( __MigTypeCheck ) -#if __MIG_check__Request__mach_exc_subsystem__ -#if !defined(__MIG_check__Request__mach_exception_raise_state_identity_t__defined) -#define __MIG_check__Request__mach_exception_raise_state_identity_t__defined - -mig_internal kern_return_t __MIG_check__Request__mach_exception_raise_state_identity_t(__attribute__((__unused__)) __Request__mach_exception_raise_state_identity_t *In0P, __attribute__((__unused__)) __Request__mach_exception_raise_state_identity_t **In1PP) -{ - - typedef __Request__mach_exception_raise_state_identity_t __Request; - __Request *In1P; -#if __MigTypeCheck - unsigned int msgh_size; -#endif /* __MigTypeCheck */ - unsigned int msgh_size_delta; - -#if __MigTypeCheck - msgh_size = In0P->Head.msgh_size; - if (!(In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) || - (In0P->msgh_body.msgh_descriptor_count != 2) || - (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 912)) || (msgh_size > (mach_msg_size_t)sizeof(__Request))) - return MIG_BAD_ARGUMENTS; -#endif /* __MigTypeCheck */ - -#if __MigTypeCheck - if (In0P->thread.type != MACH_MSG_PORT_DESCRIPTOR || - In0P->thread.disposition != 17) - return MIG_TYPE_ERROR; -#endif /* __MigTypeCheck */ - -#if __MigTypeCheck - if (In0P->task.type != MACH_MSG_PORT_DESCRIPTOR || - In0P->task.disposition != 17) - return MIG_TYPE_ERROR; -#endif /* __MigTypeCheck */ - -#if defined(__NDR_convert__int_rep__Request__mach_exception_raise_state_identity_t__codeCnt__defined) - if (In0P->NDR.int_rep != NDR_record.int_rep) - __NDR_convert__int_rep__Request__mach_exception_raise_state_identity_t__codeCnt(&In0P->codeCnt, In0P->NDR.int_rep); -#endif /* __NDR_convert__int_rep__Request__mach_exception_raise_state_identity_t__codeCnt__defined */ - msgh_size_delta = (8 * In0P->codeCnt); -#if __MigTypeCheck - if ( In0P->codeCnt > 2 ) - return MIG_BAD_ARGUMENTS; - if (((msgh_size - (mach_msg_size_t)(sizeof(__Request) - 912)) / 8 < In0P->codeCnt) || - (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 912) + (8 * In0P->codeCnt))) - return MIG_BAD_ARGUMENTS; - msgh_size -= msgh_size_delta; -#endif /* __MigTypeCheck */ - - *In1PP = In1P = (__Request *) ((pointer_t) In0P + msgh_size_delta - 16); - -#if defined(__NDR_convert__int_rep__Request__mach_exception_raise_state_identity_t__old_stateCnt__defined) - if (In0P->NDR.int_rep != NDR_record.int_rep) - __NDR_convert__int_rep__Request__mach_exception_raise_state_identity_t__old_stateCnt(&In1P->old_stateCnt, In1P->NDR.int_rep); -#endif /* __NDR_convert__int_rep__Request__mach_exception_raise_state_identity_t__old_stateCnt__defined */ -#if __MigTypeCheck - if ( In1P->old_stateCnt > 224 ) - return MIG_BAD_ARGUMENTS; - if (((msgh_size - (mach_msg_size_t)(sizeof(__Request) - 912)) / 4 < In1P->old_stateCnt) || - (msgh_size != (mach_msg_size_t)(sizeof(__Request) - 912) + (4 * In1P->old_stateCnt))) - return MIG_BAD_ARGUMENTS; -#endif /* __MigTypeCheck */ - - return MACH_MSG_SUCCESS; -} -#endif /* !defined(__MIG_check__Request__mach_exception_raise_state_identity_t__defined) */ -#endif /* __MIG_check__Request__mach_exc_subsystem__ */ -#endif /* ( __MigTypeCheck ) */ - - -/* Routine mach_exception_raise_state_identity */ -mig_internal novalue _Xmach_exception_raise_state_identity - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP) -{ - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - /* start of the kernel processed data */ - mach_msg_body_t msgh_body; - mach_msg_port_descriptor_t thread; - mach_msg_port_descriptor_t task; - /* end of the kernel processed data */ - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - int flavor; - mach_msg_type_number_t old_stateCnt; - natural_t old_state[224]; - mach_msg_trailer_t trailer; - } Request __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - typedef __Request__mach_exception_raise_state_identity_t __Request; - typedef __Reply__mach_exception_raise_state_identity_t Reply __attribute__((unused)); - - /* - * typedef struct { - * mach_msg_header_t Head; - * NDR_record_t NDR; - * kern_return_t RetCode; - * } mig_reply_error_t; - */ - - Request *In0P = (Request *) InHeadP; - Request *In1P; - Reply *OutP = (Reply *) OutHeadP; -#ifdef __MIG_check__Request__mach_exception_raise_state_identity_t__defined - kern_return_t check_result; -#endif /* __MIG_check__Request__mach_exception_raise_state_identity_t__defined */ - - __DeclareRcvRpc(2407, "mach_exception_raise_state_identity") - __BeforeRcvRpc(2407, "mach_exception_raise_state_identity") - -#if defined(__MIG_check__Request__mach_exception_raise_state_identity_t__defined) - check_result = __MIG_check__Request__mach_exception_raise_state_identity_t((__Request *)In0P, (__Request **)&In1P); - if (check_result != MACH_MSG_SUCCESS) - { MIG_RETURN_ERROR(OutP, check_result); } -#endif /* defined(__MIG_check__Request__mach_exception_raise_state_identity_t__defined) */ - - OutP->new_stateCnt = 224; - - OutP->RetCode = catch_mach_exception_raise_state_identity(In0P->Head.msgh_request_port, In0P->thread.name, In0P->task.name, In0P->exception, In0P->code, In0P->codeCnt, &In1P->flavor, In1P->old_state, In1P->old_stateCnt, OutP->new_state, &OutP->new_stateCnt); - if (OutP->RetCode != KERN_SUCCESS) { - MIG_RETURN_ERROR(OutP, OutP->RetCode); - } - - OutP->NDR = NDR_record; - - - OutP->flavor = In1P->flavor; - OutP->Head.msgh_size = (mach_msg_size_t)(sizeof(Reply) - 896) + (((4 * OutP->new_stateCnt))); - - __AfterRcvRpc(2407, "mach_exception_raise_state_identity") -} - - - -/* Description of this subsystem, for use in direct RPC */ -const struct catch_mach_exc_subsystem catch_mach_exc_subsystem = { - mach_exc_server_routine, - 2405, - 2408, - (mach_msg_size_t)sizeof(union __ReplyUnion__catch_mach_exc_subsystem), - (vm_address_t)0, - { - { (mig_impl_routine_t) 0, - (mig_stub_routine_t) _Xmach_exception_raise, 6, 0, (routine_arg_descriptor_t)0, (mach_msg_size_t)sizeof(__Reply__mach_exception_raise_t)}, - { (mig_impl_routine_t) 0, - (mig_stub_routine_t) _Xmach_exception_raise_state, 9, 0, (routine_arg_descriptor_t)0, (mach_msg_size_t)sizeof(__Reply__mach_exception_raise_state_t)}, - { (mig_impl_routine_t) 0, - (mig_stub_routine_t) _Xmach_exception_raise_state_identity, 11, 0, (routine_arg_descriptor_t)0, (mach_msg_size_t)sizeof(__Reply__mach_exception_raise_state_identity_t)}, - } -}; - -mig_external boolean_t mach_exc_server - (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP) -{ - /* - * typedef struct { - * mach_msg_header_t Head; - * NDR_record_t NDR; - * kern_return_t RetCode; - * } mig_reply_error_t; - */ - - register mig_routine_t routine; - - OutHeadP->msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REPLY(InHeadP->msgh_bits), 0); - OutHeadP->msgh_remote_port = InHeadP->msgh_reply_port; - /* Minimal size: routine() will update it if different */ - OutHeadP->msgh_size = (mach_msg_size_t)sizeof(mig_reply_error_t); - OutHeadP->msgh_local_port = MACH_PORT_NULL; - OutHeadP->msgh_id = InHeadP->msgh_id + 100; - - if ((InHeadP->msgh_id > 2407) || (InHeadP->msgh_id < 2405) || - ((routine = catch_mach_exc_subsystem.routine[InHeadP->msgh_id - 2405].stub_routine) == 0)) { - ((mig_reply_error_t *)OutHeadP)->NDR = NDR_record; - ((mig_reply_error_t *)OutHeadP)->RetCode = MIG_BAD_ID; - return FALSE; - } - (*routine) (InHeadP, OutHeadP); - return TRUE; -} - -mig_external mig_routine_t mach_exc_server_routine - (mach_msg_header_t *InHeadP) -{ - register int msgh_id; - - msgh_id = InHeadP->msgh_id - 2405; - - if ((msgh_id > 2) || (msgh_id < 0)) - return 0; - - return catch_mach_exc_subsystem.routine[msgh_id].stub_routine; -} - -#endif - diff --git a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h b/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h deleted file mode 100644 index 766ba11..0000000 --- a/Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h +++ /dev/null @@ -1,298 +0,0 @@ -#ifndef _mach_exc_server_ -#define _mach_exc_server_ - -/* Module mach_exc */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* BEGIN VOUCHER CODE */ - -#ifndef KERNEL -#if defined(__has_include) -#if __has_include() -#ifndef USING_VOUCHERS -#define USING_VOUCHERS -#endif -#ifndef __VOUCHER_FORWARD_TYPE_DECLS__ -#define __VOUCHER_FORWARD_TYPE_DECLS__ -#ifdef __cplusplus -extern "C" { -#endif - extern boolean_t voucher_mach_msg_set(mach_msg_header_t *msg) __attribute__((weak_import)); -#ifdef __cplusplus -} -#endif -#endif // __VOUCHER_FORWARD_TYPE_DECLS__ -#endif // __has_include() -#endif // __has_include -#endif // !KERNEL - -/* END VOUCHER CODE */ - - -#ifdef AUTOTEST -#ifndef FUNCTION_PTR_T -#define FUNCTION_PTR_T -typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t); -typedef struct { - char *name; - function_ptr_t function; -} function_table_entry; -typedef function_table_entry *function_table_t; -#endif /* FUNCTION_PTR_T */ -#endif /* AUTOTEST */ - -#ifndef mach_exc_MSG_COUNT -#define mach_exc_MSG_COUNT 3 -#endif /* mach_exc_MSG_COUNT */ - -#include -#include -#include -#include - -#ifdef __BeforeMigServerHeader -__BeforeMigServerHeader -#endif /* __BeforeMigServerHeader */ - - -/* Routine mach_exception_raise */ -#ifdef mig_external -mig_external -#else -extern -#endif /* mig_external */ -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 -); - -/* Routine mach_exception_raise_state */ -#ifdef mig_external -mig_external -#else -extern -#endif /* mig_external */ -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 -); - -/* Routine mach_exception_raise_state_identity */ -#ifdef mig_external -mig_external -#else -extern -#endif /* mig_external */ -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 -); - -#ifdef mig_external -mig_external -#else -extern -#endif /* mig_external */ -boolean_t mach_exc_server( - mach_msg_header_t *InHeadP, - mach_msg_header_t *OutHeadP); - -#ifdef mig_external -mig_external -#else -extern -#endif /* mig_external */ -mig_routine_t mach_exc_server_routine( - mach_msg_header_t *InHeadP); - - -/* Description of this subsystem, for use in direct RPC */ -extern const struct catch_mach_exc_subsystem { - mig_server_routine_t server; /* Server routine */ - mach_msg_id_t start; /* Min routine number */ - mach_msg_id_t end; /* Max routine number + 1 */ - unsigned int maxsize; /* Max msg size */ - vm_address_t reserved; /* Reserved */ - struct routine_descriptor /*Array of routine descriptors */ - routine[3]; -} catch_mach_exc_subsystem; - -/* typedefs for all requests */ - -#ifndef __Request__mach_exc_subsystem__defined -#define __Request__mach_exc_subsystem__defined - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - /* start of the kernel processed data */ - mach_msg_body_t msgh_body; - mach_msg_port_descriptor_t thread; - mach_msg_port_descriptor_t task; - /* end of the kernel processed data */ - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - } __Request__mach_exception_raise_t __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - int flavor; - mach_msg_type_number_t old_stateCnt; - natural_t old_state[224]; - } __Request__mach_exception_raise_state_t __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - /* start of the kernel processed data */ - mach_msg_body_t msgh_body; - mach_msg_port_descriptor_t thread; - mach_msg_port_descriptor_t task; - /* end of the kernel processed data */ - NDR_record_t NDR; - exception_type_t exception; - mach_msg_type_number_t codeCnt; - int64_t code[2]; - int flavor; - mach_msg_type_number_t old_stateCnt; - natural_t old_state[224]; - } __Request__mach_exception_raise_state_identity_t __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif -#endif /* !__Request__mach_exc_subsystem__defined */ - - -/* union of all requests */ - -#ifndef __RequestUnion__catch_mach_exc_subsystem__defined -#define __RequestUnion__catch_mach_exc_subsystem__defined -union __RequestUnion__catch_mach_exc_subsystem { - __Request__mach_exception_raise_t Request_mach_exception_raise; - __Request__mach_exception_raise_state_t Request_mach_exception_raise_state; - __Request__mach_exception_raise_state_identity_t Request_mach_exception_raise_state_identity; -}; -#endif /* __RequestUnion__catch_mach_exc_subsystem__defined */ -/* typedefs for all replies */ - -#ifndef __Reply__mach_exc_subsystem__defined -#define __Reply__mach_exc_subsystem__defined - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - NDR_record_t NDR; - kern_return_t RetCode; - } __Reply__mach_exception_raise_t __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - NDR_record_t NDR; - kern_return_t RetCode; - int flavor; - mach_msg_type_number_t new_stateCnt; - natural_t new_state[224]; - } __Reply__mach_exception_raise_state_t __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif - -#ifdef __MigPackStructs -#pragma pack(4) -#endif - typedef struct { - mach_msg_header_t Head; - NDR_record_t NDR; - kern_return_t RetCode; - int flavor; - mach_msg_type_number_t new_stateCnt; - natural_t new_state[224]; - } __Reply__mach_exception_raise_state_identity_t __attribute__((unused)); -#ifdef __MigPackStructs -#pragma pack() -#endif -#endif /* !__Reply__mach_exc_subsystem__defined */ - - -/* union of all replies */ - -#ifndef __ReplyUnion__catch_mach_exc_subsystem__defined -#define __ReplyUnion__catch_mach_exc_subsystem__defined -union __ReplyUnion__catch_mach_exc_subsystem { - __Reply__mach_exception_raise_t Reply_mach_exception_raise; - __Reply__mach_exception_raise_state_t Reply_mach_exception_raise_state; - __Reply__mach_exception_raise_state_identity_t Reply_mach_exception_raise_state_identity; -}; -#endif /* __RequestUnion__catch_mach_exc_subsystem__defined */ - -#ifndef subsystem_to_name_map_mach_exc -#define subsystem_to_name_map_mach_exc \ - { "mach_exception_raise", 2405 },\ - { "mach_exception_raise_state", 2406 },\ - { "mach_exception_raise_state_identity", 2407 } -#endif - -#ifdef __AfterMigServerHeader -__AfterMigServerHeader -#endif /* __AfterMigServerHeader */ - -#endif /* _mach_exc_server_ */ diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift index f4d933c..740c392 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift @@ -61,7 +61,7 @@ public func withAssertionHandler(_ tempAssertionHandler: AssertionHandler, closu /// This can be useful if you want to gather information about expectations /// that occur within a closure. /// -/// @param silently expectations are no longer send to the default Nimble +/// @param silently expectations are no longer send to the default Nimble /// assertion handler when this is true. Defaults to false. /// /// @see gatherFailingExpectations diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift index 1c51cd7..5e1afd5 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift @@ -1,6 +1,14 @@ import Foundation -#if _runtime(_ObjC) +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + +private func from(objcPredicate: NMBPredicate) -> Predicate { + return Predicate { actualExpression in + let result = objcPredicate.satisfies(({ try! actualExpression.evaluate() }), + location: actualExpression.location) + return result.toSwift() + } +} internal struct ObjCMatcherWrapper: Matcher { let matcher: NMBMatcher @@ -22,13 +30,13 @@ internal struct ObjCMatcherWrapper: Matcher { // Equivalent to Expectation, but for Nimble's Objective-C interface public class NMBExpectation: NSObject { - internal let _actualBlock: () -> NSObject! + internal let _actualBlock: () -> NSObject? internal var _negative: Bool internal let _file: FileString internal let _line: UInt internal var _timeout: TimeInterval = 1.0 - public init(actualBlock: @escaping () -> NSObject!, negative: Bool, file: FileString, line: UInt) { + @objc public init(actualBlock: @escaping () -> NSObject?, negative: Bool, file: FileString, line: UInt) { self._actualBlock = actualBlock self._negative = negative self._file = file @@ -41,89 +49,137 @@ public class NMBExpectation: NSObject { } } - public var withTimeout: (TimeInterval) -> NMBExpectation { + @objc public var withTimeout: (TimeInterval) -> NMBExpectation { return ({ timeout in self._timeout = timeout return self }) } - public var to: (NMBMatcher) -> Void { + @objc public var to: (NMBMatcher) -> Void { return ({ matcher in - self.expectValue.to(ObjCMatcherWrapper(matcher: matcher)) + if let pred = matcher as? NMBPredicate { + self.expectValue.to(from(objcPredicate: pred)) + } else { + self.expectValue.to(ObjCMatcherWrapper(matcher: matcher)) + } }) } - public var toWithDescription: (NMBMatcher, String) -> Void { + @objc public var toWithDescription: (NMBMatcher, String) -> Void { return ({ matcher, description in - self.expectValue.to(ObjCMatcherWrapper(matcher: matcher), description: description) + if let pred = matcher as? NMBPredicate { + self.expectValue.to(from(objcPredicate: pred), description: description) + } else { + self.expectValue.to(ObjCMatcherWrapper(matcher: matcher), description: description) + } }) } - public var toNot: (NMBMatcher) -> Void { + @objc public var toNot: (NMBMatcher) -> Void { return ({ matcher in - self.expectValue.toNot( - ObjCMatcherWrapper(matcher: matcher) - ) + if let pred = matcher as? NMBPredicate { + self.expectValue.toNot(from(objcPredicate: pred)) + } else { + self.expectValue.toNot(ObjCMatcherWrapper(matcher: matcher)) + } }) } - public var toNotWithDescription: (NMBMatcher, String) -> Void { + @objc public var toNotWithDescription: (NMBMatcher, String) -> Void { return ({ matcher, description in - self.expectValue.toNot( - ObjCMatcherWrapper(matcher: matcher), description: description - ) + if let pred = matcher as? NMBPredicate { + self.expectValue.toNot(from(objcPredicate: pred), description: description) + } else { + self.expectValue.toNot(ObjCMatcherWrapper(matcher: matcher), description: description) + } }) } - public var notTo: (NMBMatcher) -> Void { return toNot } + @objc public var notTo: (NMBMatcher) -> Void { return toNot } - public var notToWithDescription: (NMBMatcher, String) -> Void { return toNotWithDescription } + @objc public var notToWithDescription: (NMBMatcher, String) -> Void { return toNotWithDescription } - public var toEventually: (NMBMatcher) -> Void { + @objc public var toEventually: (NMBMatcher) -> Void { return ({ matcher in - self.expectValue.toEventually( - ObjCMatcherWrapper(matcher: matcher), - timeout: self._timeout, - description: nil - ) + if let pred = matcher as? NMBPredicate { + self.expectValue.toEventually( + from(objcPredicate: pred), + timeout: self._timeout, + description: nil + ) + } else { + self.expectValue.toEventually( + ObjCMatcherWrapper(matcher: matcher), + timeout: self._timeout, + description: nil + ) + } }) } - public var toEventuallyWithDescription: (NMBMatcher, String) -> Void { + @objc public var toEventuallyWithDescription: (NMBMatcher, String) -> Void { return ({ matcher, description in - self.expectValue.toEventually( - ObjCMatcherWrapper(matcher: matcher), - timeout: self._timeout, - description: description - ) + if let pred = matcher as? NMBPredicate { + self.expectValue.toEventually( + from(objcPredicate: pred), + timeout: self._timeout, + description: description + ) + } else { + self.expectValue.toEventually( + ObjCMatcherWrapper(matcher: matcher), + timeout: self._timeout, + description: description + ) + } }) } - public var toEventuallyNot: (NMBMatcher) -> Void { + @objc public var toEventuallyNot: (NMBMatcher) -> Void { return ({ matcher in - self.expectValue.toEventuallyNot( - ObjCMatcherWrapper(matcher: matcher), - timeout: self._timeout, - description: nil - ) + if let pred = matcher as? NMBPredicate { + self.expectValue.toEventuallyNot( + from(objcPredicate: pred), + timeout: self._timeout, + description: nil + ) + } else { + self.expectValue.toEventuallyNot( + ObjCMatcherWrapper(matcher: matcher), + timeout: self._timeout, + description: nil + ) + } }) } - public var toEventuallyNotWithDescription: (NMBMatcher, String) -> Void { + @objc public var toEventuallyNotWithDescription: (NMBMatcher, String) -> Void { return ({ matcher, description in - self.expectValue.toEventuallyNot( - ObjCMatcherWrapper(matcher: matcher), - timeout: self._timeout, - description: description - ) + if let pred = matcher as? NMBPredicate { + self.expectValue.toEventuallyNot( + from(objcPredicate: pred), + timeout: self._timeout, + description: description + ) + } else { + self.expectValue.toEventuallyNot( + ObjCMatcherWrapper(matcher: matcher), + timeout: self._timeout, + description: description + ) + } }) } - public var toNotEventually: (NMBMatcher) -> Void { return toEventuallyNot } + @objc public var toNotEventually: (NMBMatcher) -> Void { + return toEventuallyNot + } - public var toNotEventuallyWithDescription: (NMBMatcher, String) -> Void { return toEventuallyNotWithDescription } + @objc public var toNotEventuallyWithDescription: (NMBMatcher, String) -> Void { + return toEventuallyNotWithDescription + } - public class func failWithMessage(_ message: String, file: FileString, line: UInt) { + @objc public class func failWithMessage(_ message: String, file: FileString, line: UInt) { fail(message, location: SourceLocation(file: file, line: line)) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift index 19a4567..0288b75 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift @@ -1,9 +1,11 @@ import Foundation -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +// swiftlint:disable line_length public typealias MatcherBlock = (_ actualExpression: Expression, _ failureMessage: FailureMessage) -> Bool public typealias FullMatcherBlock = (_ actualExpression: Expression, _ failureMessage: FailureMessage, _ shouldNotMatch: Bool) -> Bool +// swiftlint:enable line_length public class NMBObjCMatcher: NSObject, NMBMatcher { let _match: MatcherBlock @@ -53,7 +55,7 @@ public class NMBObjCMatcher: NSObject, NMBMatcher { return true } - public func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + public func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { let expr = Expression(expression: actualBlock, location: location) let result = _match( expr, @@ -65,7 +67,7 @@ public class NMBObjCMatcher: NSObject, NMBMatcher { } } - public func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { let expr = Expression(expression: actualBlock, location: location) let result = _doesNotMatch( expr, diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift index a55cb27..e1b5432 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift @@ -2,7 +2,7 @@ import Dispatch import Foundation /// "Global" state of Nimble is stored here. Only DSL functions should access / be aware of this -/// class' existance +/// class' existence internal class NimbleEnvironment { static var activeInstance: NimbleEnvironment { get { diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift index 78e6dd9..c8d32ad 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift @@ -42,18 +42,29 @@ class NimbleXCTestUnavailableHandler: AssertionHandler { private(set) var currentTestCase: XCTestCase? + private var stashed_swift_reportFatalErrorsToDebugger: Bool = false + @objc func testCaseWillStart(_ testCase: XCTestCase) { + #if swift(>=3.2) + stashed_swift_reportFatalErrorsToDebugger = _swift_reportFatalErrorsToDebugger + _swift_reportFatalErrorsToDebugger = false + #endif + currentTestCase = testCase } @objc func testCaseDidFinish(_ testCase: XCTestCase) { currentTestCase = nil + + #if swift(>=3.2) + _swift_reportFatalErrorsToDebugger = stashed_swift_reportFatalErrorsToDebugger + #endif } } #endif func isXCTestAvailable() -> Bool { -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) // XCTest is weakly linked and so may not be present return NSClassFromString("XCTestCase") != nil #else @@ -66,7 +77,12 @@ private func recordFailure(_ message: String, location: SourceLocation) { XCTFail("\(message)", file: location.file, line: location.line) #else if let testCase = CurrentTestCaseTracker.sharedInstance.currentTestCase { - testCase.recordFailure(withDescription: message, inFile: location.file, atLine: location.line, expected: true) + #if swift(>=4) + let line = Int(location.line) + #else + let line = location.line + #endif + testCase.recordFailure(withDescription: message, inFile: location.file, atLine: line, expected: true) } else { let msg = "Attempted to report a test failure to XCTest while no test case was running. " + "The failure was:\n\"\(message)\"\nIt occurred at: \(location.file):\(location.line)" diff --git a/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift b/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift index 1930dcc..e874136 100644 --- a/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift +++ b/Example/Pods/Nimble/Sources/Nimble/DSL+Wait.swift @@ -11,25 +11,42 @@ private enum ErrorResult { /// bridges to Objective-C via the @objc keyword. This class encapsulates callback-style /// asynchronous waiting logic so that it may be called from Objective-C and Swift. internal class NMBWait: NSObject { +// About these kind of lines, `@objc` attributes are only required for Objective-C +// support, so that should be conditional on Darwin platforms and normal Xcode builds +// (non-SwiftPM builds). +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objc internal class func until( timeout: TimeInterval, file: FileString = #file, line: UInt = #line, - action: @escaping (@escaping () -> Void) -> Void) -> Void { + action: @escaping (@escaping () -> Void) -> Void) { return throwableUntil(timeout: timeout, file: file, line: line) { done in action(done) } } +#else + internal class func until( + timeout: TimeInterval, + file: FileString = #file, + line: UInt = #line, + action: @escaping (@escaping () -> Void) -> Void) { + return throwableUntil(timeout: timeout, file: file, line: line) { done in + action(done) + } + } +#endif // Using a throwable closure makes this method not objc compatible. internal class func throwableUntil( timeout: TimeInterval, file: FileString = #file, line: UInt = #line, - action: @escaping (@escaping () -> Void) throws -> Void) -> Void { + action: @escaping (@escaping () -> Void) throws -> Void) { let awaiter = NimbleEnvironment.activeInstance.awaiter let leeway = timeout / 2.0 - let result = awaiter.performBlock { (done: @escaping (ErrorResult) -> Void) throws -> Void in + // swiftlint:disable:next line_length + let result = awaiter.performBlock(file: file, line: line) { (done: @escaping (ErrorResult) -> Void) throws -> Void in DispatchQueue.main.async { let capture = NMBExceptionCapture( handler: ({ exception in @@ -70,19 +87,20 @@ internal class NMBWait: NSObject { } } - #if SWIFT_PACKAGE - internal class func until(_ file: FileString = #file, line: UInt = #line, action: @escaping (() -> Void) -> Void) -> Void { +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objc(untilFile:line:action:) + internal class func until(_ file: FileString = #file, line: UInt = #line, action: @escaping (() -> Void) -> Void) { until(timeout: 1, file: file, line: line, action: action) } - #else - @objc(untilFile:line:action:) - internal class func until(_ file: FileString = #file, line: UInt = #line, action: @escaping (() -> Void) -> Void) -> Void { +#else + internal class func until(_ file: FileString = #file, line: UInt = #line, action: @escaping (() -> Void) -> Void) { until(timeout: 1, file: file, line: line, action: action) } - #endif +#endif } internal func blockedRunLoopErrorMessageFor(_ fnName: String, leeway: TimeInterval) -> 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." } @@ -90,9 +108,9 @@ internal func blockedRunLoopErrorMessageFor(_ fnName: String, leeway: TimeInterv /// /// @discussion /// Call the done() closure to indicate the waiting has completed. -/// +/// /// 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 = 1, file: FileString = #file, line: UInt = #line, action: @escaping (@escaping () -> Void) -> Void) -> Void { +public func waitUntil(timeout: TimeInterval = 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 7ebd684..e49bb0c 100644 --- a/Example/Pods/Nimble/Sources/Nimble/DSL.swift +++ b/Example/Pods/Nimble/Sources/Nimble/DSL.swift @@ -43,7 +43,7 @@ internal func nimblePrecondition( line: UInt = #line) { let result = expr() if !result { -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) let e = NSException( name: NSExceptionName(name()), reason: message(), diff --git a/Example/Pods/Nimble/Sources/Nimble/Expectation.swift b/Example/Pods/Nimble/Sources/Nimble/Expectation.swift index c5978f4..e3f616a 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Expectation.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Expectation.swift @@ -1,5 +1,6 @@ import Foundation +// Deprecated internal func expressionMatches(_ expression: Expression, matcher: U, to: String, description: String?) -> (Bool, FailureMessage) where U: Matcher, U.ValueType == T { let msg = FailureMessage() @@ -12,11 +13,12 @@ internal func expressionMatches(_ expression: Expression, matcher: U, t } return (pass, msg) } catch let error { - msg.actualValue = "an unexpected error thrown: <\(error)>" + msg.stringValue = "unexpected error thrown: <\(error)>" return (false, msg) } } +// Deprecated internal func expressionDoesNotMatch(_ expression: Expression, matcher: U, toNot: String, description: String?) -> (Bool, FailureMessage) where U: Matcher, U.ValueType == T { let msg = FailureMessage() @@ -29,11 +31,46 @@ internal func expressionDoesNotMatch(_ expression: Expression, matcher: } return (pass, msg) } catch let error { - msg.actualValue = "an unexpected error thrown: <\(error)>" + msg.stringValue = "unexpected error thrown: <\(error)>" return (false, msg) } } +internal func execute(_ expression: Expression, _ style: ExpectationStyle, _ predicate: Predicate, to: String, description: String?, captureExceptions: Bool = true) -> (Bool, FailureMessage) { + func run() -> (Bool, FailureMessage) { + let msg = FailureMessage() + msg.userDescription = description + msg.to = to + do { + let result = try predicate.satisfies(expression) + result.message.update(failureMessage: msg) + if msg.actualValue == "" { + msg.actualValue = "<\(stringify(try expression.evaluate()))>" + } + return (result.toBoolean(expectation: style), msg) + } catch let error { + msg.stringValue = "unexpected error thrown: <\(error)>" + return (false, msg) + } + } + + var result: (Bool, FailureMessage) = (false, FailureMessage()) + if captureExceptions { + let capture = NMBExceptionCapture(handler: ({ exception -> Void in + let msg = FailureMessage() + msg.stringValue = "unexpected exception raised: \(exception)" + result = (false, msg) + }), finally: nil) + capture.tryBlock { + result = run() + } + } else { + result = run() + } + + return result +} + public struct Expectation { public let expression: Expression @@ -43,21 +80,24 @@ public struct Expectation { handler.assert(pass, message: message, location: expression.location) } - /// Tests the actual value using a matcher to match. + ////////////////// OLD API ///////////////////// + + /// DEPRECATED: Tests the actual value using a matcher to match. public func to(_ matcher: U, description: String? = nil) where U: Matcher, U.ValueType == T { let (pass, msg) = expressionMatches(expression, matcher: matcher, to: "to", description: description) verify(pass, msg) } - /// Tests the actual value using a matcher to not match. + /// DEPRECATED: Tests the actual value using a matcher to not match. public func toNot(_ matcher: U, description: String? = nil) 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) } - /// Tests the actual value using a matcher to not match. + /// DEPRECATED: Tests the actual value using a matcher to not match. /// /// Alias to toNot(). public func notTo(_ matcher: U, description: String? = nil) @@ -65,6 +105,27 @@ public struct Expectation { toNot(matcher, description: description) } + ////////////////// NEW API ///////////////////// + + /// Tests the actual value using a matcher to match. + public func to(_ predicate: Predicate, description: String? = nil) { + let (pass, msg) = execute(expression, .toMatch, predicate, to: "to", description: description) + verify(pass, msg) + } + + /// Tests the actual value using a matcher to not match. + public func toNot(_ predicate: Predicate, description: String? = nil) { + let (pass, msg) = execute(expression, .toNotMatch, predicate, to: "to not", description: description) + verify(pass, msg) + } + + /// 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) + } + // see: // - AsyncMatcherWrapper for extension // - NMBExpectation for Objective-C interface diff --git a/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift b/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift new file mode 100644 index 0000000..992ee0e --- /dev/null +++ b/Example/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift @@ -0,0 +1,262 @@ +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) + /// excludes actual value in output ("expected to ") + case expectedTo(/* message: */ String) + /// allows any free-form message ("") + case fail(/* message: */ String) + + // --- Composite Expectations --- + // Generally, you'll want the methods, appended(message:) and appended(details:) instead. + + /// Not Fully Implemented Yet. + case prepends(/* Prepended Message */ String, ExpectationMessage) + + /// appends after an existing message (" (use beNil() to match nils)") + case appends(ExpectationMessage, /* Appended Message */ String) + + /// 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. + public var expectedMessage: String { + switch self { + case let .fail(msg): + return msg + case let .expectedTo(msg): + return msg + case let .expectedActualValueTo(msg): + return msg + case let .expectedCustomValueTo(msg, _): + return msg + case let .prepends(_, expectation): + return expectation.expectedMessage + case let .appends(expectation, msg): + return "\(expectation.expectedMessage)\(msg)" + case let .details(expectation, _): + return expectation.expectedMessage + } + } + + /// Appends a message after the primary expectation message + public func appended(message: String) -> ExpectationMessage { + switch self { + case .fail, .expectedTo, .expectedActualValueTo, .expectedCustomValueTo, .appends, .prepends: + return .appends(self, message) + case let .details(expectation, msg): + return .details(expectation.appended(message: message), msg) + } + } + + /// Appends a message hinting to use beNil() for when the actual value given was nil. + public func appendedBeNilHint() -> ExpectationMessage { + return appended(message: " (use beNil() to match nils)") + } + + /// Appends a detailed (aka - multiline) message after the primary expectation message + /// Detailed messages will be placed after .appended(message:) calls. + public func appended(details: String) -> ExpectationMessage { + return .details(self, details) + } + + internal func visitLeafs(_ f: (ExpectationMessage) -> ExpectationMessage) -> ExpectationMessage { + switch self { + case .fail, .expectedTo, .expectedActualValueTo, .expectedCustomValueTo: + return f(self) + case let .prepends(msg, expectation): + return .prepends(msg, expectation.visitLeafs(f)) + case let .appends(expectation, msg): + return .appends(expectation.visitLeafs(f), msg) + case let .details(expectation, msg): + return .details(expectation.visitLeafs(f), msg) + } + } + + /// Replaces a primary expectation with one returned by f. Preserves all composite expectations + /// that were built upon it (aka - all appended(message:) and appended(details:). + public func replacedExpectation(_ f: @escaping (ExpectationMessage) -> ExpectationMessage) -> ExpectationMessage { + func walk(_ msg: ExpectationMessage) -> ExpectationMessage { + switch msg { + case .fail, .expectedTo, .expectedActualValueTo, .expectedCustomValueTo: + return f(msg) + default: + return msg + } + } + return visitLeafs(walk) + } + + /// Wraps a primary expectation with text before and after it. + /// Alias to prepended(message: before).appended(message: after) + public func wrappedExpectation(before: String, after: String) -> ExpectationMessage { + return prepended(expectation: before).appended(message: after) + } + + /// Prepends a message by modifying the primary expectation + public func prepended(expectation message: String) -> ExpectationMessage { + func walk(_ msg: ExpectationMessage) -> ExpectationMessage { + switch msg { + case let .expectedTo(msg): + return .expectedTo(message + msg) + case let .expectedActualValueTo(msg): + return .expectedActualValueTo(message + msg) + case let .expectedCustomValueTo(msg, actual): + return .expectedCustomValueTo(message + msg, actual) + default: + return msg.visitLeafs(walk) + } + } + return visitLeafs(walk) + } + + // TODO: test & verify correct behavior + internal func prepended(message: String) -> ExpectationMessage { + return .prepends(message, self) + } + + /// Converts the tree of ExpectationMessages into a final built string. + public func toString(actual: String, expected: String = "expected", to: String = "to") -> String { + switch self { + case let .fail(msg): + return msg + case let .expectedTo(msg): + return "\(expected) \(to) \(msg)" + case let .expectedActualValueTo(msg): + return "\(expected) \(to) \(msg), got \(actual)" + case let .expectedCustomValueTo(msg, actual): + return "\(expected) \(to) \(msg), got \(actual)" + case let .prepends(msg, expectation): + return "\(msg)\(expectation.toString(actual: actual, expected: expected, to: to))" + case let .appends(expectation, msg): + return "\(expectation.toString(actual: actual, expected: expected, to: to))\(msg)" + case let .details(expectation, msg): + return "\(expectation.toString(actual: actual, expected: expected, to: to))\n\n\(msg)" + } + } + + // Backwards compatibility: converts ExpectationMessage tree to FailureMessage + internal func update(failureMessage: FailureMessage) { + switch self { + case let .fail(msg): + failureMessage.stringValue = msg + case let .expectedTo(msg): + failureMessage.actualValue = nil + failureMessage.postfixMessage = msg + case let .expectedActualValueTo(msg): + failureMessage.postfixMessage = msg + case let .expectedCustomValueTo(msg, actual): + failureMessage.postfixMessage = msg + failureMessage.actualValue = actual + case let .prepends(msg, expectation): + expectation.update(failureMessage: failureMessage) + if let desc = failureMessage.userDescription { + failureMessage.userDescription = "\(msg)\(desc)" + } else { + failureMessage.userDescription = msg + } + case let .appends(expectation, msg): + expectation.update(failureMessage: failureMessage) + failureMessage.appendMessage(msg) + case let .details(expectation, msg): + expectation.update(failureMessage: failureMessage) + failureMessage.appendDetails(msg) + } + } +} + +extension FailureMessage { + internal func toExpectationMessage() -> ExpectationMessage { + let defaultMsg = FailureMessage() + if expected != defaultMsg.expected || _stringValueOverride != nil { + return .fail(stringValue) + } + + var msg: ExpectationMessage = .fail(userDescription ?? "") + if actualValue != "" && actualValue != nil { + msg = .expectedCustomValueTo(postfixMessage, actualValue ?? "") + } else if postfixMessage != defaultMsg.postfixMessage { + if actualValue == nil { + msg = .expectedTo(postfixMessage) + } else { + msg = .expectedActualValueTo(postfixMessage) + } + } + if postfixActual != defaultMsg.postfixActual { + msg = .appends(msg, postfixActual) + } + if let m = extendedMessage { + msg = .details(msg, m) + } + return msg + } +} + +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + +public class NMBExpectationMessage: NSObject { + private let msg: ExpectationMessage + + internal init(swift msg: ExpectationMessage) { + self.msg = msg + } + + public init(expectedTo message: String) { + self.msg = .expectedTo(message) + } + public init(expectedActualValueTo message: String) { + self.msg = .expectedActualValueTo(message) + } + + public init(expectedActualValueTo message: String, customActualValue actual: String) { + self.msg = .expectedCustomValueTo(message, actual) + } + + public init(fail message: String) { + self.msg = .fail(message) + } + + public init(prepend message: String, child: NMBExpectationMessage) { + self.msg = .prepends(message, child.msg) + } + + public init(appendedMessage message: String, child: NMBExpectationMessage) { + self.msg = .appends(child.msg, message) + } + + public init(prependedMessage message: String, child: NMBExpectationMessage) { + self.msg = .prepends(message, child.msg) + } + + public init(details message: String, child: NMBExpectationMessage) { + self.msg = .details(child.msg, message) + } + + public func appendedBeNilHint() -> NMBExpectationMessage { + return NMBExpectationMessage(swift: msg.appendedBeNilHint()) + } + + public func toSwift() -> ExpectationMessage { return self.msg } +} + +extension ExpectationMessage { + func toObjectiveC() -> NMBExpectationMessage { + return NMBExpectationMessage(swift: self) + } +} + +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Expression.swift b/Example/Pods/Nimble/Sources/Nimble/Expression.swift index f7afffe..5a233fd 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Expression.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Expression.swift @@ -77,7 +77,11 @@ public struct Expression { /// @param block The block that can cast the current Expression value to a /// new type. public func cast(_ block: @escaping (T?) throws -> U?) -> Expression { - return Expression(expression: ({ try block(self.evaluate()) }), location: self.location, isClosure: self.isClosure) + return Expression( + expression: ({ try block(self.evaluate()) }), + location: self.location, + isClosure: self.isClosure + ) } public func evaluate() throws -> T? { @@ -85,6 +89,11 @@ public struct Expression { } public func withoutCaching() -> Expression { - return Expression(memoizedExpression: self._expression, location: location, withoutCaching: true, isClosure: isClosure) + return Expression( + memoizedExpression: self._expression, + location: location, + withoutCaching: true, + isClosure: isClosure + ) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/FailureMessage.swift b/Example/Pods/Nimble/Sources/Nimble/FailureMessage.swift index 24b6c8f..2bc57eb 100644 --- a/Example/Pods/Nimble/Sources/Nimble/FailureMessage.swift +++ b/Example/Pods/Nimble/Sources/Nimble/FailureMessage.swift @@ -12,8 +12,8 @@ public class FailureMessage: NSObject { /// An optional message that will be appended as a new line and provides additional details /// about the failure. This message will only be visible in the issue navigator / in logs but /// not directly in the source editor since only a single line is presented there. - public var extendedMessage: String? = nil - public var userDescription: String? = nil + public var extendedMessage: String? + public var userDescription: String? public var stringValue: String { get { @@ -29,6 +29,9 @@ public class FailureMessage: NSObject { } internal var _stringValueOverride: String? + internal var hasOverriddenStringValue: Bool { + return _stringValueOverride != nil + } public override init() { } @@ -62,4 +65,28 @@ public class FailureMessage: NSObject { return value } + + internal func appendMessage(_ msg: String) { + if hasOverriddenStringValue { + stringValue += "\(msg)" + } else if actualValue != nil { + postfixActual += msg + } else { + postfixMessage += msg + } + } + + internal func appendDetails(_ msg: String) { + if hasOverriddenStringValue { + if let desc = userDescription { + stringValue = "\(desc)\n\(stringValue)" + } + stringValue += "\n\(msg)" + } else { + if let desc = userDescription { + userDescription = desc + } + extendedMessage = msg + } + } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift index 73e79d3..8affa62 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift @@ -1,66 +1,79 @@ import Foundation public func allPass - (_ passFunc: @escaping (T?) -> Bool) -> NonNilMatcherFunc - where U: Sequence, U.Iterator.Element == T { - return allPass("pass a condition", passFunc) + (_ 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 - (_ passName: String, _ passFunc: @escaping (T?) -> Bool) -> NonNilMatcherFunc - where U: Sequence, U.Iterator.Element == T { - return createAllPassMatcher { expression, failureMessage in - failureMessage.postfixMessage = passName - return passFunc(try expression.evaluate()) - } + (_ 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 - (_ matcher: V) -> NonNilMatcherFunc - where U: Sequence, V: Matcher, U.Iterator.Element == V.ValueType { - return createAllPassMatcher { - try matcher.matches($0, failureMessage: $1) - } +public func allPass(_ elementMatcher: M) -> Predicate + where S: Sequence, M: Matcher, S.Iterator.Element == M.ValueType { + return createPredicate(elementMatcher.predicate) +} + +public func allPass(_ elementPredicate: Predicate) -> Predicate + where S: Sequence { + return createPredicate(elementPredicate) } -private func createAllPassMatcher - (_ elementEvaluator: @escaping (Expression, FailureMessage) throws -> Bool) -> NonNilMatcherFunc - where U: Sequence, U.Iterator.Element == T { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.actualValue = nil - if let actualValue = try actualExpression.evaluate() { +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)") + ) + } + + var failure: ExpectationMessage = .expectedTo("all pass") for currentElement in actualValue { let exp = Expression( expression: {currentElement}, location: actualExpression.location) - if try !elementEvaluator(exp, failureMessage) { - failureMessage.postfixMessage = - "all \(failureMessage.postfixMessage)," - + " but failed first at element <\(stringify(currentElement))>" - + " in <\(stringify(actualValue))>" - return false + 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) } } - failureMessage.postfixMessage = "all \(failureMessage.postfixMessage)" - } else { - failureMessage.postfixMessage = "all pass (use beNil() to match nils)" - return false + failure = failure.replacedExpectation({ expectation in + return .expectedTo(expectation.expectedMessage) + }) + return PredicateResult(status: .matches, message: failure) } - - return true - } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func allPassMatcher(_ matcher: NMBObjCMatcher) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func allPassMatcher(_ matcher: NMBMatcher) -> NMBPredicate { + return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try! actualExpression.evaluate() var nsObjects = [NSObject]() var collectionIsUsable = true if let value = actualValue as? NSFastEnumeration { - let generator = NSFastEnumerationIterator(value) + var generator = NSFastEnumerationIterator(value) while let obj = generator.next() { if let nsObject = obj as? NSObject { nsObjects.append(nsObject) @@ -74,20 +87,34 @@ extension NMBObjCMatcher { } if !collectionIsUsable { - failureMessage.postfixMessage = - "allPass only works with NSFastEnumeration (NSArray, NSSet, ...) of NSObjects" - failureMessage.expected = "" - failureMessage.to = "" - return false + return NMBPredicateResult( + status: NMBPredicateStatus.fail, + message: NMBExpectationMessage( + // swiftlint:disable:next line_length + fail: "allPass can only be used with types which implement NSFastEnumeration (NSArray, NSSet, ...), and whose elements subclass NSObject, got <\(actualValue?.description ?? "nil")>" + ) + ) } let expr = Expression(expression: ({ nsObjects }), location: location) - let elementEvaluator: (Expression, FailureMessage) -> Bool = { - expression, failureMessage in - return matcher.matches({try! expression.evaluate()}, failureMessage: failureMessage, location: expr.location) - } - return try! createAllPassMatcher(elementEvaluator).matches( - expr, failureMessage: failureMessage) + let pred: Predicate<[NSObject]> = createPredicate(Predicate { expr in + if let predicate = matcher as? NMBPredicate { + return predicate.satisfies(({ try! expr.evaluate() }), location: expr.location).toSwift() + } else { + let failureMessage = FailureMessage() + let result = matcher.matches( + ({ try! expr.evaluate() }), + failureMessage: failureMessage, + location: expr.location + ) + let expectationMsg = failureMessage.toExpectationMessage() + return PredicateResult( + bool: result, + message: expectationMsg + ) + } + }) + return try! pred.satisfies(expr).toObjectiveC() } } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/AsyncMatcherWrapper.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/AsyncMatcherWrapper.swift index b971ccc..3cba8b0 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/AsyncMatcherWrapper.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/AsyncMatcherWrapper.swift @@ -7,6 +7,37 @@ public struct AsyncDefaults { public static var PollInterval: TimeInterval = 0.01 } +private func async(style: ExpectationStyle, predicate: Predicate, timeout: TimeInterval, poll: TimeInterval, fnName: String) -> Predicate { + return Predicate { actualExpression in + let uncachedExpression = actualExpression.withoutCaching() + let fnName = "expect(...).\(fnName)(...)" + var lastPredicateResult: PredicateResult? + let result = pollBlock( + pollInterval: poll, + timeoutInterval: timeout, + file: actualExpression.location.file, + line: actualExpression.location.line, + fnName: fnName) { + lastPredicateResult = try predicate.satisfies(uncachedExpression) + return lastPredicateResult!.toBoolean(expectation: style) + } + switch result { + case .completed: return lastPredicateResult! + case .timedOut: return PredicateResult(status: .fail, message: lastPredicateResult!.message) + case let .errorThrown(error): + return PredicateResult(status: .fail, message: .fail("unexpected error thrown: <\(error)>")) + case let .raisedException(exception): + return PredicateResult(status: .fail, message: .fail("unexpected exception raised: \(exception)")) + case .blockedRunLoop: + // swiftlint:disable:next line_length + return PredicateResult(status: .fail, message: lastPredicateResult!.message.appended(message: " (timed out, but main thread was unresponsive).")) + case .incomplete: + internalError("Reached .incomplete state for toEventually(...).") + } + } +} + +// Deprecated internal struct AsyncMatcherWrapper: Matcher where U: Matcher, U.ValueType == T { let fullMatcher: U @@ -34,10 +65,10 @@ internal struct AsyncMatcherWrapper: Matcher case let .completed(isSuccessful): return isSuccessful case .timedOut: return false case let .errorThrown(error): - failureMessage.actualValue = "an unexpected error thrown: <\(error)>" + failureMessage.stringValue = "an unexpected error thrown: <\(error)>" return false case let .raisedException(exception): - failureMessage.actualValue = "an unexpected exception thrown: <\(exception)>" + failureMessage.stringValue = "an unexpected exception thrown: <\(exception)>" return false case .blockedRunLoop: failureMessage.postfixMessage += " (timed out, but main thread was unresponsive)." @@ -61,10 +92,10 @@ internal struct AsyncMatcherWrapper: Matcher case let .completed(isSuccessful): return isSuccessful case .timedOut: return false case let .errorThrown(error): - failureMessage.actualValue = "an unexpected error thrown: <\(error)>" + failureMessage.stringValue = "an unexpected error thrown: <\(error)>" return false case let .raisedException(exception): - failureMessage.actualValue = "an unexpected exception thrown: <\(exception)>" + failureMessage.stringValue = "an unexpected exception thrown: <\(exception)>" return false case .blockedRunLoop: failureMessage.postfixMessage += " (timed out, but main thread was unresponsive)." @@ -75,8 +106,72 @@ internal struct AsyncMatcherWrapper: Matcher } } -private let toEventuallyRequiresClosureError = FailureMessage(stringValue: "expect(...).toEventually(...) requires an explicit closure (eg - expect { ... }.toEventually(...) )\nSwift 1.2 @autoclosure behavior has changed in an incompatible way for Nimble to function") +private let toEventuallyRequiresClosureError = FailureMessage( + // swiftlint:disable:next line_length + stringValue: "expect(...).toEventually(...) requires an explicit closure (eg - expect { ... }.toEventually(...) )\nSwift 1.2 @autoclosure behavior has changed in an incompatible way for Nimble to function" +) + +extension Expectation { + /// Tests the actual value using a matcher to match by checking continuously + /// at each pollInterval until the timeout is reached. + /// + /// @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) { + nimblePrecondition(expression.isClosure, "NimbleInternalError", toEventuallyRequiresClosureError.stringValue) + + let (pass, msg) = execute( + expression, + .toMatch, + async(style: .toMatch, predicate: predicate, timeout: timeout, poll: pollInterval, fnName: "toEventually"), + to: "to eventually", + description: description, + captureExceptions: false + ) + verify(pass, msg) + } + + /// Tests the actual value using a matcher to not match by checking + /// continuously at each pollInterval until the timeout is reached. + /// + /// @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) { + nimblePrecondition(expression.isClosure, "NimbleInternalError", toEventuallyRequiresClosureError.stringValue) + + let (pass, msg) = execute( + expression, + .toNotMatch, + async( + style: .toNotMatch, + predicate: predicate, + timeout: timeout, + poll: pollInterval, + fnName: "toEventuallyNot" + ), + to: "to eventually not", + description: description, + captureExceptions: false + ) + verify(pass, msg) + } + + /// Tests the actual value using a matcher to not match by checking + /// continuously at each pollInterval until the timeout is reached. + /// + /// Alias of toEventuallyNot() + /// + /// @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) { + return toEventuallyNot(predicate, timeout: timeout, pollInterval: pollInterval, description: description) + } +} +// Deprecated extension Expectation { /// Tests the actual value using a matcher to match by checking continuously /// at each pollInterval until the timeout is reached. diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift index f636a72..ac9d723 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift @@ -1,46 +1,66 @@ import Foundation +private func matcherMessage(forType expectedType: T.Type) -> String { + return "be a kind of \(String(describing: expectedType))" +} +private func matcherMessage(forClass expectedClass: AnyClass) -> String { + return "be a kind of \(String(describing: expectedClass))" +} + /// A Nimble matcher that succeeds when the actual value is an instance of the given class. -public func beAKindOf(_ expectedType: T.Type) -> NonNilMatcherFunc { - return NonNilMatcherFunc {actualExpression, failureMessage in - failureMessage.postfixMessage = "be a kind of \(String(describing: expectedType))" +public func beAKindOf(_ expectedType: T.Type) -> Predicate { + return Predicate.define { actualExpression in + let message: ExpectationMessage + let instance = try actualExpression.evaluate() guard let validInstance = instance else { - failureMessage.actualValue = "" - return false + message = .expectedCustomValueTo(matcherMessage(forType: expectedType), "") + return PredicateResult(status: .fail, message: message) } + message = .expectedCustomValueTo( + "be a kind of \(String(describing: expectedType))", + "<\(String(describing: type(of: validInstance))) instance>" + ) - failureMessage.actualValue = "<\(String(describing: type(of: validInstance))) instance>" - - guard validInstance is T else { - return false - } - - return true + return PredicateResult( + bool: validInstance is T, + message: message + ) } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) /// 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 -public func beAKindOf(_ expectedClass: AnyClass) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beAKindOf(_ expectedClass: AnyClass) -> Predicate { + return Predicate.define { actualExpression in + let message: ExpectationMessage + let status: PredicateStatus + let instance = try actualExpression.evaluate() if let validInstance = instance { - failureMessage.actualValue = "<\(String(describing: type(of: validInstance))) instance>" + status = PredicateStatus(bool: instance != nil && instance!.isKind(of: expectedClass)) + message = .expectedCustomValueTo( + matcherMessage(forClass: expectedClass), + "<\(String(describing: type(of: validInstance))) instance>" + ) } else { - failureMessage.actualValue = "" + status = .fail + message = .expectedCustomValueTo( + matcherMessage(forClass: expectedClass), + "" + ) } - failureMessage.postfixMessage = "be a kind of \(String(describing: expectedClass))" - return instance != nil && instance!.isKind(of: expectedClass) + + return PredicateResult(status: status, message: message) } } extension NMBObjCMatcher { - public class func beAKindOfMatcher(_ expected: AnyClass) -> NMBMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in - return try! beAKindOf(expected).matches(actualExpression, failureMessage: failureMessage) + @objc public class func beAKindOfMatcher(_ expected: AnyClass) -> NMBMatcher { + 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 07ce3d3..5e2c850 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift @@ -1,49 +1,55 @@ import Foundation /// A Nimble matcher that succeeds when the actual value is an _exact_ instance of the given class. -public func beAnInstanceOf(_ expectedType: T.Type) -> NonNilMatcherFunc { - return NonNilMatcherFunc {actualExpression, failureMessage in - failureMessage.postfixMessage = "be an instance of \(String(describing: expectedType))" +public func beAnInstanceOf(_ expectedType: T.Type) -> Predicate { + let errorMessage = "be an instance of \(String(describing: expectedType))" + return Predicate.define { actualExpression in let instance = try actualExpression.evaluate() guard let validInstance = instance else { - failureMessage.actualValue = "" - return false + return PredicateResult( + status: .doesNotMatch, + message: .expectedActualValueTo(errorMessage) + ) } - failureMessage.actualValue = "<\(String(describing: type(of: validInstance))) instance>" + let actualString = "<\(String(describing: type(of: validInstance))) instance>" - if type(of: validInstance) == expectedType { - return true - } - - return false + return PredicateResult( + status: PredicateStatus(bool: type(of: validInstance) == expectedType), + message: .expectedCustomValueTo(errorMessage, actualString) + ) } } /// A Nimble matcher that succeeds when the actual value is an instance of the given class. /// @see beAKindOf if you want to match against subclasses -public func beAnInstanceOf(_ expectedClass: AnyClass) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beAnInstanceOf(_ expectedClass: AnyClass) -> Predicate { + let errorMessage = "be an instance of \(String(describing: expectedClass))" + return Predicate.define { actualExpression in let instance = try actualExpression.evaluate() + let actualString: String if let validInstance = instance { - failureMessage.actualValue = "<\(String(describing: type(of: validInstance))) instance>" + actualString = "<\(String(describing: type(of: validInstance))) instance>" } else { - failureMessage.actualValue = "" + actualString = "" } - failureMessage.postfixMessage = "be an instance of \(String(describing: expectedClass))" -#if _runtime(_ObjC) - return instance != nil && instance!.isMember(of: expectedClass) -#else - return instance != nil && type(of: instance!) == expectedClass -#endif + #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + let matches = instance != nil && instance!.isMember(of: expectedClass) + #else + let matches = instance != nil && type(of: instance!) == expectedClass + #endif + return PredicateResult( + status: PredicateStatus(bool: matches), + message: .expectedCustomValueTo(errorMessage, actualString) + ) } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beAnInstanceOfMatcher(_ expected: AnyClass) -> NMBMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in - return try! beAnInstanceOf(expected).matches(actualExpression, failureMessage: failureMessage) + @objc public class func beAnInstanceOfMatcher(_ expected: AnyClass) -> NMBMatcher { + 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 95c52cf..34fa1b8 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift @@ -1,20 +1,26 @@ import Foundation -internal let DefaultDelta = 0.0001 - -internal func isCloseTo(_ actualValue: NMBDoubleConvertible?, expectedValue: NMBDoubleConvertible, delta: Double, failureMessage: FailureMessage) -> Bool { - failureMessage.postfixMessage = "be close to <\(stringify(expectedValue))> (within \(stringify(delta)))" - failureMessage.actualValue = "<\(stringify(actualValue))>" - return actualValue != nil && abs(actualValue!.doubleValue - expectedValue.doubleValue) < delta +public let DefaultDelta = 0.0001 + +internal func isCloseTo(_ actualValue: NMBDoubleConvertible?, + expectedValue: NMBDoubleConvertible, + delta: Double) + -> PredicateResult { + let errorMessage = "be close to <\(stringify(expectedValue))> (within \(stringify(delta)))" + return PredicateResult( + bool: actualValue != nil && + abs(actualValue!.doubleValue - expectedValue.doubleValue) < delta, + message: .expectedCustomValueTo(errorMessage, "<\(stringify(actualValue))>") + ) } /// A Nimble matcher that succeeds when a value is close to another. This is used for floating /// point values which can have imprecise results when doing arithmetic on them. /// /// @see equal -public func beCloseTo(_ expectedValue: Double, within delta: Double = DefaultDelta) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta, failureMessage: failureMessage) +public func beCloseTo(_ expectedValue: Double, within delta: Double = DefaultDelta) -> Predicate { + return Predicate.define { actualExpression in + return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta) } } @@ -22,13 +28,13 @@ public func beCloseTo(_ expectedValue: Double, within delta: Double = DefaultDel /// point values which can have imprecise results when doing arithmetic on them. /// /// @see equal -public func beCloseTo(_ expectedValue: NMBDoubleConvertible, within delta: Double = DefaultDelta) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta, failureMessage: failureMessage) +public func beCloseTo(_ expectedValue: NMBDoubleConvertible, within delta: Double = DefaultDelta) -> Predicate { + return Predicate.define { actualExpression in + return isCloseTo(try actualExpression.evaluate(), expectedValue: expectedValue, delta: delta) } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { var _expected: NSNumber var _delta: CDouble @@ -37,7 +43,7 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { _delta = within } - public func matches(_ actualExpression: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + @objc public func matches(_ actualExpression: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { let actualBlock: () -> NMBDoubleConvertible? = ({ return actualExpression() as? NMBDoubleConvertible }) @@ -46,7 +52,7 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { return try! matcher.matches(expr, failureMessage: failureMessage) } - public func doesNotMatch(_ actualExpression: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + @objc public func doesNotMatch(_ actualExpression: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { let actualBlock: () -> NMBDoubleConvertible? = ({ return actualExpression() as? NMBDoubleConvertible }) @@ -55,7 +61,7 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { return try! matcher.doesNotMatch(expr, failureMessage: failureMessage) } - public var within: (CDouble) -> NMBObjCBeCloseToMatcher { + @objc public var within: (CDouble) -> NMBObjCBeCloseToMatcher { return ({ delta in return NMBObjCBeCloseToMatcher(expected: self._expected, within: delta) }) @@ -63,30 +69,28 @@ public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { } extension NMBObjCMatcher { - public class func beCloseToMatcher(_ expected: NSNumber, within: CDouble) -> NMBObjCBeCloseToMatcher { + @objc public class func beCloseToMatcher(_ expected: NSNumber, within: CDouble) -> NMBObjCBeCloseToMatcher { return NMBObjCBeCloseToMatcher(expected: expected, within: within) } } #endif -public func beCloseTo(_ expectedValues: [Double], within delta: Double = DefaultDelta) -> NonNilMatcherFunc <[Double]> { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be close to <\(stringify(expectedValues))> (each within \(stringify(delta)))" +public func beCloseTo(_ expectedValues: [Double], within delta: Double = DefaultDelta) -> Predicate<[Double]> { + let errorMessage = "be close to <\(stringify(expectedValues))> (each within \(stringify(delta)))" + return Predicate.simple(errorMessage) { actualExpression in if let actual = try actualExpression.evaluate() { - failureMessage.actualValue = "<\(stringify(actual))>" - if actual.count != expectedValues.count { - return false + return .doesNotMatch } else { for (index, actualItem) in actual.enumerated() { if fabs(actualItem - expectedValues[index]) > delta { - return false + return .doesNotMatch } } - return true + return .matches } } - return false + return .doesNotMatch } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift index 2ea2cdb..3cbc15d 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift @@ -2,35 +2,32 @@ import Foundation /// 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() -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be empty" +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in let actualSeq = try actualExpression.evaluate() if actualSeq == nil { - return true + return .fail } var generator = actualSeq!.makeIterator() - return generator.next() == nil + return PredicateStatus(bool: generator.next() == nil) } } /// 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() -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be empty" +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in let actualString = try actualExpression.evaluate() - return actualString == nil || NSString(string: actualString!).length == 0 + return PredicateStatus(bool: actualString == nil || NSString(string: actualString!).length == 0) } } /// A Nimble matcher that succeeds when a value is "empty". For collections, this /// means the are no items in that collection. For NSString instances, it is an empty string. -public func beEmpty() -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be empty" +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in let actualString = try actualExpression.evaluate() - return actualString == nil || actualString!.length == 0 + return PredicateStatus(bool: actualString == nil || actualString!.length == 0) } } @@ -39,52 +36,59 @@ public func beEmpty() -> NonNilMatcherFunc { /// 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() -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be empty" +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in let actualDictionary = try actualExpression.evaluate() - return actualDictionary == nil || actualDictionary!.count == 0 + return PredicateStatus(bool: actualDictionary == nil || actualDictionary!.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() -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be empty" +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in let actualArray = try actualExpression.evaluate() - return actualArray == nil || actualArray!.count == 0 + return PredicateStatus(bool: actualArray == nil || actualArray!.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() -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be empty" +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in let actual = try actualExpression.evaluate() - return actual == nil || actual!.count == 0 + return PredicateStatus(bool: actual == nil || actual!.count == 0) } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beEmptyMatcher() -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beEmptyMatcher() -> NMBPredicate { + return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try! actualExpression.evaluate() - failureMessage.postfixMessage = "be empty" + if let value = actualValue as? NMBCollection { let expr = Expression(expression: ({ value as NMBCollection }), location: location) - return try! beEmpty().matches(expr, failureMessage: failureMessage) + return try! beEmpty().satisfies(expr).toObjectiveC() } else if let value = actualValue as? NSString { let expr = Expression(expression: ({ value as String }), location: location) - return try! beEmpty().matches(expr, failureMessage: failureMessage) + return try! beEmpty().satisfies(expr).toObjectiveC() } else if let actualValue = actualValue { - failureMessage.postfixMessage = "be empty (only works for NSArrays, NSSets, NSIndexSets, NSDictionaries, NSHashTables, and NSStrings)" - failureMessage.actualValue = "\(String(describing: type(of: actualValue))) type" + // swiftlint:disable:next line_length + let badTypeErrorMsg = "be empty (only works for NSArrays, NSSets, NSIndexSets, NSDictionaries, NSHashTables, and NSStrings)" + return NMBPredicateResult( + status: NMBPredicateStatus.fail, + message: NMBExpectationMessage( + expectedActualValueTo: badTypeErrorMsg, + customActualValue: "\(String(describing: type(of: actualValue))) type" + ) + ) } - return false + return NMBPredicateResult( + status: NMBPredicateStatus.fail, + message: NMBExpectationMessage(expectedActualValueTo: "be empty").appendedBeNilHint() + ) } } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift index c7eb84c..4370f19 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift @@ -1,23 +1,24 @@ import Foundation /// A Nimble matcher that succeeds when the actual value is greater than the expected value. -public func beGreaterThan(_ expectedValue: T?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be greater than <\(stringify(expectedValue))>" +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 actual > expected + return PredicateStatus(bool: actual > expected) } - return false + return .fail } } /// A Nimble matcher that succeeds when the actual value is greater than the expected value. -public func beGreaterThan(_ expectedValue: NMBComparable?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be greater than <\(stringify(expectedValue))>" +public func beGreaterThan(_ expectedValue: NMBComparable?) -> Predicate { + let errorMessage = "be greater than <\(stringify(expectedValue))>" + return Predicate.simple(errorMessage) { actualExpression in let actualValue = try actualExpression.evaluate() - let matches = actualValue != nil && actualValue!.NMB_compare(expectedValue) == ComparisonResult.orderedDescending - return matches + let matches = actualValue != nil + && actualValue!.NMB_compare(expectedValue) == ComparisonResult.orderedDescending + return PredicateStatus(bool: matches) } } @@ -29,9 +30,9 @@ public func > (lhs: Expectation, rhs: NMBComparable?) { lhs.to(beGreaterThan(rhs)) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { + @objc public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let expr = actualExpression.cast { $0 as? NMBComparable } return try! beGreaterThan(expected).matches(expr, failureMessage: failureMessage) diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift index 2949fce..55d8e7b 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift @@ -2,26 +2,26 @@ 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?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beGreaterThanOrEqualTo(_ expectedValue: T?) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "be greater than or equal to <\(stringify(expectedValue))>" let actualValue = try actualExpression.evaluate() if let actual = actualValue, let expected = expectedValue { return actual >= expected } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual value is greater than /// or equal to the expected value. -public func beGreaterThanOrEqualTo(_ expectedValue: T?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beGreaterThanOrEqualTo(_ expectedValue: T?) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "be greater than or equal to <\(stringify(expectedValue))>" let actualValue = try actualExpression.evaluate() let matches = actualValue != nil && actualValue!.NMB_compare(expectedValue) != ComparisonResult.orderedAscending return matches - } + }.requireNonNil } public func >=(lhs: Expectation, rhs: T) { @@ -32,9 +32,9 @@ public func >=(lhs: Expectation, rhs: T) { lhs.to(beGreaterThanOrEqualTo(rhs)) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { + @objc public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let expr = actualExpression.cast { $0 as? NMBComparable } return try! beGreaterThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage) diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift index 8df7e5f..5732922 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift @@ -2,20 +2,27 @@ import Foundation /// A Nimble matcher that succeeds when the actual value is the same instance /// as the expected instance. -public func beIdenticalTo(_ expected: Any?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beIdenticalTo(_ expected: Any?) -> Predicate { + return Predicate.define { actualExpression in #if os(Linux) let actual = try actualExpression.evaluate() as? AnyObject #else let actual = try actualExpression.evaluate() as AnyObject? #endif - failureMessage.actualValue = "\(identityAsString(actual))" - failureMessage.postfixMessage = "be identical to \(identityAsString(expected))" + + let bool: Bool #if os(Linux) - return actual === (expected as? AnyObject) && actual !== nil + bool = actual === (expected as? AnyObject) && actual !== nil #else - return actual === (expected as AnyObject?) && actual !== nil + bool = actual === (expected as AnyObject?) && actual !== nil #endif + return PredicateResult( + bool: bool, + message: .expectedCustomValueTo( + "be identical to \(identityAsString(expected))", + "\(identityAsString(actual))" + ) + ) } } @@ -30,13 +37,13 @@ public func !== (lhs: Expectation, rhs: Any?) { /// as the expected instance. /// /// Alias for "beIdenticalTo". -public func be(_ expected: Any?) -> NonNilMatcherFunc { +public func be(_ expected: Any?) -> Predicate { return beIdenticalTo(expected) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBObjCMatcher { + @objc public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let aExpr = actualExpression.cast { $0 as Any? } return try! beIdenticalTo(expected).matches(aExpr, failureMessage: failureMessage) diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift index 5bbbf36..8047efd 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift @@ -1,24 +1,24 @@ import Foundation /// A Nimble matcher that succeeds when the actual value is less than the expected value. -public func beLessThan(_ expectedValue: T?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beLessThan(_ expectedValue: T?) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "be less than <\(stringify(expectedValue))>" if let actual = try actualExpression.evaluate(), let expected = expectedValue { return actual < expected } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual value is less than the expected value. -public func beLessThan(_ expectedValue: NMBComparable?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beLessThan(_ expectedValue: NMBComparable?) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "be less than <\(stringify(expectedValue))>" let actualValue = try actualExpression.evaluate() let matches = actualValue != nil && actualValue!.NMB_compare(expectedValue) == ComparisonResult.orderedAscending return matches - } + }.requireNonNil } public func <(lhs: Expectation, rhs: T) { @@ -29,9 +29,9 @@ public func < (lhs: Expectation, rhs: NMBComparable?) { lhs.to(beLessThan(rhs)) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { + @objc public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let expr = actualExpression.cast { $0 as? NMBComparable } return try! beLessThan(expected).matches(expr, failureMessage: failureMessage) diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift index a0cd2f0..f9e9f4e 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift @@ -2,24 +2,24 @@ 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?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beLessThanOrEqualTo(_ expectedValue: T?) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "be less than or equal to <\(stringify(expectedValue))>" if let actual = try actualExpression.evaluate(), let expected = expectedValue { return actual <= expected } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual value is less than /// or equal to the expected value. -public func beLessThanOrEqualTo(_ expectedValue: T?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func beLessThanOrEqualTo(_ expectedValue: T?) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "be less than or equal to <\(stringify(expectedValue))>" let actualValue = try actualExpression.evaluate() return actualValue != nil && actualValue!.NMB_compare(expectedValue) != ComparisonResult.orderedDescending - } + }.requireNonNil } public func <=(lhs: Expectation, rhs: T) { @@ -30,10 +30,10 @@ public func <=(lhs: Expectation, rhs: T) { lhs.to(beLessThanOrEqualTo(rhs)) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil:false) { actualExpression, failureMessage in + @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { + return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let expr = actualExpression.cast { $0 as? NMBComparable } return try! beLessThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage) } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift index 49272a3..2b18b4c 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift @@ -72,37 +72,32 @@ extension UInt: ExpressibleByBooleanLiteral { } } -internal func matcherWithFailureMessage(_ matcher: NonNilMatcherFunc, postprocessor: @escaping (FailureMessage) -> Void) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - defer { postprocessor(failureMessage) } - return try matcher.matcher(actualExpression, failureMessage) - } +internal func rename(_ matcher: Predicate, failureMessage message: ExpectationMessage) -> Predicate { + return Predicate { actualExpression in + let result = try matcher.satisfies(actualExpression) + return PredicateResult(status: result.status, message: message) + }.requireNonNil } // MARK: beTrue() / beFalse() /// A Nimble matcher that succeeds when the actual value is exactly true. /// This matcher will not match against nils. -public func beTrue() -> NonNilMatcherFunc { - return matcherWithFailureMessage(equal(true)) { failureMessage in - failureMessage.postfixMessage = "be true" - } +public func beTrue() -> Predicate { + return rename(equal(true), failureMessage: .expectedActualValueTo("be true")) } /// A Nimble matcher that succeeds when the actual value is exactly false. /// This matcher will not match against nils. -public func beFalse() -> NonNilMatcherFunc { - return matcherWithFailureMessage(equal(false)) { failureMessage in - failureMessage.postfixMessage = "be false" - } +public func beFalse() -> Predicate { + return rename(equal(false), failureMessage: .expectedActualValueTo("be false")) } // MARK: beTruthy() / beFalsy() /// A Nimble matcher that succeeds when the actual value is not logically false. -public func beTruthy() -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be truthy" +public func beTruthy() -> Predicate { + return Predicate.simpleNilable("be truthy") { actualExpression in let actualValue = try actualExpression.evaluate() if let actualValue = actualValue { // FIXME: This is a workaround to SR-2290. @@ -110,20 +105,19 @@ public func beTruthy() -> MatcherFun // - https://bugs.swift.org/browse/SR-2290 // - https://github.com/norio-nomura/Nimble/pull/5#issuecomment-237835873 if let number = actualValue as? NSNumber { - return number.boolValue == true + return PredicateStatus(bool: number.boolValue == true) } - return actualValue == (true as T) + return PredicateStatus(bool: actualValue == (true as T)) } - return actualValue != nil + return PredicateStatus(bool: actualValue != nil) } } /// A Nimble matcher that succeeds when the actual value is logically false. /// This matcher will match against nils. -public func beFalsy() -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be falsy" +public func beFalsy() -> Predicate { + return Predicate.simpleNilable("be falsy") { actualExpression in let actualValue = try actualExpression.evaluate() if let actualValue = actualValue { // FIXME: This is a workaround to SR-2290. @@ -131,39 +125,39 @@ public func beFalsy() -> MatcherFunc // - https://bugs.swift.org/browse/SR-2290 // - https://github.com/norio-nomura/Nimble/pull/5#issuecomment-237835873 if let number = actualValue as? NSNumber { - return number.boolValue == false + return PredicateStatus(bool: number.boolValue == false) } - return actualValue == (false as T) + return PredicateStatus(bool: actualValue == (false as T)) } - return actualValue == nil + return PredicateStatus(bool: actualValue == nil) } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beTruthyMatcher() -> NMBObjCMatcher { + @objc public class func beTruthyMatcher() -> NMBObjCMatcher { return NMBObjCMatcher { actualExpression, failureMessage in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try! beTruthy().matches(expr, failureMessage: failureMessage) } } - public class func beFalsyMatcher() -> NMBObjCMatcher { + @objc public class func beFalsyMatcher() -> NMBObjCMatcher { return NMBObjCMatcher { actualExpression, failureMessage in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try! beFalsy().matches(expr, failureMessage: failureMessage) } } - public class func beTrueMatcher() -> NMBObjCMatcher { + @objc public class func beTrueMatcher() -> NMBObjCMatcher { return NMBObjCMatcher { actualExpression, failureMessage in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try! beTrue().matches(expr, failureMessage: failureMessage) } } - public class func beFalseMatcher() -> NMBObjCMatcher { + @objc public class func beFalseMatcher() -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } return try! beFalse().matches(expr, failureMessage: failureMessage) diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift index a6fb31f..a22e0f4 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift @@ -1,17 +1,16 @@ import Foundation /// A Nimble matcher that succeeds when the actual value is nil. -public func beNil() -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be nil" +public func beNil() -> Predicate { + return Predicate.simpleNilable("be nil") { actualExpression in let actualValue = try actualExpression.evaluate() - return actualValue == nil + return PredicateStatus(bool: actualValue == nil) } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beNilMatcher() -> NMBObjCMatcher { + @objc public class func beNilMatcher() -> NMBObjCMatcher { return NMBObjCMatcher { actualExpression, failureMessage in return try! beNil().matches(actualExpression, failureMessage: failureMessage) } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift index 92a8d43..a9dbc28 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift @@ -1,11 +1,10 @@ import Foundation /// A Nimble matcher that succeeds when the actual value is Void. -public func beVoid() -> MatcherFunc<()> { - return MatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "be void" +public func beVoid() -> Predicate<()> { + return Predicate.simpleNilable("be void") { actualExpression in let actualValue: ()? = try actualExpression.evaluate() - return actualValue != nil + return PredicateStatus(bool: actualValue != nil) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift index 31cbe5d..c2ab568 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift @@ -2,55 +2,52 @@ 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) -> NonNilMatcherFunc +public func beginWith(_ startingElement: T) -> Predicate where S.Iterator.Element == T { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "begin with <\(startingElement)>" + return Predicate.simple("begin with <\(startingElement)>") { actualExpression in if let actualValue = try actualExpression.evaluate() { var actualGenerator = actualValue.makeIterator() - return actualGenerator.next() == startingElement + return PredicateStatus(bool: actualGenerator.next() == startingElement) } - return false + return .fail } } /// A Nimble matcher that succeeds when the actual collection's first element /// is equal to the expected object. -public func beginWith(_ startingElement: Any) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "begin with <\(startingElement)>" - guard let collection = try actualExpression.evaluate() else { return false } - guard collection.count > 0 else { return false } +public func beginWith(_ startingElement: Any) -> Predicate { + return Predicate.simple("begin with <\(startingElement)>") { actualExpression in + guard let collection = try actualExpression.evaluate() else { return .fail } + guard collection.count > 0 else { return .doesNotMatch } #if os(Linux) guard let collectionValue = collection.object(at: 0) as? NSObject else { - return false + return .fail } #else let collectionValue = collection.object(at: 0) as AnyObject #endif - return collectionValue.isEqual(startingElement) + return PredicateStatus(bool: collectionValue.isEqual(startingElement)) } } /// A Nimble matcher that succeeds when the actual string contains expected substring /// where the expected substring's location is zero. -public func beginWith(_ startingSubstring: String) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "begin with <\(startingSubstring)>" +public func beginWith(_ startingSubstring: String) -> Predicate { + return Predicate.simple("begin with <\(startingSubstring)>") { actualExpression in if let actual = try actualExpression.evaluate() { let range = actual.range(of: startingSubstring) - return range != nil && range!.lowerBound == actual.startIndex + return PredicateStatus(bool: range != nil && range!.lowerBound == actual.startIndex) } - return false + return .fail } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func beginWithMatcher(_ expected: Any) -> NMBObjCMatcher { + @objc public class func beginWithMatcher(_ expected: Any) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let actual = try! actualExpression.evaluate() - if let _ = actual as? String { + if (actual as? String) != nil { let expr = actualExpression.cast { $0 as? String } return try! beginWith(expected as! String).matches(expr, failureMessage: failureMessage) } else { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift index 5053642..f1afb72 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift @@ -1,14 +1,14 @@ import Foundation /// A Nimble matcher that succeeds when the actual sequence contains the expected value. -public func contain(_ items: T...) -> NonNilMatcherFunc +public func contain(_ items: T...) -> Predicate where S.Iterator.Element == T { return contain(items) } -public func contain(_ items: [T]) -> NonNilMatcherFunc +public func contain(_ items: [T]) -> Predicate where S.Iterator.Element == T { - return NonNilMatcherFunc { actualExpression, failureMessage in + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "contain <\(arrayAsString(items))>" if let actual = try actualExpression.evaluate() { return items.all { @@ -16,16 +16,16 @@ public func contain(_ items: [T]) -> NonNilMatcherFun } } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual string contains the expected substring. -public func contain(_ substrings: String...) -> NonNilMatcherFunc { +public func contain(_ substrings: String...) -> Predicate { return contain(substrings) } -public func contain(_ substrings: [String]) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func contain(_ substrings: [String]) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "contain <\(arrayAsString(substrings))>" if let actual = try actualExpression.evaluate() { return substrings.all { @@ -34,42 +34,42 @@ public func contain(_ substrings: [String]) -> NonNilMatcherFunc { } } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual string contains the expected substring. -public func contain(_ substrings: NSString...) -> NonNilMatcherFunc { +public func contain(_ substrings: NSString...) -> Predicate { return contain(substrings) } -public func contain(_ substrings: [NSString]) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func contain(_ substrings: [NSString]) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "contain <\(arrayAsString(substrings))>" if let actual = try actualExpression.evaluate() { return substrings.all { actual.range(of: $0.description).length != 0 } } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual collection contains the expected object. -public func contain(_ items: Any?...) -> NonNilMatcherFunc { +public func contain(_ items: Any?...) -> Predicate { return contain(items) } -public func contain(_ items: [Any?]) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func contain(_ items: [Any?]) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "contain <\(arrayAsString(items))>" guard let actual = try actualExpression.evaluate() else { return false } return items.all { item in return item != nil && actual.contains(item!) } - } + }.requireNonNil } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func containMatcher(_ expected: [NSObject]) -> NMBObjCMatcher { + @objc public class func containMatcher(_ expected: [NSObject]) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let location = actualExpression.location let actualValue = try! actualExpression.evaluate() @@ -83,6 +83,7 @@ extension NMBObjCMatcher { let expr = Expression(expression: ({ value as String }), location: location) return try! contain(expected as! [String]).matches(expr, failureMessage: failureMessage) } else if actualValue != nil { + // swiftlint:disable:next line_length failureMessage.postfixMessage = "contain <\(arrayAsString(expected))> (only works for NSArrays, NSSets, NSHashTables, and NSStrings)" } else { failureMessage.postfixMessage = "contain <\(arrayAsString(expected))>" diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift index ae8cca2..ae0d854 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift @@ -1,8 +1,8 @@ import Foundation -public func containElementSatisfying(_ predicate: @escaping ((T) -> Bool), _ predicateDescription: String = "") -> NonNilMatcherFunc where S.Iterator.Element == T { +public func containElementSatisfying(_ predicate: @escaping ((T) -> Bool), _ predicateDescription: String = "") -> Predicate where S.Iterator.Element == T { - return NonNilMatcherFunc { actualExpression, failureMessage in + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.actualValue = nil if predicateDescription == "" { @@ -22,15 +22,16 @@ public func containElementSatisfying(_ predicate: @escaping ((T) } return false - } + }.requireNonNil } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBObjCMatcher { + @objc public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let value = try! actualExpression.evaluate() guard let enumeration = value as? NSFastEnumeration else { + // swiftlint:disable:next line_length failureMessage.postfixMessage = "containElementSatisfying must be provided an NSFastEnumeration object" failureMessage.actualValue = nil failureMessage.expected = "" @@ -38,7 +39,7 @@ public func containElementSatisfying(_ predicate: @escaping ((T) return false } - let iterator = NSFastEnumerationIterator(enumeration) + var iterator = NSFastEnumerationIterator(enumeration) while let item = iterator.next() { guard let object = item as? NSObject else { continue diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift index 00c7e20..a6f9f91 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift @@ -2,9 +2,9 @@ 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) -> NonNilMatcherFunc +public func endWith(_ endingElement: T) -> Predicate where S.Iterator.Element == T { - return NonNilMatcherFunc { actualExpression, failureMessage in + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "end with <\(endingElement)>" if let actualValue = try actualExpression.evaluate() { @@ -19,13 +19,13 @@ public func endWith(_ endingElement: T) -> NonNilMatc return lastItem == endingElement } return false - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual collection's last element /// is equal to the expected object. -public func endWith(_ endingElement: Any) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func endWith(_ endingElement: Any) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "end with <\(endingElement)>" guard let collection = try actualExpression.evaluate() else { return false } guard collection.count > 0 else { return false } @@ -38,28 +38,28 @@ public func endWith(_ endingElement: Any) -> NonNilMatcherFunc NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func endWith(_ endingSubstring: String) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in failureMessage.postfixMessage = "end with <\(endingSubstring)>" if let collection = try actualExpression.evaluate() { return collection.hasSuffix(endingSubstring) } return false - } + }.requireNonNil } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func endWithMatcher(_ expected: Any) -> NMBObjCMatcher { + @objc public class func endWithMatcher(_ expected: Any) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let actual = try! actualExpression.evaluate() - if let _ = actual as? String { + if (actual as? String) != nil { let expr = actualExpression.cast { $0 as? String } return try! endWith(expected as! String).matches(expr, failureMessage: failureMessage) } else { diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift index 1dccfd0..ab457ca 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift @@ -4,18 +4,20 @@ import Foundation /// Values can support equal by supporting the Equatable protocol. /// /// @see beCloseTo if you want to match imprecise types (eg - floats, doubles). -public func equal(_ expectedValue: T?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "equal <\(stringify(expectedValue))>" +public func equal(_ expectedValue: T?) -> Predicate { + return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in let actualValue = try actualExpression.evaluate() let matches = actualValue == expectedValue && expectedValue != nil if expectedValue == nil || actualValue == nil { - if expectedValue == nil { - failureMessage.postfixActual = " (use beNil() to match nils)" + if expectedValue == nil && actualValue != nil { + return PredicateResult( + status: .fail, + message: msg.appendedBeNilHint() + ) } - return false + return PredicateResult(status: .fail, message: msg) } - return matches + return PredicateResult(status: PredicateStatus(bool: matches), message: msg) } } @@ -23,43 +25,60 @@ public func equal(_ expectedValue: T?) -> NonNilMatcherFunc { /// Values can support equal by supporting the Equatable protocol. /// /// @see beCloseTo if you want to match imprecise types (eg - floats, doubles). -public func equal(_ expectedValue: [T: C]?) -> NonNilMatcherFunc<[T: C]> { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "equal <\(stringify(expectedValue))>" +public func equal(_ expectedValue: [T: C]?) -> Predicate<[T: C]> { + return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in let actualValue = try actualExpression.evaluate() if expectedValue == nil || actualValue == nil { - if expectedValue == nil { - failureMessage.postfixActual = " (use beNil() to match nils)" + if expectedValue == nil && actualValue != nil { + return PredicateResult( + status: .fail, + message: msg.appendedBeNilHint() + ) } - return false + return PredicateResult(status: .fail, message: msg) } - return expectedValue! == actualValue! + return PredicateResult( + status: PredicateStatus(bool: expectedValue! == actualValue!), + message: msg + ) } } /// A Nimble matcher that succeeds when the actual collection is equal to the expected collection. /// Items must implement the Equatable protocol. -public func equal(_ expectedValue: [T]?) -> NonNilMatcherFunc<[T]> { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "equal <\(stringify(expectedValue))>" +public func equal(_ expectedValue: [T]?) -> Predicate<[T]> { + return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in let actualValue = try actualExpression.evaluate() if expectedValue == nil || actualValue == nil { - if expectedValue == nil { - failureMessage.postfixActual = " (use beNil() to match nils)" + if expectedValue == nil && actualValue != nil { + return PredicateResult( + status: .fail, + message: msg.appendedBeNilHint() + ) } - return false + return PredicateResult( + status: .fail, + message: msg + ) } - return expectedValue! == actualValue! + return PredicateResult( + bool: expectedValue! == actualValue!, + message: msg + ) } } /// A Nimble matcher allowing comparison of collection with optional type -public func equal(_ expectedValue: [T?]) -> NonNilMatcherFunc<[T?]> { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "equal <\(stringify(expectedValue))>" +public func equal(_ expectedValue: [T?]) -> Predicate<[T?]> { + return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in if let actualValue = try actualExpression.evaluate() { + let doesNotMatch = PredicateResult( + status: .doesNotMatch, + message: msg + ) + if expectedValue.count != actualValue.count { - return false + return doesNotMatch } for (index, item) in actualValue.enumerated() { @@ -67,30 +86,34 @@ public func equal(_ expectedValue: [T?]) -> NonNilMatcherFunc<[T?] if item == nil && otherItem == nil { continue } else if item == nil && otherItem != nil { - return false + return doesNotMatch } else if item != nil && otherItem == nil { - return false + return doesNotMatch } else if item! != otherItem! { - return false + return doesNotMatch } } - return true + return PredicateResult( + status: .matches, + message: msg + ) } else { - failureMessage.postfixActual = " (use beNil() to match nils)" + return PredicateResult( + status: .fail, + message: msg.appendedBeNilHint() + ) } - - return false } } /// A Nimble matcher that succeeds when the actual set is equal to the expected set. -public func equal(_ expectedValue: Set?) -> NonNilMatcherFunc> { +public func equal(_ expectedValue: Set?) -> Predicate> { return equal(expectedValue, stringify: { stringify($0) }) } /// A Nimble matcher that succeeds when the actual set is equal to the expected set. -public func equal(_ expectedValue: Set?) -> NonNilMatcherFunc> { +public func equal(_ expectedValue: Set?) -> Predicate> { return equal(expectedValue, stringify: { if let set = $0 { return stringify(Array(set).sorted { $0 < $1 }) @@ -100,33 +123,49 @@ public func equal(_ expectedValue: Set?) -> NonNilMatcherFunc< }) } -private func equal(_ expectedValue: Set?, stringify: @escaping (Set?) -> String) -> NonNilMatcherFunc> { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "equal <\(stringify(expectedValue))>" +private func equal(_ expectedValue: Set?, stringify: @escaping (Set?) -> String) -> Predicate> { + return Predicate { actualExpression in + var errorMessage: ExpectationMessage = + .expectedActualValueTo("equal <\(stringify(expectedValue))>") if let expectedValue = expectedValue { if let actualValue = try actualExpression.evaluate() { - failureMessage.actualValue = "<\(stringify(actualValue))>" + errorMessage = .expectedCustomValueTo( + "equal <\(stringify(expectedValue))>", + "<\(stringify(actualValue))>" + ) if expectedValue == actualValue { - return true + return PredicateResult( + status: .matches, + message: errorMessage + ) } let missing = expectedValue.subtracting(actualValue) if missing.count > 0 { - failureMessage.postfixActual += ", missing <\(stringify(missing))>" + errorMessage = errorMessage.appended(message: ", missing <\(stringify(missing))>") } let extra = actualValue.subtracting(expectedValue) if extra.count > 0 { - failureMessage.postfixActual += ", extra <\(stringify(extra))>" + errorMessage = errorMessage.appended(message: ", extra <\(stringify(extra))>") } + return PredicateResult( + status: .doesNotMatch, + message: errorMessage + ) } + return PredicateResult( + status: .fail, + message: errorMessage.appendedBeNilHint() + ) } else { - failureMessage.postfixActual = " (use beNil() to match nils)" + return PredicateResult( + status: .fail, + message: errorMessage.appendedBeNilHint() + ) } - - return false } } @@ -162,19 +201,19 @@ public func !=(lhs: Expectation>, rhs: Set?) { lhs.toNot(equal(rhs)) } -public func ==(lhs: Expectation<[T: C]>, rhs: [T: C]?) { +public func ==(lhs: Expectation<[T: C]>, rhs: [T: C]?) { lhs.to(equal(rhs)) } -public func !=(lhs: Expectation<[T: C]>, rhs: [T: C]?) { +public func !=(lhs: Expectation<[T: C]>, rhs: [T: C]?) { lhs.toNot(equal(rhs)) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func equalMatcher(_ expected: NSObject) -> NMBMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in - return try! equal(expected).matches(actualExpression, failureMessage: failureMessage) + @objc public class func equalMatcher(_ expected: NSObject) -> NMBMatcher { + 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 5b24af2..93335a8 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift @@ -7,9 +7,10 @@ import Foundation /// A Nimble matcher that succeeds when the actual Collection's count equals /// the expected value -public func haveCount(_ expectedValue: T.IndexDistance) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func haveCount(_ expectedValue: T.IndexDistance) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in if let actualValue = try actualExpression.evaluate() { + // swiftlint:disable:next line_length failureMessage.postfixMessage = "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))" let result = expectedValue == actualValue.count failureMessage.actualValue = "\(actualValue.count)" @@ -18,14 +19,15 @@ public func haveCount(_ expectedValue: T.IndexDistance) -> NonNil } else { return false } - } + }.requireNonNil } /// A Nimble matcher that succeeds when the actual collection's count equals /// the expected value -public func haveCount(_ expectedValue: Int) -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in +public func haveCount(_ expectedValue: Int) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in if let actualValue = try actualExpression.evaluate() { + // swiftlint:disable:next line_length failureMessage.postfixMessage = "have \(prettyCollectionType(actualValue)) with count \(stringify(expectedValue))" let result = expectedValue == actualValue.count failureMessage.actualValue = "\(actualValue.count)" @@ -37,9 +39,9 @@ public func haveCount(_ expectedValue: Int) -> MatcherFunc { } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func haveCountMatcher(_ expected: NSNumber) -> NMBObjCMatcher { + @objc public class func haveCountMatcher(_ expected: NSNumber) -> NMBObjCMatcher { return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let location = actualExpression.location let actualValue = try! actualExpression.evaluate() diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift index 7e80331..96e7a82 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Match.swift @@ -2,27 +2,26 @@ 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?) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in - failureMessage.postfixMessage = "match <\(stringify(expectedValue))>" - +public func match(_ expectedValue: String?) -> Predicate { + return Predicate.simple("match <\(stringify(expectedValue))>") { actualExpression in if let actual = try actualExpression.evaluate() { if let regexp = expectedValue { - return actual.range(of: regexp, options: .regularExpression) != nil + let bool = actual.range(of: regexp, options: .regularExpression) != nil + return PredicateStatus(bool: bool) } } - return false + return .fail } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func matchMatcher(_ expected: NSString) -> NMBMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func matchMatcher(_ expected: NSString) -> NMBMatcher { + return NMBPredicate { actualExpression in let actual = actualExpression.cast { $0 as? String } - return try! match(expected.description).matches(actual, failureMessage: failureMessage) + return try! match(expected.description).satisfies(actual).toObjectiveC() } } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift index 2092cb6..9c86fb7 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift @@ -1,26 +1,58 @@ import Foundation +/// A Nimble matcher that succeeds when the actual expression evaluates to an +/// error from the specified case. +/// +/// Errors are tried to be compared by their implementation of Equatable, +/// otherwise they fallback to comparison by _domain and _code. +public func matchError(_ error: T) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + let actualError: Error? = try actualExpression.evaluate() + + setFailureMessageForError(failureMessage, postfixMessageVerb: "match", actualError: actualError, error: error) + var matches = false + if let actualError = actualError, errorMatchesExpectedError(actualError, expectedError: error) { + matches = true + } + return matches + }.requireNonNil +} + /// A Nimble matcher that succeeds when the actual expression evaluates to an /// error from the specified case. /// /// Errors are tried to be compared by their implementation of Equatable, /// otherwise they fallback to comparision by _domain and _code. -public func matchError(_ error: T) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func matchError(_ error: T) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in let actualError: Error? = try actualExpression.evaluate() setFailureMessageForError(failureMessage, postfixMessageVerb: "match", actualError: actualError, error: error) - return errorMatchesNonNilFieldsOrClosure(actualError, error: error) - } + + var matches = false + if let actualError = actualError as? T, error == actualError { + matches = true + } + return matches + }.requireNonNil } /// A Nimble matcher that succeeds when the actual expression evaluates to an /// error of the specified type -public func matchError(_ errorType: T.Type) -> NonNilMatcherFunc { - return NonNilMatcherFunc { actualExpression, failureMessage in +public func matchError(_ errorType: T.Type) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in let actualError: Error? = try actualExpression.evaluate() - setFailureMessageForError(failureMessage, postfixMessageVerb: "match", actualError: actualError, errorType: errorType) - return errorMatchesNonNilFieldsOrClosure(actualError, errorType: errorType) - } + setFailureMessageForError( + failureMessage, + postfixMessageVerb: "match", + actualError: actualError, + errorType: errorType + ) + var matches = false + if actualError as? T != nil { + matches = true + } + return matches + }.requireNonNil } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift index 02d3245..abcafa9 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherFunc.swift @@ -1,14 +1,15 @@ -/// A convenience API to build matchers that don't need special negation +/// DEPRECATED: A convenience API to build matchers that don't need special negation /// behavior. The toNot() behavior is the negation of to(). /// /// @see NonNilMatcherFunc if you prefer to have this matcher fail when nil -/// values are recieved in an expectation. +/// values are received in an expectation. /// /// You may use this when implementing your own custom matchers. /// /// 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") public struct MatcherFunc: Matcher { public let matcher: (Expression, FailureMessage) throws -> Bool @@ -23,9 +24,16 @@ public struct MatcherFunc: Matcher { public func doesNotMatch(_ actualExpression: Expression, failureMessage: FailureMessage) throws -> Bool { return try !matcher(actualExpression, failureMessage) } + + /// 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. + public var predicate: Predicate { + return Predicate.fromDeprecatedMatcher(self) + } } -/// A convenience API to build matchers that don't need special negation +/// DEPRECATED: A convenience API to build matchers that don't need special negation /// behavior. The toNot() behavior is the negation of to(). /// /// Unlike MatcherFunc, this will always fail if an expectation contains nil. @@ -36,6 +44,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") public struct NonNilMatcherFunc: Matcher { public let matcher: (Expression, FailureMessage) throws -> Bool @@ -66,4 +75,11 @@ public struct NonNilMatcherFunc: Matcher { } return false } + + /// 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. + 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 3f27ec1..6f8f103 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift @@ -1,85 +1,86 @@ import Foundation // `CGFloat` is in Foundation (swift-corelibs-foundation) on Linux. -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) import CoreGraphics #endif /// Implement this protocol to implement a custom matcher for Swift +@available(*, deprecated, message: "Use Predicate instead") public protocol Matcher { associatedtype ValueType func matches(_ actualExpression: Expression, failureMessage: FailureMessage) throws -> Bool func doesNotMatch(_ actualExpression: Expression, failureMessage: FailureMessage) throws -> Bool } -#if _runtime(_ObjC) +extension Matcher { + var predicate: Predicate { + return Predicate.fromDeprecatedMatcher(self) + } + + var toClosure: (Expression, FailureMessage, Bool) throws -> Bool { + return ({ expr, msg, expectedResult in + if expectedResult { + return try self.matches(expr, failureMessage: msg) + } else { + return try self.doesNotMatch(expr, failureMessage: msg) + } + }) + } +} + +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) /// Objective-C interface to the Swift variant of Matcher. @objc public protocol NMBMatcher { - func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool - func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool + func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool + func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool } #endif -#if _runtime(_ObjC) /// Protocol for types that support contain() matcher. -@objc public protocol NMBContainer { - @objc(containsObject:) +public protocol NMBContainer { func contains(_ anObject: Any) -> Bool } +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) // FIXME: NSHashTable can not conform to NMBContainer since swift-DEVELOPMENT-SNAPSHOT-2016-04-25-a //extension NSHashTable : NMBContainer {} // Corelibs Foundation does not include this class yet -#else -public protocol NMBContainer { - func contains(_ anObject: Any) -> Bool -} #endif -extension NSArray : NMBContainer {} -extension NSSet : NMBContainer {} +extension NSArray: NMBContainer {} +extension NSSet: NMBContainer {} -#if _runtime(_ObjC) /// Protocol for types that support only beEmpty(), haveCount() matchers -@objc public protocol NMBCollection { - var count: Int { get } -} - -extension NSHashTable : NMBCollection {} // Corelibs Foundation does not include these classes yet -extension NSMapTable : NMBCollection {} -#else public protocol NMBCollection { var count: Int { get } } + +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +extension NSHashTable: NMBCollection {} // Corelibs Foundation does not include these classes yet +extension NSMapTable: NMBCollection {} #endif -extension NSSet : NMBCollection {} -extension NSIndexSet : NMBCollection {} -extension NSDictionary : NMBCollection {} +extension NSSet: NMBCollection {} +extension NSIndexSet: NMBCollection {} +extension NSDictionary: NMBCollection {} -#if _runtime(_ObjC) /// Protocol for types that support beginWith(), endWith(), beEmpty() matchers -@objc public protocol NMBOrderedCollection: NMBCollection { - @objc(objectAtIndex:) - func object(at index: Int) -> Any -} -#else public protocol NMBOrderedCollection: NMBCollection { func object(at index: Int) -> Any } -#endif -extension NSArray : NMBOrderedCollection {} +extension NSArray: NMBOrderedCollection {} public protocol NMBDoubleConvertible { var doubleValue: CDouble { get } } -extension Double : NMBDoubleConvertible { +extension Double: NMBDoubleConvertible { public var doubleValue: CDouble { return self } } -extension Float : NMBDoubleConvertible { +extension Float: NMBDoubleConvertible { public var doubleValue: CDouble { return CDouble(self) } @@ -91,7 +92,7 @@ extension CGFloat: NMBDoubleConvertible { } } -extension NSNumber : NMBDoubleConvertible { +extension NSNumber: NMBDoubleConvertible { } private let dateFormatter: DateFormatter = { @@ -130,7 +131,7 @@ extension NSDate: TestOutputStringConvertible { /// beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers. /// /// Types that conform to Swift's Comparable protocol will work implicitly too -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) @objc public protocol NMBComparable { func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult } @@ -141,12 +142,12 @@ public protocol NMBComparable { } #endif -extension NSNumber : NMBComparable { +extension NSNumber: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { return compare(otherObject as! NSNumber) } } -extension NSString : NMBComparable { +extension NSString: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { return compare(otherObject as! String) } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift index ac8ee5a..ee886f1 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift @@ -1,9 +1,36 @@ import Foundation +// A workaround to SR-6419. +extension NotificationCenter { +#if !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) + #if swift(>=4.0) + #if swift(>=4.0.2) + #else + func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { + return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) + } + #endif + #elseif swift(>=3.2) + #if swift(>=3.2.2) + #else + // swiftlint:disable:next line_length + func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { + return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) + } + #endif + #else + // swiftlint:disable:next line_length + func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { + return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) + } + #endif +#endif +} + internal class NotificationCollector { private(set) var observedNotifications: [Notification] private let notificationCenter: NotificationCenter - #if _runtime(_ObjC) + #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) private var token: AnyObject? #else private var token: NSObjectProtocol? @@ -15,14 +42,15 @@ internal class NotificationCollector { } func startObserving() { - self.token = self.notificationCenter.addObserver(forName: nil, object: nil, queue: nil) { [weak self] n in + // swiftlint:disable:next line_length + self.token = self.notificationCenter.addObserver(forName: nil, object: nil, queue: nil, using: { [weak self] n in // linux-swift gets confused by .append(n) self?.observedNotifications.append(n) - } + }) } deinit { - #if _runtime(_ObjC) + #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) if let token = self.token { self.notificationCenter.removeObserver(token) } @@ -36,19 +64,17 @@ internal class NotificationCollector { private let mainThread = pthread_self() -let notificationCenterDefault = NotificationCenter.default - public func postNotifications( _ notificationsMatcher: T, - fromNotificationCenter center: NotificationCenter = notificationCenterDefault) - -> MatcherFunc + fromNotificationCenter center: NotificationCenter = .default) + -> Predicate where T: Matcher, T.ValueType == [Notification] { - let _ = mainThread // Force lazy-loading of this value + _ = mainThread // Force lazy-loading of this value let collector = NotificationCollector(notificationCenter: center) collector.startObserving() var once: Bool = false - return MatcherFunc { actualExpression, failureMessage in + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in let collectorNotificationsExpression = Expression(memoizedExpression: { _ in return collector.observedNotifications }, location: actualExpression.location, withoutCaching: true) diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift new file mode 100644 index 0000000..f812344 --- /dev/null +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift @@ -0,0 +1,348 @@ +// New Matcher API +// +import Foundation + +/// A Predicate is part of the new matcher API that provides assertions to expectations. +/// +/// Given a code snippet: +/// +/// expect(1).to(equal(2)) +/// ^^^^^^^^ +/// Called a "matcher" +/// +/// A matcher consists of two parts a constructor function and the Predicate. The term Predicate +/// is used as a separate name from Matcher to help transition custom matchers to the new Nimble +/// matcher API. +/// +/// The Predicate provide the heavy lifting on how to assert against a given value. Internally, +/// predicates are simple wrappers around closures to provide static type information and +/// allow composition and wrapping of existing behaviors. +public struct Predicate { + fileprivate var matcher: (Expression) throws -> PredicateResult + + /// Constructs a predicate that knows how take a given value + public init(_ matcher: @escaping (Expression) throws -> PredicateResult) { + self.matcher = matcher + } + + /// Uses a predicate on a given value to see if it passes the predicate. + /// + /// @param expression The value to run the predicate's logic against + /// @returns A predicate result indicate passing or failing and an associated error message. + public func satisfies(_ expression: Expression) throws -> PredicateResult { + return try matcher(expression) + } +} + +/// Provides convenience helpers to defining predicates +extension Predicate { + /// Like Predicate() constructor, but automatically guard against nil (actual) values + public static func define(matcher: @escaping (Expression) throws -> PredicateResult) -> Predicate { + return Predicate { actual in + return try matcher(actual) + }.requireNonNil + } + + /// 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 { + return Predicate { actual in + return try matcher(actual, .expectedActualValueTo(msg)) + }.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 { + return Predicate { actual in + return try matcher(actual, .expectedActualValueTo(msg)) + } + } +} + +extension Predicate { + /// Provides a simple predicate definition that provides no control over the predefined + /// 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 { + return Predicate { actual in + return PredicateResult(status: try matcher(actual), message: .expectedActualValueTo(msg)) + }.requireNonNil + } + + /// Provides a simple predicate definition that provides no control over the predefined + /// 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 { + return Predicate { actual in + return PredicateResult(status: try matcher(actual), message: .expectedActualValueTo(msg)) + } + } +} + +// The Expectation style intended for comparison to a PredicateStatus. +public enum ExpectationStyle { + case toMatch, toNotMatch +} + +/// The value that a Predicates return to describe if the given (actual) value matches the +/// predicate. +public struct PredicateResult { + /// Status indicates if the predicate matches, does not match, or fails. + public var status: PredicateStatus + /// The error message that can be displayed if it does not match + public var message: ExpectationMessage + + /// Constructs a new PredicateResult with a given status and error message + public init(status: PredicateStatus, message: ExpectationMessage) { + self.status = status + self.message = message + } + + /// Shorthand to PredicateResult(status: PredicateStatus(bool: bool), message: message) + public init(bool: Bool, message: ExpectationMessage) { + self.status = PredicateStatus(bool: bool) + self.message = message + } + + /// Converts the result to a boolean based on what the expectation intended + public func toBoolean(expectation style: ExpectationStyle) -> Bool { + return status.toBoolean(expectation: style) + } +} + +/// PredicateStatus is a trinary that indicates if a Predicate matches a given value or not +public enum PredicateStatus { + /// Matches indicates if the predicate / matcher passes with the given value + /// + /// For example, `equals(1)` returns `.matches` for `expect(1).to(equal(1))`. + case matches + /// DoesNotMatch indicates if the predicate / matcher fails with the given value, but *would* + /// succeed if the expectation was inverted. + /// + /// For example, `equals(2)` returns `.doesNotMatch` for `expect(1).toNot(equal(2))`. + case doesNotMatch + /// Fail indicates the predicate will never satisfy with the given value in any case. + /// A perfect example is that most matchers fail whenever given `nil`. + /// + /// Using `equal(1)` fails both `expect(nil).to(equal(1))` and `expect(nil).toNot(equal(1))`. + /// Note: Predicate's `requireNonNil` property will also provide this feature mostly for free. + /// Your predicate will still need to guard against nils, but error messaging will be + /// handled for you. + case fail + + /// Converts a boolean to either .matches (if true) or .doesNotMatch (if false). + public init(bool matches: Bool) { + if matches { + self = .matches + } else { + self = .doesNotMatch + } + } + + private func shouldMatch() -> Bool { + switch self { + case .matches: return true + case .doesNotMatch, .fail: return false + } + } + + private func shouldNotMatch() -> Bool { + switch self { + case .doesNotMatch: return true + case .matches, .fail: return false + } + } + + /// Converts the PredicateStatus result to a boolean based on what the expectation intended + internal func toBoolean(expectation style: ExpectationStyle) -> Bool { + if style == .toMatch { + return shouldMatch() + } else { + return shouldNotMatch() + } + } +} + +// 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 { + return Predicate { actual in + let failureMessage = 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 Predicate { actual in + let failureMessage = FailureMessage() + let result = try matcher(actual, failureMessage) + return PredicateResult( + status: PredicateStatus(bool: result), + message: failureMessage.toExpectationMessage() + ) + } + + } + + /// Compatibility layer for old Matcher API, deprecated. + /// Same as calling .predicate on a MatcherFunc or NonNilMatcherFunc type. + public static func fromDeprecatedMatcher(_ matcher: M) -> Predicate where M: Matcher, M.ValueType == T { + return self.fromDeprecatedFullClosure(matcher.toClosure) + } + + /// Deprecated Matcher API, use satisfies(_:_) instead + public func matches(_ actualExpression: Expression, failureMessage: FailureMessage) throws -> Bool { + let result = try satisfies(actualExpression) + result.message.update(failureMessage: failureMessage) + return result.toBoolean(expectation: .toMatch) + } + + /// Deprecated Matcher API, use satisfies(_:_) instead + public func doesNotMatch(_ actualExpression: Expression, failureMessage: FailureMessage) throws -> Bool { + let result = try satisfies(actualExpression) + result.message.update(failureMessage: failureMessage) + return result.toBoolean(expectation: .toNotMatch) + } +} + +extension Predicate { + // Someday, make this public? Needs documentation + internal func after(f: @escaping (Expression, PredicateResult) throws -> PredicateResult) -> Predicate { + return Predicate { actual -> PredicateResult in + let result = try self.satisfies(actual) + return try f(actual, result) + } + } + + /// Returns a new Predicate based on the current one that always fails if nil is given as + /// the actual value. + /// + /// This replaces `NonNilMatcherFunc`. + public var requireNonNil: Predicate { + return after { actual, result in + if try actual.evaluate() == nil { + return PredicateResult( + status: .fail, + message: result.message.appendedBeNilHint() + ) + } + return result + } + } +} + +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +public typealias PredicateBlock = (_ actualExpression: Expression) -> NMBPredicateResult + +public class NMBPredicate: NSObject { + private let predicate: PredicateBlock + + public init(predicate: @escaping PredicateBlock) { + self.predicate = predicate + } + + func satisfies(_ expression: @escaping () -> NSObject?, location: SourceLocation) -> NMBPredicateResult { + let expr = Expression(expression: expression, location: location) + return self.predicate(expr) + } +} + +extension NMBPredicate: NMBMatcher { + public func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + let result = satisfies(actualBlock, location: location).toSwift() + result.message.update(failureMessage: failureMessage) + return result.status.toBoolean(expectation: .toMatch) + } + + public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + let result = satisfies(actualBlock, location: location).toSwift() + result.message.update(failureMessage: failureMessage) + return result.status.toBoolean(expectation: .toNotMatch) + } +} + +final public class NMBPredicateResult: NSObject { + public var status: NMBPredicateStatus + public var message: NMBExpectationMessage + + public init(status: NMBPredicateStatus, message: NMBExpectationMessage) { + self.status = status + self.message = message + } + + public init(bool success: Bool, message: NMBExpectationMessage) { + self.status = NMBPredicateStatus.from(bool: success) + self.message = message + } + + public func toSwift() -> PredicateResult { + return PredicateResult(status: status.toSwift(), + message: message.toSwift()) + } +} + +extension PredicateResult { + public func toObjectiveC() -> NMBPredicateResult { + return NMBPredicateResult(status: status.toObjectiveC(), message: message.toObjectiveC()) + } +} + +final public class NMBPredicateStatus: NSObject { + private let status: Int + private init(status: Int) { + self.status = status + } + + public static let matches: NMBPredicateStatus = NMBPredicateStatus(status: 0) + public static let doesNotMatch: NMBPredicateStatus = NMBPredicateStatus(status: 1) + public static let fail: NMBPredicateStatus = NMBPredicateStatus(status: 2) + + public override var hashValue: Int { return self.status.hashValue } + + public override func isEqual(_ object: Any?) -> Bool { + guard let otherPredicate = object as? NMBPredicateStatus else { + return false + } + return self.status == otherPredicate.status + } + + public static func from(status: PredicateStatus) -> NMBPredicateStatus { + switch status { + case .matches: return self.matches + case .doesNotMatch: return self.doesNotMatch + case .fail: return self.fail + } + } + + public static func from(bool success: Bool) -> NMBPredicateStatus { + return self.from(status: PredicateStatus(bool: success)) + } + + public func toSwift() -> PredicateStatus { + switch status { + case NMBPredicateStatus.matches.status: return .matches + case NMBPredicateStatus.doesNotMatch.status: return .doesNotMatch + case NMBPredicateStatus.fail.status: return .fail + default: + internalError("Unhandle status for NMBPredicateStatus") + } + } +} + +extension PredicateStatus { + public func toObjectiveC() -> NMBPredicateStatus { + return NMBPredicateStatus.from(status: self) + } +} + +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift index c898c3b..3e7f2df 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift @@ -1,7 +1,7 @@ import Foundation -// This matcher requires the Objective-C, and being built by Xcode rather than the Swift Package Manager -#if _runtime(_ObjC) && !SWIFT_PACKAGE +// This matcher requires the Objective-C, and being built by Xcode rather than the Swift Package Manager +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE /// A Nimble matcher that succeeds when the actual expression raises an /// exception with the specified name, reason, and/or userInfo. @@ -16,8 +16,8 @@ public func raiseException( named: String? = nil, reason: String? = nil, userInfo: NSDictionary? = nil, - closure: ((NSException) -> Void)? = nil) -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in + closure: ((NSException) -> Void)? = nil) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in var exception: NSException? let capture = NMBExceptionCapture(handler: ({ e in @@ -29,11 +29,25 @@ public func raiseException( return } - setFailureMessageForException(failureMessage, exception: exception, named: named, reason: reason, userInfo: userInfo, closure: closure) - return exceptionMatchesNonNilFieldsOrClosure(exception, named: named, reason: reason, userInfo: userInfo, closure: closure) + setFailureMessageForException( + failureMessage, + exception: exception, + named: named, + reason: reason, + userInfo: userInfo, + closure: closure + ) + return exceptionMatchesNonNilFieldsOrClosure( + exception, + named: named, + reason: reason, + userInfo: userInfo, + closure: closure + ) } } +// swiftlint:disable:next function_parameter_count internal func setFailureMessageForException( _ failureMessage: FailureMessage, exception: NSException?, @@ -52,7 +66,7 @@ internal func setFailureMessageForException( if let userInfo = userInfo { failureMessage.postfixMessage += " with userInfo <\(userInfo)>" } - if let _ = closure { + if closure != nil { failureMessage.postfixMessage += " that satisfies block" } if named == nil && reason == nil && userInfo == nil && closure == nil { @@ -60,6 +74,7 @@ internal func setFailureMessageForException( } 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" @@ -114,7 +129,7 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { _block = block } - public func matches(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + @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) @@ -126,11 +141,11 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { ).matches(expr, failureMessage: failureMessage) } - public func doesNotMatch(_ actualBlock: @escaping () -> NSObject!, failureMessage: FailureMessage, location: SourceLocation) -> Bool { + @objc public func doesNotMatch(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool { return !matches(actualBlock, failureMessage: failureMessage, location: location) } - public var named: (_ name: String) -> NMBObjCRaiseExceptionMatcher { + @objc public var named: (_ name: String) -> NMBObjCRaiseExceptionMatcher { return ({ name in return NMBObjCRaiseExceptionMatcher( name: name, @@ -141,7 +156,7 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { }) } - public var reason: (_ reason: String?) -> NMBObjCRaiseExceptionMatcher { + @objc public var reason: (_ reason: String?) -> NMBObjCRaiseExceptionMatcher { return ({ reason in return NMBObjCRaiseExceptionMatcher( name: self._name, @@ -152,7 +167,7 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { }) } - public var userInfo: (_ userInfo: NSDictionary?) -> NMBObjCRaiseExceptionMatcher { + @objc public var userInfo: (_ userInfo: NSDictionary?) -> NMBObjCRaiseExceptionMatcher { return ({ userInfo in return NMBObjCRaiseExceptionMatcher( name: self._name, @@ -163,7 +178,7 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { }) } - public var satisfyingBlock: (_ block: ((NSException) -> Void)?) -> NMBObjCRaiseExceptionMatcher { + @objc public var satisfyingBlock: (_ block: ((NSException) -> Void)?) -> NMBObjCRaiseExceptionMatcher { return ({ block in return NMBObjCRaiseExceptionMatcher( name: self._name, @@ -176,7 +191,7 @@ public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { } extension NMBObjCMatcher { - public class func raiseExceptionMatcher() -> NMBObjCRaiseExceptionMatcher { + @objc public class func raiseExceptionMatcher() -> NMBObjCRaiseExceptionMatcher { return NMBObjCRaiseExceptionMatcher(name: nil, reason: nil, userInfo: nil, block: nil) } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift new file mode 100644 index 0000000..6c63a15 --- /dev/null +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift @@ -0,0 +1,101 @@ +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(_ matchers: U...) -> Predicate + where U: Matcher, U.ValueType == T { + return satisfyAllOf(matchers) +} + +/// Deprecated. Please use `satisfyAnyOf(_) -> Predicate` instead. +internal func satisfyAllOf(_ matchers: [U]) -> Predicate + where U: Matcher, U.ValueType == T { + return NonNilMatcherFunc { actualExpression, failureMessage in + let postfixMessages = NSMutableArray() + var matches = true + for matcher in matchers { + if try matcher.doesNotMatch(actualExpression, failureMessage: failureMessage) { + matches = false + } + postfixMessages.add(NSString(string: "{\(failureMessage.postfixMessage)}")) + } + + failureMessage.postfixMessage = "match all of: " + postfixMessages.componentsJoined(by: ", and ") + if let actualValue = try actualExpression.evaluate() { + failureMessage.actualValue = "\(actualValue)" + } + + return matches + }.predicate +} + +internal func satisfyAllOf(_ predicates: [Predicate]) -> Predicate { + return Predicate { actualExpression in + var postfixMessages = [String]() + var matches = true + for predicate in predicates { + let result = try predicate.satisfies(actualExpression) + if result.toBoolean(expectation: .toNotMatch) { + matches = false + } + postfixMessages.append("{\(result.message.expectedMessage)}") + } + + var msg: ExpectationMessage + if let actualValue = try actualExpression.evaluate() { + msg = .expectedCustomValueTo( + "match all of: " + postfixMessages.joined(separator: ", and "), + "\(actualValue)" + ) + } else { + msg = .expectedActualValueTo( + "match all of: " + postfixMessages.joined(separator: ", and ") + ) + } + + return PredicateResult( + bool: matches, + message: msg + ) + }.requireNonNil +} + +public func && (left: Predicate, right: Predicate) -> Predicate { + return satisfyAllOf(left, right) +} + +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +extension NMBObjCMatcher { + @objc public class func satisfyAllOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate { + return NMBPredicate { actualExpression in + if matchers.isEmpty { + return NMBPredicateResult( + status: NMBPredicateStatus.fail, + message: NMBExpectationMessage( + fail: "satisfyAllOf must be called with at least one matcher" + ) + ) + } + + var elementEvaluators = [Predicate]() + for matcher in matchers { + let elementEvaluator = Predicate { expression in + if let predicate = matcher as? NMBPredicate { + // swiftlint:disable:next line_length + return predicate.satisfies({ try! expression.evaluate() }, location: actualExpression.location).toSwift() + } else { + let failureMessage = FailureMessage() + // swiftlint:disable:next line_length + let success = matcher.matches({ try! expression.evaluate() }, failureMessage: failureMessage, location: actualExpression.location) + return PredicateResult(bool: success, message: failureMessage.toExpectationMessage()) + } + } + + elementEvaluators.append(elementEvaluator) + } + + return try! satisfyAllOf(elementEvaluators).satisfies(actualExpression).toObjectiveC() + } + } +} +#endif diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift index b2817cc..d02a0ff 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift @@ -1,61 +1,108 @@ 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(_ matchers: U...) -> NonNilMatcherFunc +/// provided in the variable list of matchers. +public func satisfyAnyOf(_ matchers: U...) -> Predicate where U: Matcher, U.ValueType == T { return satisfyAnyOf(matchers) } -internal func satisfyAnyOf(_ matchers: [U]) -> NonNilMatcherFunc +/// Deprecated. Please use `satisfyAnyOf(_) -> Predicate` instead. +internal func satisfyAnyOf(_ matchers: [U]) -> Predicate where U: Matcher, U.ValueType == T { - return NonNilMatcherFunc { actualExpression, failureMessage in - let postfixMessages = NSMutableArray() - var matches = false - for matcher in matchers { - if try matcher.matches(actualExpression, failureMessage: failureMessage) { - matches = true + return NonNilMatcherFunc { actualExpression, failureMessage in + let postfixMessages = NSMutableArray() + var matches = false + for matcher in matchers { + if try matcher.matches(actualExpression, failureMessage: failureMessage) { + matches = true + } + postfixMessages.add(NSString(string: "{\(failureMessage.postfixMessage)}")) } - postfixMessages.add(NSString(string: "{\(failureMessage.postfixMessage)}")) - } - failureMessage.postfixMessage = "match one of: " + postfixMessages.componentsJoined(by: ", or ") - if let actualValue = try actualExpression.evaluate() { - failureMessage.actualValue = "\(actualValue)" - } + failureMessage.postfixMessage = "match one of: " + postfixMessages.componentsJoined(by: ", or ") + if let actualValue = try actualExpression.evaluate() { + failureMessage.actualValue = "\(actualValue)" + } - return matches - } + return matches + }.predicate +} + +internal func satisfyAnyOf(_ predicates: [Predicate]) -> Predicate { + return Predicate { actualExpression in + var postfixMessages = [String]() + var matches = false + for predicate in predicates { + let result = try predicate.satisfies(actualExpression) + if result.toBoolean(expectation: .toMatch) { + matches = true + } + postfixMessages.append("{\(result.message.expectedMessage)}") + } + + var msg: ExpectationMessage + if let actualValue = try actualExpression.evaluate() { + msg = .expectedCustomValueTo( + "match one of: " + postfixMessages.joined(separator: ", or "), + "\(actualValue)" + ) + } else { + msg = .expectedActualValueTo( + "match one of: " + postfixMessages.joined(separator: ", or ") + ) + } + + return PredicateResult( + status: PredicateStatus(bool: matches), + message: msg + ) + }.requireNonNil +} + +public func || (left: Predicate, right: Predicate) -> Predicate { + return satisfyAnyOf(left, right) } -public func || (left: NonNilMatcherFunc, right: NonNilMatcherFunc) -> NonNilMatcherFunc { +public func || (left: NonNilMatcherFunc, right: NonNilMatcherFunc) -> Predicate { return satisfyAnyOf(left, right) } -public func || (left: MatcherFunc, right: MatcherFunc) -> NonNilMatcherFunc { +public func || (left: MatcherFunc, right: MatcherFunc) -> Predicate { return satisfyAnyOf(left, right) } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { - public class func satisfyAnyOfMatcher(_ matchers: [NMBObjCMatcher]) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func satisfyAnyOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate { + return NMBPredicate { actualExpression in if matchers.isEmpty { - failureMessage.stringValue = "satisfyAnyOf must be called with at least one matcher" - return false + return NMBPredicateResult( + status: NMBPredicateStatus.fail, + message: NMBExpectationMessage( + fail: "satisfyAnyOf must be called with at least one matcher" + ) + ) } - var elementEvaluators = [NonNilMatcherFunc]() + var elementEvaluators = [Predicate]() for matcher in matchers { - let elementEvaluator: (Expression, FailureMessage) -> Bool = { - expression, failureMessage in - return matcher.matches({try! expression.evaluate()}, failureMessage: failureMessage, location: actualExpression.location) + let elementEvaluator = Predicate { expression in + if let predicate = matcher as? NMBPredicate { + // swiftlint:disable:next line_length + return predicate.satisfies({ try! expression.evaluate() }, location: actualExpression.location).toSwift() + } else { + let failureMessage = FailureMessage() + // swiftlint:disable:next line_length + let success = matcher.matches({ try! expression.evaluate() }, failureMessage: failureMessage, location: actualExpression.location) + return PredicateResult(bool: success, message: failureMessage.toExpectationMessage()) + } } - elementEvaluators.append(NonNilMatcherFunc(elementEvaluator)) + elementEvaluators.append(elementEvaluator) } - return try! satisfyAnyOf(elementEvaluators).matches(actualExpression, failureMessage: failureMessage) + return try! satisfyAnyOf(elementEvaluators).satisfies(actualExpression).toObjectiveC() } } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift index c847a1a..a530c60 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift @@ -1,8 +1,8 @@ import Foundation -public func throwAssertion() -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - #if arch(x86_64) && _runtime(_ObjC) && !SWIFT_PACKAGE +public func throwAssertion() -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + #if arch(x86_64) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE failureMessage.postfixMessage = "throw an assertion" failureMessage.actualValue = nil @@ -49,7 +49,8 @@ public func throwAssertion() -> MatcherFunc { #else fatalError("The throwAssertion Nimble matcher can only run on x86_64 platforms with " + "Objective-C (e.g. Mac, iPhone 5s or later simulators). You can silence this error " + - "by placing the test case inside an #if arch(x86_64) or _runtime(_ObjC) conditional statement") + "by placing the test case inside an #if arch(x86_64) or (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) conditional statement") + // swiftlint:disable:previous line_length #endif } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift index 151eb9a..872ca5c 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift @@ -1,5 +1,36 @@ import Foundation +/// A Nimble matcher that succeeds when the actual expression throws an +/// error of the specified type or from the specified case. +/// +/// Errors are tried to be compared by their implementation of Equatable, +/// otherwise they fallback to comparison by _domain and _code. +/// +/// Alternatively, you can pass a closure to do any arbitrary custom matching +/// to the thrown error. The closure only gets called when an error was thrown. +/// +/// nil arguments indicates that the matcher should not attempt to match against +/// that parameter. +public func throwError() -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + + var actualError: Error? + do { + _ = try actualExpression.evaluate() + } catch let catchedError { + actualError = catchedError + } + + failureMessage.postfixMessage = "throw any error" + if let actualError = actualError { + failureMessage.actualValue = "<\(actualError)>" + } else { + failureMessage.actualValue = "no error" + } + return actualError != nil + } +} + /// A Nimble matcher that succeeds when the actual expression throws an /// error of the specified type or from the specified case. /// @@ -11,22 +42,149 @@ import Foundation /// /// nil arguments indicates that the matcher should not attempt to match against /// that parameter. -public func throwError( - _ error: T? = nil, - errorType: T.Type? = nil, - closure: ((T) -> Void)? = nil) -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - - var actualError: Error? - do { - _ = try actualExpression.evaluate() - } catch let catchedError { - actualError = catchedError +public func throwError(_ error: T, closure: ((Error) -> Void)? = nil) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + + var actualError: Error? + do { + _ = try actualExpression.evaluate() + } catch let catchedError { + actualError = catchedError + } + + setFailureMessageForError( + failureMessage, + actualError: actualError, + error: error, + errorType: nil, + closure: closure + ) + var matches = false + if let actualError = actualError, errorMatchesExpectedError(actualError, expectedError: error) { + matches = true + if let closure = closure { + let assertions = gatherFailingExpectations { + closure(actualError) + } + let messages = assertions.map { $0.message } + if messages.count > 0 { + matches = false + } } + } + return matches + } +} + +/// A Nimble matcher that succeeds when the actual expression throws an +/// error of the specified type or from the specified case. +/// +/// Errors are tried to be compared by their implementation of Equatable, +/// otherwise they fallback to comparision by _domain and _code. +/// +/// Alternatively, you can pass a closure to do any arbitrary custom matching +/// to the thrown error. The closure only gets called when an error was thrown. +/// +/// nil arguments indicates that the matcher should not attempt to match against +/// that parameter. +public func throwError(_ error: T, closure: ((T) -> Void)? = nil) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + + var actualError: Error? + do { + _ = try actualExpression.evaluate() + } catch let catchedError { + actualError = catchedError + } + + setFailureMessageForError( + failureMessage, + actualError: actualError, + error: error, + errorType: nil, + closure: closure + ) + var matches = false + if let actualError = actualError as? T, error == actualError { + matches = true + + if let closure = closure { + let assertions = gatherFailingExpectations { + closure(actualError) + } + let messages = assertions.map { $0.message } + if messages.count > 0 { + matches = false + } + } + } + return matches + } +} + +/// A Nimble matcher that succeeds when the actual expression throws an +/// error of the specified type or from the specified case. +/// +/// Errors are tried to be compared by their implementation of Equatable, +/// otherwise they fallback to comparision by _domain and _code. +/// +/// Alternatively, you can pass a closure to do any arbitrary custom matching +/// to the thrown error. The closure only gets called when an error was thrown. +/// +/// nil arguments indicates that the matcher should not attempt to match against +/// that parameter. +public func throwError( + errorType: T.Type, + closure: ((T) -> Void)? = nil) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + + var actualError: Error? + do { + _ = try actualExpression.evaluate() + } catch let catchedError { + actualError = catchedError + } - setFailureMessageForError(failureMessage, actualError: actualError, error: error, errorType: errorType, closure: closure) - return errorMatchesNonNilFieldsOrClosure(actualError, error: error, errorType: errorType, closure: closure) + setFailureMessageForError( + failureMessage, + actualError: actualError, + error: nil, + errorType: errorType, + closure: closure + ) + var matches = false + if let actualError = actualError { + matches = true + if let actualError = actualError as? T { + if let closure = closure { + let assertions = gatherFailingExpectations { + closure(actualError) + } + let messages = assertions.map { $0.message } + if messages.count > 0 { + matches = false + } + } + } else { + matches = (actualError is T) + // The closure expects another ErrorProtocol as argument, so this + // is _supposed_ to fail, so that it becomes more obvious. + if let closure = closure { + let assertions = gatherExpectations { + if let actual = actualError as? T { + closure(actual) + } + } + let messages = assertions.map { $0.message } + if messages.count > 0 { + matches = false + } + } + } } + + return matches + } } /// A Nimble matcher that succeeds when the actual expression throws any @@ -36,18 +194,65 @@ 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: ((Error) -> Void)? = nil) -> MatcherFunc { - return MatcherFunc { actualExpression, failureMessage in - - var actualError: Error? - do { - _ = try actualExpression.evaluate() - } catch let catchedError { - actualError = catchedError +public func throwError(closure: @escaping ((Error) -> Void)) -> Predicate { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + + var actualError: Error? + do { + _ = try actualExpression.evaluate() + } catch let catchedError { + actualError = catchedError + } + + setFailureMessageForError(failureMessage, actualError: actualError, closure: closure) + + var matches = false + if let actualError = actualError { + matches = true + + let assertions = gatherFailingExpectations { + closure(actualError) } + let messages = assertions.map { $0.message } + if messages.count > 0 { + matches = false + } + } + return matches + } +} + +/// A Nimble matcher that succeeds when the actual expression throws any +/// error or when the passed closures' arbitrary custom matching succeeds. +/// +/// This duplication to it's generic adequate is required to allow to receive +/// 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 { + return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in + + var actualError: Error? + do { + _ = try actualExpression.evaluate() + } catch let catchedError { + actualError = catchedError + } + + setFailureMessageForError(failureMessage, actualError: actualError, closure: closure) + + var matches = false + if let actualError = actualError as? T { + matches = true - setFailureMessageForError(failureMessage, actualError: actualError, closure: closure) - return errorMatchesNonNilFieldsOrClosure(actualError, closure: closure) + let assertions = gatherFailingExpectations { + closure(actualError) + } + let messages = assertions.map { $0.message } + if messages.count > 0 { + matches = false + } } + return matches + } } diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift new file mode 100644 index 0000000..01369bb --- /dev/null +++ b/Example/Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift @@ -0,0 +1,37 @@ +/** + Used by the `toSucceed` matcher. + + This is the return type for the closure. + */ +public enum ToSucceedResult { + case succeeded + case failed(reason: String) +} + +/** + A Nimble matcher that takes in a closure for validation. + + Return `.succeeded` when the validation succeeds. + Return `.failed` with a failure reason when the validation fails. + */ +public func succeed() -> Predicate<() -> ToSucceedResult> { + return Predicate.define { actualExpression in + let optActual = try actualExpression.evaluate() + guard let actual = optActual else { + return PredicateResult(status: .fail, message: .fail("expected a closure, got ")) + } + + switch actual() { + case .succeeded: + return PredicateResult( + bool: true, + message: .expectedCustomValueTo("succeed", "") + ) + case .failed(let reason): + return PredicateResult( + bool: false, + message: .expectedCustomValueTo("succeed", " because <\(reason)>") + ) + } + } +} diff --git a/Example/Pods/Nimble/Sources/Nimble/Nimble.h b/Example/Pods/Nimble/Sources/Nimble/Nimble.h index 790d16d..2bbc693 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Nimble.h +++ b/Example/Pods/Nimble/Sources/Nimble/Nimble.h @@ -3,11 +3,10 @@ #import "NMBStringify.h" #import "DSL.h" -#import "CwlCatchException.h" -#import "CwlCatchBadInstruction.h" - -#if !TARGET_OS_TV - #import "mach_excServer.h" +#if TARGET_OS_TV + #import "CwlPreconditionTesting_POSIX.h" +#else + #import "CwlPreconditionTesting.h" #endif FOUNDATION_EXPORT double NimbleVersionNumber; diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Async.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Async.swift index 943fd30..cb672ad 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Async.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/Async.swift @@ -2,7 +2,7 @@ import CoreFoundation import Dispatch import Foundation -#if !_runtime(_ObjC) +#if !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) import CDispatch #endif @@ -27,12 +27,12 @@ internal protocol WaitLock { } internal class AssertionWaitLock: WaitLock { - private var currentWaiter: WaitingInfo? = nil + private var currentWaiter: WaitingInfo? init() { } func acquireWaitingLock(_ fnName: String, file: FileString, line: UInt) { let info = WaitingInfo(name: fnName, file: file, lineNumber: line) - #if _runtime(_ObjC) + #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) let isMainThread = Thread.isMainThread #else let isMainThread = _CFIsMainThread() @@ -89,7 +89,7 @@ internal enum AwaitResult { func isCompleted() -> Bool { switch self { - case .completed(_): return true + case .completed: return true default: return false } } @@ -105,11 +105,15 @@ internal class AwaitPromise { signal = DispatchSemaphore(value: 1) } + deinit { + signal.signal() + } + /// Resolves the promise with the given result if it has not been resolved. Repeated calls to /// this method will resolve in a no-op. /// /// @returns a Bool that indicates if the async result was accepted or rejected because another - /// value was recieved first. + /// value was received first. func resolveResult(_ result: AwaitResult) -> Bool { if signal.wait(timeout: .now()) == .success { self.asyncResult = result @@ -176,16 +180,25 @@ internal class AwaitPromiseBuilder { // checked. // // In addition, stopping the run loop is used to halt code executed on the main run loop. + #if swift(>=4.0) + trigger.timeoutSource.schedule( + deadline: DispatchTime.now() + timeoutInterval, + repeating: .never, + leeway: timeoutLeeway + ) + #else trigger.timeoutSource.scheduleOneshot( deadline: DispatchTime.now() + timeoutInterval, - leeway: timeoutLeeway) + leeway: timeoutLeeway + ) + #endif trigger.timeoutSource.setEventHandler { guard self.promise.asyncResult.isIncomplete() else { return } let timedOutSem = DispatchSemaphore(value: 0) let semTimedOutOrBlocked = DispatchSemaphore(value: 0) semTimedOutOrBlocked.signal() let runLoop = CFRunLoopGetMain() - #if _runtime(_ObjC) + #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) let runLoopMode = CFRunLoopMode.defaultMode.rawValue #else let runLoopMode = kCFRunLoopDefaultMode @@ -218,7 +231,7 @@ internal class AwaitPromiseBuilder { /// @discussion /// This function must be executed on the main thread and cannot be nested. This is because /// this function (and it's related methods) coordinate through the main run loop. Tampering - /// with the run loop can cause undesireable behavior. + /// with the run loop can cause undesirable behavior. /// /// This method will return an AwaitResult in the following cases: /// @@ -250,9 +263,13 @@ 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) + _ = RunLoop.current.run(mode: .default, before: .distantFuture) + #else _ = RunLoop.current.run(mode: .defaultRunLoopMode, before: .distantFuture) + #endif } - self.trigger.timeoutSource.suspend() + self.trigger.timeoutSource.cancel() if let asyncSource = self.trigger.actionSource { asyncSource.cancel() @@ -282,20 +299,23 @@ internal class Awaiter { } func performBlock( - _ closure: @escaping (@escaping (T) -> Void) throws -> Void) -> AwaitPromiseBuilder { + file: FileString, + line: UInt, + _ closure: @escaping (@escaping (T) -> Void) throws -> Void + ) -> AwaitPromiseBuilder { let promise = AwaitPromise() let timeoutSource = createTimerSource(timeoutQueue) var completionCount = 0 let trigger = AwaitTrigger(timeoutSource: timeoutSource, actionSource: nil) { try closure { completionCount += 1 - nimblePrecondition( - completionCount < 2, - "InvalidNimbleAPIUsage", - "Done closure's was called multiple times. waitUntil(..) expects its " + - "completion closure to only be called once.") - if promise.resolveResult(.completed($0)) { - CFRunLoopStop(CFRunLoopGetMain()) + if completionCount < 2 { + if promise.resolveResult(.completed($0)) { + CFRunLoopStop(CFRunLoopGetMain()) + } + } else { + fail("waitUntil(..) expects its completion closure to be only called once", + file: file, line: line) } } } @@ -313,7 +333,11 @@ internal class Awaiter { let asyncSource = createTimerSource(asyncQueue) let trigger = AwaitTrigger(timeoutSource: timeoutSource, actionSource: asyncSource) { let interval = DispatchTimeInterval.nanoseconds(Int(pollInterval * TimeInterval(NSEC_PER_SEC))) + #if swift(>=4.0) + asyncSource.schedule(deadline: .now(), repeating: interval, leeway: pollLeeway) + #else asyncSource.scheduleRepeating(deadline: .now(), interval: interval, leeway: pollLeeway) + #endif asyncSource.setEventHandler { do { if let result = try closure() { @@ -347,14 +371,10 @@ internal func pollBlock( expression: @escaping () throws -> Bool) -> AwaitResult { let awaiter = NimbleEnvironment.activeInstance.awaiter let result = awaiter.poll(pollInterval) { () throws -> Bool? in - do { - if try expression() { - return true - } - return nil - } catch let error { - throw error + if try expression() { + return true } + return nil }.timeout(timeoutInterval, forcefullyAbortTimeout: timeoutInterval / 2.0).wait(fnName, file: file, line: line) return result diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift index f376505..074cb20 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/Errors.swift @@ -12,15 +12,11 @@ internal func setFailureMessageForError( failureMessage.postfixMessage = "\(postfixMessageVerb) error" if let error = error { - if let error = error as? CustomDebugStringConvertible { - failureMessage.postfixMessage += " <\(error.debugDescription)>" - } else { - failureMessage.postfixMessage += " <\(error)>" - } + failureMessage.postfixMessage += " <\(error)>" } else if errorType != nil || closure != nil { failureMessage.postfixMessage += " from type <\(T.self)>" } - if let _ = closure { + if closure != nil { failureMessage.postfixMessage += " that satisfies block" } if error == nil && errorType == nil && closure == nil { @@ -41,62 +37,6 @@ internal func errorMatchesExpectedError( && actualError._code == expectedError._code } -internal func errorMatchesExpectedError( - _ actualError: Error, - expectedError: T) -> Bool - where T: Equatable { - if let actualError = actualError as? T { - return actualError == expectedError - } - return false -} - -internal func errorMatchesNonNilFieldsOrClosure( - _ actualError: Error?, - error: T? = nil, - errorType: T.Type? = nil, - closure: ((T) -> Void)? = nil) -> Bool { - var matches = false - - if let actualError = actualError { - matches = true - - if let error = error { - if !errorMatchesExpectedError(actualError, expectedError: error) { - matches = false - } - } - if let actualError = actualError as? T { - if let closure = closure { - let assertions = gatherFailingExpectations { - closure(actualError as T) - } - let messages = assertions.map { $0.message } - if messages.count > 0 { - matches = false - } - } - } else if errorType != nil { - matches = (actualError is T) - // The closure expects another ErrorProtocol as argument, so this - // is _supposed_ to fail, so that it becomes more obvious. - if let closure = closure { - let assertions = gatherExpectations { - if let actual = actualError as? T { - closure(actual) - } - } - let messages = assertions.map { $0.message } - if messages.count > 0 { - matches = false - } - } - } - } - - return matches -} - // Non-generic internal func setFailureMessageForError( @@ -105,7 +45,7 @@ internal func setFailureMessageForError( closure: ((Error) -> Void)?) { failureMessage.postfixMessage = "throw error" - if let _ = closure { + if closure != nil { failureMessage.postfixMessage += " that satisfies block" } else { failureMessage.postfixMessage = "throw any error" @@ -117,25 +57,3 @@ internal func setFailureMessageForError( failureMessage.actualValue = "no error" } } - -internal func errorMatchesNonNilFieldsOrClosure( - _ actualError: Error?, - closure: ((Error) -> Void)?) -> Bool { - var matches = false - - if let actualError = actualError { - matches = true - - if let closure = closure { - let assertions = gatherFailingExpectations { - closure(actualError) - } - let messages = assertions.map { $0.message } - if messages.count > 0 { - matches = false - } - } - } - - return matches -} diff --git a/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift b/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift index 4a7d94f..7c4d273 100644 --- a/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift +++ b/Example/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift @@ -144,7 +144,9 @@ extension Data: TestOutputStringConvertible { /// will return the result of constructing a string from the value. /// /// - SeeAlso: `TestOutputStringConvertible` -public func stringify(_ value: T) -> String { +public func stringify(_ value: T?) -> String { + guard let value = value else { return "nil" } + if let value = value as? TestOutputStringConvertible { return value.testDescription } @@ -156,15 +158,7 @@ public func stringify(_ value: T) -> String { return String(describing: value) } -/// -SeeAlso: `stringify(value: T)` -public func stringify(_ value: T?) -> String { - if let unboxed = value { - return stringify(unboxed) - } - return "nil" -} - -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) @objc public class NMBStringer: NSObject { @objc public class func stringify(_ obj: Any?) -> String { return Nimble.stringify(obj) @@ -175,7 +169,7 @@ public func stringify(_ value: T?) -> String { // MARK: Collection Type Stringers /// Attempts to generate a pretty type string for a given value. If the value is of a Objective-C -/// collection type, or a subclass thereof, (e.g. `NSArray`, `NSDictionary`, etc.). +/// collection type, or a subclass thereof, (e.g. `NSArray`, `NSDictionary`, etc.). /// This function will return the type name of the root class of the class cluster for better /// readability (e.g. `NSArray` instead of `__NSArrayI`). /// diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h b/Example/Pods/Nimble/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h deleted file mode 100644 index 5d416e4..0000000 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import - -SWIFT_CLASS("_TtC6Nimble22CurrentTestCaseTracker") -@interface CurrentTestCaseTracker : NSObject -+ (CurrentTestCaseTracker *)sharedInstance; -@end - -@interface CurrentTestCaseTracker (Register) @end diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h index 2089607..9170541 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.h @@ -30,12 +30,12 @@ NS_ASSUME_NONNULL_BEGIN #define DEFINE_NMB_EXPECT_OVERLOAD(TYPE, EXPR) \ NIMBLE_EXPORT_INLINE NIMBLE_OVERLOADABLE \ - NMBExpectation *NMB_expect(TYPE(^actualBlock)(), NSString *file, NSUInteger line) { \ + NMBExpectation *NMB_expect(TYPE(^actualBlock)(void), NSString *file, NSUInteger line) { \ return NMB_expect(^id { return EXPR; }, file, line); \ } NIMBLE_EXPORT NIMBLE_OVERLOADABLE - NMBExpectation *NMB_expect(id(^actualBlock)(), NSString *file, NSUInteger line); + NMBExpectation *NMB_expect(id(^actualBlock)(void), NSString *file, NSUInteger line); // overloaded dispatch for nils - expect(nil) DEFINE_NMB_EXPECT_OVERLOAD(void*, nil) @@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN -NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(), NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(void), NSString *file, NSUInteger line); @@ -186,6 +186,8 @@ NIMBLE_EXPORT_INLINE id beginWith(id itemElementOrSubstring) { DEFINE_OVERLOAD(unsigned long, @(expectedValue)) DEFINE_OVERLOAD(int, @(expectedValue)) DEFINE_OVERLOAD(unsigned int, @(expectedValue)) + DEFINE_OVERLOAD(float, @(expectedValue)) + DEFINE_OVERLOAD(double, @(expectedValue)) DEFINE_OVERLOAD(long long, @(expectedValue)) DEFINE_OVERLOAD(unsigned long long, @(expectedValue)) DEFINE_OVERLOAD(char, @(expectedValue)) @@ -348,6 +350,12 @@ NIMBLE_EXPORT id NMB_satisfyAnyOfWithMatchers(id matchers); #define satisfyAnyOf(...) NMB_satisfyAnyOf(__VA_ARGS__) #endif +NIMBLE_EXPORT id NMB_satisfyAllOfWithMatchers(id matchers); +#define NMB_satisfyAllOf(...) NMB_satisfyAllOfWithMatchers(@[__VA_ARGS__]) +#ifndef NIMBLE_DISABLE_SHORT_SYNTAX +#define satisfyAllOf(...) NMB_satisfyAllOf(__VA_ARGS__) +#endif + // In order to preserve breakpoint behavior despite using macros to fill in __FILE__ and __LINE__, // define a builder that populates __FILE__ and __LINE__, and returns a block that takes timeout // and action arguments. See https://github.com/Quick/Quick/pull/185 for details. diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m index 31ff810..670415b 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/DSL.m @@ -1,26 +1,23 @@ #import -#import - -SWIFT_CLASS("_TtC6Nimble7NMBWait") -@interface NMBWait : NSObject - -+ (void)untilTimeout:(NSTimeInterval)timeout file:(NSString *)file line:(NSUInteger)line action:(void(^)())action; -+ (void)untilFile:(NSString *)file line:(NSUInteger)line action:(void(^)())action; -@end +#if __has_include("Nimble-Swift.h") +#import "Nimble-Swift.h" +#else +#import +#endif NS_ASSUME_NONNULL_BEGIN -NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBExpectation *__nonnull NMB_expect(id __nullable(^actualBlock)(), NSString *__nonnull file, NSUInteger line) { +NIMBLE_EXPORT NIMBLE_OVERLOADABLE NMBExpectation *__nonnull NMB_expect(id __nullable(^actualBlock)(void), NSString *__nonnull file, NSUInteger line) { return [[NMBExpectation alloc] initWithActualBlock:actualBlock negative:NO file:file line:line]; } -NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(), NSString *file, NSUInteger line) { +NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(void), NSString *file, NSUInteger line) { return NMB_expect(^id{ actualBlock(); return nil; @@ -141,18 +138,22 @@ NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger return [NMBObjCMatcher satisfyAnyOfMatcher:matchers]; } +NIMBLE_EXPORT id NMB_satisfyAllOfWithMatchers(id matchers) { + return [NMBObjCMatcher satisfyAllOfMatcher:matchers]; +} + NIMBLE_EXPORT NMBObjCRaiseExceptionMatcher *NMB_raiseException() { return [NMBObjCMatcher raiseExceptionMatcher]; } NIMBLE_EXPORT NMBWaitUntilTimeoutBlock NMB_waitUntilTimeoutBuilder(NSString *file, NSUInteger line) { - return ^(NSTimeInterval timeout, void (^action)(void (^)(void))) { + return ^(NSTimeInterval timeout, void (^ _Nonnull action)(void (^ _Nonnull)(void))) { [NMBWait untilTimeout:timeout file:file line:line action:action]; }; } NIMBLE_EXPORT NMBWaitUntilBlock NMB_waitUntilBuilder(NSString *file, NSUInteger line) { - return ^(void (^action)(void (^)(void))) { + return ^(void (^ _Nonnull action)(void (^ _Nonnull)(void))) { [NMBWait untilFile:file line:line action:action]; }; } diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.h b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.h index d2a54d2..e6e0272 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.h +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.h @@ -3,8 +3,8 @@ @interface NMBExceptionCapture : NSObject -- (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnull))handler finally:(void(^ _Nullable)())finally; -- (void)tryBlock:(__attribute__((noescape)) void(^ _Nonnull)())unsafeBlock NS_SWIFT_NAME(tryBlock(_:)); +- (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnull))handler finally:(void(^ _Nullable)(void))finally; +- (void)tryBlock:(__attribute__((noescape)) void(^ _Nonnull)(void))unsafeBlock NS_SWIFT_NAME(tryBlock(_:)); @end diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.m b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.m index 0a882b7..52684b7 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.m +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBExceptionCapture.m @@ -2,12 +2,12 @@ @interface NMBExceptionCapture () @property (nonatomic, copy) void(^ _Nullable handler)(NSException * _Nullable); -@property (nonatomic, copy) void(^ _Nullable finally)(); +@property (nonatomic, copy) void(^ _Nullable finally)(void); @end @implementation NMBExceptionCapture -- (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnull))handler finally:(void(^ _Nullable)())finally { +- (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnull))handler finally:(void(^ _Nullable)(void))finally { self = [super init]; if (self) { self.handler = handler; @@ -16,7 +16,7 @@ - (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnul return self; } -- (void)tryBlock:(void(^ _Nonnull)())unsafeBlock { +- (void)tryBlock:(__attribute__((noescape)) void(^ _Nonnull)(void))unsafeBlock { @try { unsafeBlock(); } diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.h b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.h index e5d5ddd..7938bca 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.h +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.h @@ -4,7 +4,7 @@ * Returns a string appropriate for displaying in test output * from the provided value. * - * @param value A value that will show up in a test's output. + * @param anyObject A value that will show up in a test's output. * * @return The string that is returned can be * customized per type by conforming a type to the `TestOutputStringConvertible` diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.m b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.m index 329d39a..31a80d6 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.m +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.m @@ -1,5 +1,10 @@ #import "NMBStringify.h" + +#if __has_include("Nimble-Swift.h") +#import "Nimble-Swift.h" +#else #import +#endif NSString *_Nonnull NMBStringify(id _Nullable anyObject) { return [NMBStringer stringify:anyObject]; diff --git a/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m b/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m index 35f26fd..fa5030a 100644 --- a/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m +++ b/Example/Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m @@ -1,7 +1,12 @@ -#import "CurrentTestCaseTracker.h" #import #import +#if __has_include("Nimble-Swift.h") +#import "Nimble-Swift.h" +#else +#import +#endif + #pragma mark - Method Swizzling /// Swaps the implementations between two instance methods. diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 677384c..a9494f1 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,171 +7,175 @@ objects = { /* Begin PBXBuildFile section */ - 04ADA7ED88E0D419D4DA1DB9DA1A2FF1 /* MachineLeanringErrorEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6576B5347A8A01F10941469B1EA3EB /* MachineLeanringErrorEnum.swift */; }; - 04AE1DC56A0C088489EA27CED5190838 /* Stringers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 692BA097D08B9592A8A24370C50D81D0 /* Stringers.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 06701D0572D99FF3577E0C4F3E308FE8 /* MLKit.h in Headers */ = {isa = PBXBuildFile; fileRef = D227D633B0111C5DC188D1C75FBC2BB6 /* MLKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0B846370B6EA04F7D7909A403DD16317 /* CwlBadInstructionException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A0C56CEE8C3AD43FF8AE40F6AFFF4C7 /* CwlBadInstructionException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 0B9A16DAD08AFA59EDD6058831216A70 /* World+DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A46C9CABC6D7C94BE0864668B74F949 /* World+DSL.swift */; }; - 0D4B1951108CF54E1968467D30C351B5 /* MatcherFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0CED4BACCDE5B346DA1AF62EB6AF781 /* MatcherFunc.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 0DF2D4E6B55D67E28D8BE9EC5A25F24E /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 256AA66B0C109C259E2D0DDA42B32EDB /* Async.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 10B953E63951E8DB495AA5B5EBDBBABA /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6C176A86FD62B15FEA0A36C68FCEBF8 /* PostNotification.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 11EEDB6DB6F03E2AF3FC368AA32274AC /* ThrowAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564EE9F32DE4725529A52326B19EA90F /* ThrowAssertion.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 123D36BB9CA549C55BBE6FC7D21BAB97 /* NMBStringify.m in Sources */ = {isa = PBXBuildFile; fileRef = 538A45E8224CD67C4262A9B8B8F1F37D /* NMBStringify.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 153AA07F19B6F56DE6BB54E6D7BBF1E5 /* Matrix.swift in Sources */ = {isa = PBXBuildFile; fileRef = B90161234C0D9C58144F0D114775D3E8 /* Matrix.swift */; }; - 15B880A364E4467B8496FB49A27371AA /* Quick.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B964EBE2CDB51FDD20A12FCFCB2CA92 /* Quick.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 178FA5CACF9ACD91FBBEB0DF8892201F /* Hyperbolic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D478FE2127475CABEE5C5AE5B9772D /* Hyperbolic.swift */; }; - 17B85BEE3D018EB0AF42539D1658D24E /* Arithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24FCB1F18D8CD9497E67BE1BC119854 /* Arithmetic.swift */; }; - 18F58A2CDEFED6B5617F4944FC84DBEE /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = CECAF283BF4E0E908EDD2145F46A956C /* XCTestSuite+QuickTestSuiteBuilder.m */; }; - 1C37D984F1BBBC7278E1FB6BDB153892 /* CwlCatchBadInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC4FF748D013369FE77FEB13FA517D2 /* CwlCatchBadInstruction.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 1F707004C05C63F90F0030E8E4902D66 /* BeLessThanOrEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC69007AFC0A65564291043D24B15E3D /* BeLessThanOrEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 20C32450383B494CC9EF7F3072369EE0 /* Pods-MLKit_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A6F138A9EBF54B5A06DCE9CD171D6071 /* Pods-MLKit_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2173F4681D2DDDF63A01A7439EDE1FD4 /* NMBObjCMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 460AA53800E69CBD26BBD78537857F1E /* NMBObjCMatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 2211BD314546EEC0AB7B56FC3A45B4E5 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 761E70C09096AF7E9F07C0940571D8E8 /* XCTest.framework */; }; - 249AC8A0B6CC8D4D92DA5D841D712900 /* Complex.swift in Sources */ = {isa = PBXBuildFile; fileRef = E73EAAE4A9B8B04A94992730F2F8F808 /* Complex.swift */; }; - 288DBE855F794BA1AE8BC47AA413693E /* BeginWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26788572C6F366401AFEC63C14A45513 /* BeginWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 2991245B488F3F00EDCFD3EFB2244294 /* Auxiliary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012916E1116F4F544559C4FFCDD0D170 /* Auxiliary.swift */; }; - 2B132F4EB4A9D60A8439EFAC1D0D6D2C /* Span.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A3B4EC6DA19FEADCCDCA96CA327574 /* Span.swift */; }; - 2DB201D5AC1FCE6C27412155BACDF7F6 /* ActivationFunctionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CC96CA68BA0815524C996D3FD7D4C8 /* ActivationFunctionType.swift */; }; - 2DF80575B9759A9E8004F4F642D0D123 /* ContainElementSatisfying.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4891C3E0E5A4953C1B99E8D3D29EE77 /* ContainElementSatisfying.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 3068D78E8F744939B04CA6B03D3380AA /* QCKDSL.h in Headers */ = {isa = PBXBuildFile; fileRef = E676FEA2024624A7035E564D4FD4C518 /* QCKDSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 30F80459D8D536D8B99880EDD353987A /* BeGreaterThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46306D0BBA1452AFEA95521C31EF74FD /* BeGreaterThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 318F9AE6D9561CFB487071A821B4217D /* BeLessThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = E173D8DBF9F7B3031B549B2E0D20C12A /* BeLessThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 31DAC2CCBBF3C8BA68AB4DC7912A199B /* Pods-MLKit_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D3A07F4F6A05CA6A00CF85FDA94AB57 /* Pods-MLKit_Tests-dummy.m */; }; + 004C4A6F461C216F03A05253CA730BEF /* BeLessThanOrEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3D739338A7631D1462E2684F771CCDE /* BeLessThanOrEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 00D139EEB6792519BEAF55EA35ED8F83 /* AllPass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38E6B7D825EED250A8A2E507119F4709 /* AllPass.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 057FD6F9061B0A2B9BFE252D3C102A3B /* CwlCatchBadInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5939A7201581DF730418B213139A659D /* CwlCatchBadInstruction.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 06A1ED28CC8A4A7AA51A74E3F066B890 /* Tensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8652DE537D4205F41CABDA2982BA1C25 /* Tensor.swift */; }; + 0B24159FEC50346D438B9E0EECBEE8BE /* SatisfyAnyOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA8A10C6381DD2BA184C44E716A301AA /* SatisfyAnyOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0ECBFD6DD2705D603B58B6CDBB4ECB55 /* ActivationFunctionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AE607EC3AE432038B8D01ED43874F5 /* ActivationFunctionType.swift */; }; + 0EFF888E42BD1DF8B77FA6B547BC9149 /* NMBStringify.h in Headers */ = {isa = PBXBuildFile; fileRef = C62DBF5F4F814CA68B3097F0248FB2ED /* NMBStringify.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 10C8501040563F6DC661872488E4EE05 /* Interval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E704933645FA99C8E634547C49786E9 /* Interval.swift */; }; + 11B8DC63427760E55702E36491E82FA5 /* AssertionDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7A706141B0D9509964E0CB47AA457C /* AssertionDispatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 12080BB18AFDA64D95FD31E27B28A66D /* Stringers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B8E32AD23B2D12CA57341D936CAB3A /* Stringers.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 13222A32A26429EB6E1D112C5F8B97D4 /* ExampleMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6EB106E4321D22F26A52B5B8DE64CD /* ExampleMetadata.swift */; }; + 1995EBB8E64C83233C202827D2D642E9 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EF396CF1EE4E75AD050BDF3EC68560 /* Predicate.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 1B1A26FD4363A19DEFED48BF5E5341BE /* NMBExceptionCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = BF556D4573DC7F987D53D889524FE92C /* NMBExceptionCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1BBFE5E8E35BF18EC9F4C8BD8EC1C060 /* BeAKindOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A859BC8BAFA1A204B91C3D70FD7A64A6 /* BeAKindOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 1CFDB94DFF57F98BA7A40829DDB3CFC0 /* CwlPreconditionTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = B9B1A75006593B42ED0AC43E5AF1A6C4 /* CwlPreconditionTesting.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1D230EC73A17C8494F279447636B6D51 /* Nimble.h in Headers */ = {isa = PBXBuildFile; fileRef = 5981D3D86D2E06AC38A3978635C9DED8 /* Nimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1D6F244C93C8350C8BD032AEDC9402C5 /* FFT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7285349CCF57C337C73827A7D17A9CEF /* FFT.swift */; }; + 1E03644651C38FCCC0C5614DF1CC4541 /* Span.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197CCEAC9008FEF55260A0F2FF0C7B32 /* Span.swift */; }; + 1F7C236A1386F8EDED5E6445FD19C9E3 /* EndWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF91AA966FF23FD34A8A2A6CA13B6D92 /* EndWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 21979416B2B4389E1A489EE0C33A536B /* Contain.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2865B6ED5D6CC83F8E66C35548F7893 /* Contain.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 22731B945A88C7E0BEE56C04EA79B854 /* NSBundle+CurrentTestBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5D01A26D43913794F56D3A7971FF5E /* NSBundle+CurrentTestBundle.swift */; }; + 2339AFF95F06AB4A518AAA46A27255D6 /* AsyncMatcherWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D75D2A081911A92CAAA13793F43C1F75 /* AsyncMatcherWrapper.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 258E93DF9434A618A4A4E48C5CAA41CD /* BeNil.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1FBBDEE20AB0367D1E895BFF7BAFB74 /* BeNil.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 26C2857031D2CB5DE4BFC55F71E64229 /* 2DTensorSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC94E0F4BCD7B7FE9B85BA34D118700B /* 2DTensorSlice.swift */; }; + 28CFC0568B5E674FF8F0AF1CC0E54ADF /* BeGreaterThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6E390EC13AA8DFEFCF8F64F83ED7F0 /* BeGreaterThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 294B014BE7FF231808A123355C1DDDCC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */; }; + 2A58E899DD8B5F96FE9C3EDE09DA4275 /* BeAnInstanceOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86BC4FC4C5A0AC48D066EA367D9F1A1 /* BeAnInstanceOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 2A64C14CA0740E07DF5604A89045B736 /* ComplexArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF613065B011698DDBE313953239BF2 /* ComplexArithmetic.swift */; }; + 320DB9CF630DCAD9F57987783F2BCCA6 /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED86E004A5AE80E2A32D547215794042 /* RaisesException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 32303624D5644DFA368BB8ADE56A5A80 /* PointerUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E5093D5F993BB458C93C325732AC182 /* PointerUtilities.swift */; }; 327749EF14CAE658519971A5FDD0AB95 /* Upsurge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E88E2BB63028C27C1E53746F101DF7 /* Upsurge.framework */; }; - 32AB6828BB98A679D3EBCC16C7BE9566 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2D5869169BD2131A228B383AB451505 /* Functional.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 34E0569B2666F68A70EB676EFDCC4434 /* CwlCatchException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40FFCF7710FDE9792C5747C276F2DF4F /* CwlCatchException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 35E498D7267B6961DED0706D43F883A0 /* SuiteHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D765DA753FAB21A06C81689DCF49863 /* SuiteHooks.swift */; }; - 383B3EF018CDFD095EFEB7D74769144A /* EndWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05BA3CAD29488F2C5317D831BB6931BF /* EndWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 387B27F0A4DD48F245FF12E5485FB9BE /* QuickConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EB98267420E501E4F7B0573E2C5F96F /* QuickConfiguration.m */; }; - 3C8CBA02B15729E98A0F63382FE6217B /* ValueArraySlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19D06F6EACA4C3A8FB660F983B8C2500 /* ValueArraySlice.swift */; }; - 3E456278E0D7B190269739DA08693C9E /* LinearType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AB15E15A6C417380F4BDE4F104E73FA /* LinearType.swift */; }; - 3E699E314F200C3EEF7C7E0D46E26B79 /* Upsurge-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C36512E8311F1878F954D885D3EF9B /* Upsurge-dummy.m */; }; - 3FFDB93012DF1EBF973430063D61C96D /* Callsite.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04D296FB2AE0035E8400F25EBD3EF4B /* Callsite.swift */; }; - 409A3ECDDC680D0BD343E3F203862E25 /* Nimble.h in Headers */ = {isa = PBXBuildFile; fileRef = 124FF2A96FE15393763BC63572EEC184 /* Nimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 438262E9AEBC5203D56677E842F563D5 /* MatrixArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2A011722B21DE42A32C785BC89EA01 /* MatrixArithmetic.swift */; }; - 4540D4FBCD937483258578DE32634108 /* World+DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = F4AA2FCE20C3F50B7669DC36BD5B9FD0 /* World+DSL.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 458ECBFAB660567138EFA52210058C36 /* QuickSelectedTestSuiteBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE29DF31652B34FA490E23487B83FBEE /* QuickSelectedTestSuiteBuilder.swift */; }; - 46AAFE6E2E75D62AF8DFED367375002C /* QuickSpecBase.m in Sources */ = {isa = PBXBuildFile; fileRef = B9D3FED038BE3338641A141732755B00 /* QuickSpecBase.m */; }; - 4780B7DFD8E5DC959B44110EEB2AD935 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */; }; - 48D3AEB90C6F865FB5128840EF13CAC8 /* Layer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22F81E5621CF7F9199426C6B30396E0 /* Layer.swift */; }; - 4A17E1DB4EA2CCBF04B76F5F8EB417A1 /* DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 0874FE88223748474F9540CC3A7B2CDD /* DSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B6579FFF0062EEBBABB8336C0871171 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C1D721B2C6C17E12FA8322E6E16682 /* Errors.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 4D339AFDC6B6AAA44BA5C0CD471B6EA2 /* QuickSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 67BD782939C66E9C3619A77243519BF6 /* QuickSpec.m */; }; - 4D5C0E52B4D1231A2E3057B4A048D1C5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */; }; - 4FDFB4587C55A09C0A2E3A3780568B54 /* QuickSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 02862E2FB988A3D26C860CD548A14BEB /* QuickSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 50471C0EFA0C6F13833F63066765DCFF /* LinearOperators.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3B0FE4A67C53BAE82ACF00A907244A /* LinearOperators.swift */; }; - 508E5B8353068B37CA6F40E3D7B89D42 /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9624E19BE6F7377A79FB879764B1B1DE /* Closures.swift */; }; - 519349F9AF137FFAD28A594685046460 /* Exponential.swift in Sources */ = {isa = PBXBuildFile; fileRef = C00D1260FC691D4C91B5C7B0C1E51CED /* Exponential.swift */; }; - 51CE8C2AEBC657C98FFC03B61E97B412 /* Upsurge-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5480FBA1F6D203291F193F6D19878DBA /* Upsurge-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 562D9F54656827753A037634D5385BFD /* TensorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C9E249A32DD13B27BA05B3CDE01B22E /* TensorType.swift */; }; - 5685322E421AB4DA6A91B26C09833B29 /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E429FE9C8505AE999927833503F9CB86 /* BeIdenticalTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 59667A95671EEAF87FA2272CE0B01451 /* QCKDSL.m in Sources */ = {isa = PBXBuildFile; fileRef = E3118F695CEE1A70F01A9E795A35D87A /* QCKDSL.m */; }; - 5B18BC28616DDC2DDE3442B98F00CF09 /* PolynomialRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B8C04FE82A09C3FC32594EBFC743E53 /* PolynomialRegression.swift */; }; - 5FB36CC3D65A05755802D9EC66B0AEDC /* KMeans.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93DE7AC6CBCC1E15E3EC4491A5B45D7C /* KMeans.swift */; }; - 61554BF9F5D2997AD26BC61F4674CD68 /* Pods-MLKit_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9951688C60A46DD572589F5DACF0C4A5 /* Pods-MLKit_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 643B6917C3157C68C92A7260459DC694 /* Real.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05A2B00A7660C87F990F90901BB61C2 /* Real.swift */; }; - 646824AF5ADC1159EBC9CAC023BAED4E /* ExampleHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FB8099238DE7DDCFE3FE4C07E86CF1E /* ExampleHooks.swift */; }; - 65335E2F74AE71C270659EC7E8725030 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 445AD67BD05424A184443D2B95D450E1 /* Expression.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 694FFDD18CDDC9EC5B5F52779DEC4133 /* CSVReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7264F4D0435F000E2684EB1DAACEBDD1 /* CSVReader.swift */; }; - 69F9C31FC991A69337CE9B599993D68D /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E2478F9C2B8F6A4FD3E290EB66D2967 /* NimbleEnvironment.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 6B8EEA47C6BE87E17FD2F93747E2A4C5 /* MachineLearningKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D60404BA78CC7BF6C1144F008DDDDBC /* MachineLearningKit-dummy.m */; }; - 6C52EF3CBF595A0DC903558A35E303D9 /* QuickTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7B423E7D950D806D1D781D4D9FC8B1 /* QuickTestSuite.swift */; }; - 6E55E227D9195A39F978F2DC1C408636 /* RidgeRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DB8A700464608EEC997EB8F70F5A97 /* RidgeRegression.swift */; }; - 6F36A431DE56B28FD400D20036A23DE4 /* NMBExceptionCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = D90BB83409612B6B1623CBC644ACC3FE /* NMBExceptionCapture.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 6F74F8072E2C42E51624D0B89AB03048 /* ComplexArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E0EB0151B5DDBCEC7706C08CB3F6D0A /* ComplexArithmetic.swift */; }; - 704DA81E48A5263B35189F36C5247A53 /* FailureMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077C0519A2057F471035D14A7027344E /* FailureMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 71CD456EE3712FFF55CB7BF70ED20647 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AEF9A30B4EAA4E623AC004398637120 /* MapKit.framework */; }; - 7272DB71A8C5325A0778F63E6F6C9957 /* AssertionDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2FFA2871232A17F74D97604A516636 /* AssertionDispatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 7276DB3552398200B421D06F207EC0E3 /* NimbleXCTestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7EC0E4FEBE039947272C3B4A867BE43 /* NimbleXCTestHandler.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 74534A7B8A7904903E206702029453C8 /* QuickSpecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D128A10EA2E300A21235B91F63A2AA3 /* QuickSpecBase.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 748BB746CA429F9C5D510EEF3245ECFD /* Nimble-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DBD0EB0CE3764BD0D10DF460F60B14F7 /* Nimble-dummy.m */; }; - 76C86B1AE6D2B6BED9ABBA270B6EC2F5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */; }; - 78726014CB6610CA87B10E02D148478A /* DSP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383A4DC8ACFD6B49ECF2DFE23764A2D3 /* DSP.swift */; }; - 7900A1BADFEB30B7D803D0869E548E10 /* MatrixSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 674822B4E356741B78B38B007C88BB9C /* MatrixSlice.swift */; }; - 7BD907A708031D5361E1A97CACF9F24E /* Nimble-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 162303716510B6A1AC25BFD0F74F2544 /* Nimble-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7C94AD7C4A4F54FB18623AD4E5CD64F7 /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF83868F61F3BD4402D23052FDEA773A /* Example.swift */; }; - 7E08966D0A420CCE741F608370F4759C /* ComplexArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC143C76D629D8D454DC5D8AA30F893 /* ComplexArray.swift */; }; - 7E950AE4BC7D603625CBFD877F63728C /* ComplexArrayRealSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1210BE3C711459C58AE9F743F7B82931 /* ComplexArrayRealSlice.swift */; }; - 7F5D5AFA3C84AA582DEDC6A6C78E7533 /* Tensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AB6F2F34E76936E5DCD781D737E8D0E /* Tensor.swift */; }; - 80D1788131B3D3326041E62364F8C7AA /* BeAKindOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1849FDC7F164FD02BFDF72640C9F951 /* BeAKindOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 86D13DA212D4F8A87E212941DF61361D /* ComplexArraySlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB163EBF7C9440E868AC98AFF69EA4BF /* ComplexArraySlice.swift */; }; - 86E4EF6BCCB1EF6E67552FCD7A3B6D6E /* QuickConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 16D03C36A6892F0A0BA80E3B43181599 /* QuickConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 874EF0A06B9FC80B877261425BAB4ED2 /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 20BF642EFEB79518E353D7F8F3D860F1 /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 88B771FB81DD05BF7E48A0D9271D9EB4 /* CwlCatchBadInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 3949269DDD43CCFF544917979779224B /* CwlCatchBadInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 88FEF6149AF4FA0DEE3DBCBFD20BE64C /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 895545B440ABA73C074838125D4DDCD5 /* Filter.swift */; }; - 8995462F1A16CFB4BB4B376A1DE531EA /* NSString+C99ExtendedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79862A111E88CCA41E254825B0A2B523 /* NSString+C99ExtendedIdentifier.swift */; }; - 8B633AB7CA7CD7773A1C426781C08948 /* BiologicalProcessManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 224B74EEB01665D46840260470EA4991 /* BiologicalProcessManager.swift */; }; - 8E00B22C6FE14FEF9B828106A8B1622F /* World.h in Headers */ = {isa = PBXBuildFile; fileRef = 64BEBE3A1D4FF0196925EEA64015469B /* World.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 926F67C94121C19A959745138E5B42B6 /* NMBStringify.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A7F3D729C82E75AB35940B80EDE5960 /* NMBStringify.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 92EDDC00A5D940D4F7361AEE6644BD30 /* LassoRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FD53B1F1C37D3650BE5FE2C882A5E /* LassoRegression.swift */; }; - 96154D504405D81853EF3326A10CA05C /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7D069980D480A434318340B49416C2C /* World.swift */; }; - 9D9155396F48333B854DBE586138EDBF /* NMBExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60979E4BD68DB0DE4501D0BCC7234D91 /* NMBExpectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9FFFDDC2816EEAA4F74BE9FCF9681670 /* SimpleLinearRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33447FAB1F2844FCF376B75EB97C4666 /* SimpleLinearRegression.swift */; }; - A167AE1A23ECB0052ECE3E97BCE40E70 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */; }; - A1F2BC02366DABC762E62F506B6D1AC2 /* 2DTensorSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C13EEF6CE7B8665E06332AD77882466 /* 2DTensorSlice.swift */; }; - A279D4DAE8E16C5D8F9019CDBED14D73 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0912AB47C2FD8B724C2FF78EB04DA146 /* DSL.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - A665BE606F6B28E89B531EDE41657ECE /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CCCA0D5F8BB724A0B342E39C887F56C /* Match.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - A711AA562D0AD3092BAF83E2CFCC86A7 /* QuadraticType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 494C0F635D5836E872EF3C5A39E97D40 /* QuadraticType.swift */; }; - A87CA098369D61EFC7A05BD61512A3F5 /* BeAnInstanceOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EB4893036DEB2A1EB8B6111A120F5A2 /* BeAnInstanceOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - A8F199FA1C0D1AD05EADD8EFBC00592B /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76A2C52BB2BC141539B6A02006AE6422 /* Value.swift */; }; - AA6EAFA71E1A6862AA312D89A601C34F /* AsyncMatcherWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1601B2905CD07F5813DA81623EDCA6C /* AsyncMatcherWrapper.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - ABE2A268050AA3DEFDF8D945B9930866 /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477B34BD1FFA8820D6EF220B0BC0118F /* DataManager.swift */; }; - ABEE3775B4FD25B3C86EE712BC2502B2 /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C77F9745A1AEE0419DE285232F7A4B46 /* BeGreaterThanOrEqualTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - AC3D1B5A37FB49CFDCC4C671C79B020F /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C397B78C2E0CE51B2767D2AF1CD9817 /* Extensions.swift */; }; - AD2B0E5BFF8EAD0EDF0449F8D198277C /* BeEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 851E4FB881FC4ED5D39D0CBCB7DAA845 /* BeEmpty.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - AE7464C0BFB56E8B11B0670A68B9CF12 /* NeuralNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8B6CE41AAC2E1823ECFFB4021CC6E2 /* NeuralNetwork.swift */; }; - AF7F875677FF3EB4B6ADDB1373B34249 /* BeLogical.swift in Sources */ = {isa = PBXBuildFile; fileRef = 227DDFCD5D9F3918AB624B74E886C8A5 /* BeLogical.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - AF814F353BF9C15BAED3E4067DCC3BF7 /* MatchError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C9A0B54C6BC094E3CD3A2A61EDA9D85 /* MatchError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B138DBC0F7D2656EE7E413BEA735C71D /* DSL+Wait.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7958F9886E618114345F800A8E55FF /* DSL+Wait.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B16340143CE7FF40A32CD8082ED4152D /* CurrentTestCaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = BA9401876190B7BA1B70B7A9752180D5 /* CurrentTestCaseTracker.h */; settings = {ATTRIBUTES = (Private, ); }; }; - B18BBE44B0684143A1542A9ADC880697 /* URL+FileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D3E3057A07EA15E4008F933E8752DD2 /* URL+FileName.swift */; }; - B1A6D9047AE13EF484B5F58F215440A1 /* Interval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD78CE597862CCAAF3A214DF9A8D46 /* Interval.swift */; }; - B1D59A1BD0FBDF3BA9A5B65ACFC25D56 /* ThrowError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0117B79C919D9B561E2A88CF83B7969 /* ThrowError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B1D876C441B5F61984E35ABB5210AFE6 /* CwlDarwinDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F643B28D12D7235D05A86D94E704075 /* CwlDarwinDefinitions.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B231D3FAB3CCEF59EC681C7C51C0AE56 /* ExampleMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = CABE7AA02D1F045430D6A230BD3B4C19 /* ExampleMetadata.swift */; }; - B24A0A8140995A495C05A9D6209847CA /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD3593FEB98ECA8845615527BF4C07B6 /* Accelerate.framework */; }; - B4590BB72005AC96211E469104D92DB5 /* InputDataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA09D70E089028B813F7E3B421C5F78 /* InputDataType.swift */; }; - B612F1F906E3AF8B1FC6B893229E83B6 /* AssertionRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA483EF72520B01CF4A81ED38901CC64 /* AssertionRecorder.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - BCA0250C524C4316B3D4D6415A4969C8 /* ValueArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AAD299764DE8C9B43BA8AFF5C36053F /* ValueArray.swift */; }; - BCCBC7CED6FB9D71D85D8044B209B09A /* ExampleGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711A9AC0701A2E08E65DD82429B871BA /* ExampleGroup.swift */; }; - BD782803F394A708E7D3223EBDE31C95 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A6452D2CC7C17DD01ECD91742AF746F /* DSL.swift */; }; - C08FCDC247B35C971F5AE7E58987E8AC /* SatisfyAnyOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCBBD5A13ECC31F538E7CFD189D0DC70 /* SatisfyAnyOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C39921387DA273A0952A999B0CDC03F9 /* CwlCatchBadInstruction.m in Sources */ = {isa = PBXBuildFile; fileRef = D88E93CB6BC77FCE57F53E52EA5D23E8 /* CwlCatchBadInstruction.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C710B6A7B1A479349273B3AC04CF07C5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */; }; - C7D1BAD68F1C67EA9AAE23534D3E9665 /* Population.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A45BA6EC001C35D2D0B9BFE6072BD59 /* Population.swift */; }; - C83188A450E13A233EF77D94306E926D /* Pods-MLKit_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5025AF8F620B99C3283F0975D09FE3 /* Pods-MLKit_Example-dummy.m */; }; - C9132B1E287B7ECA69A90F4766ADE9C2 /* DSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 56C0D020BB9A8FA4BD0F26AC76A2E14A /* DSL.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C97B9F51427BCD4C63EC7D75AB161833 /* Contain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95FD3F8CEA2A60510B93CE50FFDAEC43 /* Contain.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C9AAE13CC11B5370479EA08F706EA61F /* HooksPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8E6B68CD5B9186B6EC6647BF81A356 /* HooksPhase.swift */; }; - CC420602CB84B73545CD09A3DAD3F638 /* Trigonometric.swift in Sources */ = {isa = PBXBuildFile; fileRef = 632231BFC26E16C229D32687B917D3A0 /* Trigonometric.swift */; }; - D234F610A6025A894A8CF8971A8F96C0 /* TensorSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 904FEA0622628AADB1CA02AA57ED1A48 /* TensorSlice.swift */; }; - D5D4E8223C271A19448FCEAC36A9B441 /* AdapterProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7738AD08C39FE55EBEED43F72217AD23 /* AdapterProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D6A1634CFD5243D18DB762116C8CEF8F /* BeVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B970E9789C66FDD4D00112E12E321A /* BeVoid.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D7408861438442F67469ACE39D1604C1 /* BeCloseTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985F35A8C7BB37C0852C7E45F32619DA /* BeCloseTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D93C5A1929F8FD53F7EF2C3CA16CCC95 /* Expectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2B937DBAE6CC4BCEE683AA80588DC7 /* Expectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - D9921CDBA36587248C63AFDD5B3C1981 /* Equal.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91835FDAA353C4CC63023DDB96B91F6 /* Equal.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DA5FD83FA962C78A2484186465AB5AF2 /* MachineLearningKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ECF49E5836E9754AAF942842CE1B960 /* MachineLearningKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DA90A10D3A108672F7D61F8A96C42650 /* Quick-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C3523CB10A94DA7970870A6190C1CB1C /* Quick-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DB039F39038342DE5258F386F694A9A0 /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6030DF38EBDBF336FFAE0120EEA4D959 /* SourceLocation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DB5066EBB8C95A3F8818628C9CA6794D /* CwlCatchException.m in Sources */ = {isa = PBXBuildFile; fileRef = 922D9654CE04819948A343CA3B1429F3 /* CwlCatchException.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DC9C69D7524AFEECCDC73D5CF1F4C028 /* HaveCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB5885E183C905F1B353BA590212F0 /* HaveCount.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DEF289C7BF4E97D42B06B1EB7CAE0951 /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F4D75F4A1D2B2E24633488475931A3 /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DFA04175FF8EB3DFFA5FFEEF93996E7C /* FFT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8696FA5715205A2FE823260539588590 /* FFT.swift */; }; - E1554E6ED22E94CAD97E211C7FBA530B /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD25694F61A3303C6994E49FD926F60C /* MatcherProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - E1DC6CA2B4B8D7E6F175D02BE729E637 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE766189385F7E575AD7202D0316AFFC /* UIKit.framework */; }; - E9CD7EF9DD6E75404E4264F6F0AC8D26 /* NMBExceptionCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CFC980E2966F69FA4D771EB69B2072A /* NMBExceptionCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EEACC5B78AFB71C8594380C005C17A4B /* XCTestObservationCenter+Register.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FE998DBDEEBCE33949AAA9F3296550 /* XCTestObservationCenter+Register.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F100D41C0564EE46CA47DA9E3540DA70 /* BeNil.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8255BF758512319BCEC8A9465100F12 /* BeNil.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F2ED0A18E020A07A092F957B2C7EF0E2 /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CEECA1264E2048F119396D446D14C91 /* mach_excServer.c */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F4BD351BF32EA4E81E2971E225914D1E /* Genome.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DAB4E6A2EB3A9C3629C2062F345461A /* Genome.swift */; }; - F5F8D1CB9DDF071F399D675E73649244 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */; }; - F6947DC02F61303F74AF8602F1A1BE68 /* NSBundle+CurrentTestBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F95C5A721744403DDF5D71E3B20A06 /* NSBundle+CurrentTestBundle.swift */; }; - F863E54F759068A89CD87B9121C7F6A0 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68FA4E20FBA69E54B8641FB7E2A67324 /* Configuration.swift */; }; - F96CD569B97BF947F19270C6C1D0FA23 /* ErrorUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0841731251EEDE7ACA21267B1A8A673F /* ErrorUtility.swift */; }; - FAACCCDBE0D2785212E37468636AAB0A /* AllPass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 424CEA9DC77FE5D725C9551F2ACAA8BA /* AllPass.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - FCB81A907C61E1883C282A0271C05D7E /* PointerUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCF0CD880E6B5A4F29D38A6CE05AAFA8 /* PointerUtilities.swift */; }; - FD9373DD3C1910FB513089F4CD39613B /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13CD84A26A08B3EC263D565FE02D7940 /* RaisesException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - FE877D0C3D6700F0C8E5CCC0C5020462 /* Quick-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 023DA655BA54CB7DEA97C57AD9725DDE /* Quick-dummy.m */; }; + 35C948170BDAB55532CB1F547389EA0C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */; }; + 3623C7E6A6B2657435DC80924EB8DE60 /* Quick-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = FBB274627F3CCD45711698273E0F3E15 /* Quick-dummy.m */; }; + 36803D11BA838FB1E1D131AA6F366EB7 /* NSString+C99ExtendedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2B7A69A92DA0BFAC01F38D57957048 /* NSString+C99ExtendedIdentifier.swift */; }; + 37B2802744DEADBC4FD37AF8E53EAE8C /* BeEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10276B77433F1E402AA83B42483AA81C /* BeEmpty.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 38987AF1005F71F197DE94320F9311A0 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F825E5C5C07AABCDF90FAD0630DA30B /* Extensions.swift */; }; + 3AD17A92405C1EF8A71E7B2A24C84170 /* MatchError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66977DC443BDBFD0C106D7A4F184AC01 /* MatchError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 3C12D78CF670FBEDBC28AA6ED303CBEA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 691B44A14B74DB67BCC78D5ED07E8881 /* Async.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 3C1C9BDF15626EB1AF76EDD10A87F2CA /* ExampleHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB876AD0511C8EA666EF8E4C0C08E306 /* ExampleHooks.swift */; }; + 3D166297C8E5CFF2F002B9CEC9D5C6F1 /* MLKit.h in Headers */ = {isa = PBXBuildFile; fileRef = DB4CCD4C09F2E233F7EA1F7876D2AF18 /* MLKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3D94A184EB5C93F8887954BFB12C0B /* MatrixArithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D5F1F566CEFFF34B2EDFA4761A30736 /* MatrixArithmetic.swift */; }; + 3D5F2F7E4A2DE9B43A8965BB56179E4A /* ValueArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3157754E17798B264F621373EBDE7CBB /* ValueArray.swift */; }; + 40A171EDCB95C2F32A957676476A25BC /* DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C49FC9DB8F6D1AD5CE50C0A47653B7 /* DSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 40CD85252642CD7C44BEFA855FF493D4 /* ExpectationMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8E2F9F631419C82139E99139B7128F1 /* ExpectationMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 413C30B3D21CDEA27D0B380A677F42F1 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704A1EAB5E5CD9661BD1D9CBC759BB6 /* Expression.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 442F136F23EFE21E3975E58EB88FEA2C /* BeLessThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 743433A01B8BAF2AB26BE6DB7BA78D04 /* BeLessThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 44B5C5D451E86F04D22C0E2132D0424D /* DSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FF09F25EDC45AF504AE7DB3E25153AC /* DSL.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 46C3577F6C8DB66064E956935F063CB7 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC8D67D5F51E353FFEB079CCBB4185AB /* DSL.swift */; }; + 4998726555D0E6AC12D7683597D6F3F0 /* QuadraticType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952F2775024622B4796405322A6794DB /* QuadraticType.swift */; }; + 4A829DC29EC5600B259E1CA203C7131D /* AssertionRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EB6C1B9DCCA2688998730FBBEED6A1E /* AssertionRecorder.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 4B3023C8B818F53F59316503EA79812C /* SatisfyAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16606F3887D1DCD0FEBD520F792DA300 /* SatisfyAllOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 4D0E207D7B0997A03091983024832904 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8EC6FB98BC9B9C5A27A8BF747A7F6C7E /* Configuration.swift */; }; + 502B570C39B2814E60BC55201BB02414 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5C08A8967C75927DD6642B47902110B /* XCTest.framework */; }; + 50B22FA5505CE61D56DD50D37BF90FC0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */; }; + 512C40F8402C23DFF6D7C8616B4A752B /* RidgeRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3A75F0368092983A16979F80FBADF25 /* RidgeRegression.swift */; }; + 51CE8C2AEBC657C98FFC03B61E97B412 /* Upsurge-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 37945938F521BFB59BCF46DD7A0BF594 /* Upsurge-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 51E8ED4E1C9624CEA91CE72E31A77352 /* Layer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99CBDFC2C80E00FA020DA53C005E838C /* Layer.swift */; }; + 53DCB7202178EC5C3E6727168073391F /* MatcherFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D4D8665E25B2D00E226E53BD267285 /* MatcherFunc.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 56C429A204D9FC3CA3E5B72C8E93EF9F /* ComplexArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD06D99DA5CD87A0BF51FB6056AD802 /* ComplexArray.swift */; }; + 5D25D8140BE47BEDA9E07C8BB641BB4F /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D615FAE0AA7C543BE7F92529CA1C1 /* Errors.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6021482B94C91267E84D163309B95763 /* QuickSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC4F5E4E39D1C3AF89CEC5B360EA2D /* QuickSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 608484BC82ED853B02509AFF26C1DAF7 /* SimpleLinearRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC4AC27D0E6B3366260B309A77BF1DEE /* SimpleLinearRegression.swift */; }; + 61554BF9F5D2997AD26BC61F4674CD68 /* Pods-MLKit_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E11A16A5E738A6972FCB39D12D520E9C /* Pods-MLKit_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 619CAC289E6EBE57D6AD4C6C4CA0CD17 /* BeCloseTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42C3D67146BDBA10CAC51CFD228F2FAB /* BeCloseTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6487761C38E6711E2C194CFDF3BF0447 /* Pods-MLKit_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 6183EF695DE254CDFF2B81C50B41F244 /* Pods-MLKit_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 695BC1AED063402F2284EB3F846EBEB8 /* CwlMachBadInstructionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7F2720A7CF251866B1B65971F0EA81 /* CwlMachBadInstructionHandler.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6A6894A8FD8E3A149E513F76A752EC91 /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 137AA47B11FCF8DFAD21FDBFDF07E50A /* Example.swift */; }; + 6A85BF50303C56690DD0B2B66CBADDA0 /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC029CDED30DA7B2ABF33E6954B7EB6D /* World.swift */; }; + 6BD5954D6D97255245EFDA13D419F5D9 /* MatrixSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24359C2419BC40E913F7E18F66162068 /* MatrixSlice.swift */; }; + 6C761ED9AC2B10745751A1D07ADBFB5A /* MachineLeanringErrorEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = F138797CE87D370358418C683E65A0C8 /* MachineLeanringErrorEnum.swift */; }; + 6D35850AE79F6BB1812DB02D1D2C4B95 /* CwlCatchException.m in Sources */ = {isa = PBXBuildFile; fileRef = 482052EDFA9575D28D64E9549C44197E /* CwlCatchException.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6F5BB0DEDCB97B6CA9BDC6E2BC894BCD /* LinearType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DABCC737B4BE064BB957352D867302 /* LinearType.swift */; }; + 7322E5D673689B017FCF72610299ECF0 /* ToSucceed.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC56E3DE936D1D3231E8D92095668DB8 /* ToSucceed.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 73913EBEE109B560765B9C354EE333DE /* QuickSpecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F1DAF6BB9F55D39AF40337558D846AE /* QuickSpecBase.h */; settings = {ATTRIBUTES = (Project, ); }; }; + 73EA7ECA35082C124EB45D82F12D027A /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B2080DE017858E1C4F1180D226ADE5 /* NimbleEnvironment.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 756A8D952F562DC0D1540F4E21EFEF56 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80DFF51CCA5EBBCE893D89BB5F3498AD /* MapKit.framework */; }; + 767D96C3DE8A33843E313EC5080E13C9 /* Real.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030A59ECDA8F7D3C591CE152B3BBBA87 /* Real.swift */; }; + 782667D2D5260BAEF7473BC258613D13 /* HaveCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DE08F4564DB849F36813C94F66821 /* HaveCount.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 7C01BD975A436D2AE25C109908B8E519 /* KMeans.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE78F76EE57AA3351A3BDC2DF75A472 /* KMeans.swift */; }; + 835ED63895528314B94936A1222496AE /* QCKDSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 035C2EED1791B7BE6BE9D42969BAB1C9 /* QCKDSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 854787B57491875DFF74CBA89571C9F6 /* URL+FileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B05419F27BE1D11F326BDE23BEBF0E7 /* URL+FileName.swift */; }; + 86BE1B34AD7742A81064C43766751FC4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */; }; + 88F07F135909FB51B8B6DC3E564F94C9 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2D683B1F99B9F712F2EE56447823F6E /* Sequence.swift */; }; + 8995A017033F9847A868FA9B081471B7 /* QuickConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0994970A2155ACFCCAF3F3AF8BE2E5CC /* QuickConfiguration.m */; }; + 8A5B774CBE0C649BD8AE0C6EBD802777 /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 788D53525A0B21F8BC8F27DDA78143E6 /* DataManager.swift */; }; + 8B4A8B4617BE1D9580BC7653ED4E3CCF /* Arithmetic.swift in Sources */ = {isa = PBXBuildFile; fileRef = D083DBFCD198E8DF228467AF0BB09175 /* Arithmetic.swift */; }; + 8BE24F68EE0482CBCA709E049318823A /* Quick-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F737BB93131E723165509AE01FA5729 /* Quick-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8E3B0618CF9A19EE391875415CDD1E2E /* QCKDSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 16E6DC1E5FD69A192A194383B26C8EC3 /* QCKDSL.m */; }; + 8F3D92A40D06F36E61FD7ED6FBEE69BC /* SuiteHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF4EB4F151410D97C620DA409F22EFC /* SuiteHooks.swift */; }; + 90BA044032941979487072C733619240 /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C03EEF29C5CE0126A004280345CEB5 /* BeIdenticalTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9108613C28FC0D1A7948C6B4FE64932F /* Nimble-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = EC1ED54D7A581E3899A873412515A27A /* Nimble-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 924746047825777BE99D81F35E875981 /* Trigonometric.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B251496F77D014ADC2729BF32DC0756 /* Trigonometric.swift */; }; + 94299DD46562D02D0529FC16C10C39AF /* CSVReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 903B1867081A10809FA5BF96301EAC0E /* CSVReader.swift */; }; + 97E3A1B8E5B7EF1D2399B486FE63BCAB /* ContainElementSatisfying.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFC79DCAC3566B7A977FA02418445C5A /* ContainElementSatisfying.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9839BAE4DF6D8962D2BBE8E2DFDD1F08 /* Complex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEA96C7D58C6932E550A8F5F49CDF2 /* Complex.swift */; }; + 9C3FBF83F72E03F08F977DFA1218B5F9 /* ThrowAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 556B768D5C717E2EFDBF20FC039624F5 /* ThrowAssertion.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9CFDD01A2D0AA56E4A6C72B232021B71 /* Pods-MLKit_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DF85C3F736F31B6E3DB7DFC71BD097C4 /* Pods-MLKit_Tests-dummy.m */; }; + 9D2DB6D873E1BCB6FE2200D4328F675A /* Matrix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B26AC147A0657266508051439D0675F /* Matrix.swift */; }; + 9F05AD64FA1B9ED2EDD6C485C5E6D296 /* QuickSelectedTestSuiteBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9FE4D96E9551D946E8D2BB7312C0EBD /* QuickSelectedTestSuiteBuilder.swift */; }; + A03E49A483BD40BD3A8B943A8A963764 /* FailureMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47E4190D74012C482B496182A661F4C4 /* FailureMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A0A56298A62CC7D47428EAADCB13E913 /* QuickSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D375478530E99780737CD66CD8DD93 /* QuickSpec.m */; }; + A3F6738E2A7AC46F9C8F091372EB9331 /* CwlDarwinDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE1009D96FFAEDC002FCE0D35C778CC /* CwlDarwinDefinitions.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A5A9F8A2E529DDE72AC3A69E1649B607 /* NeuralNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45944744A832416BF5020527CAD33A70 /* NeuralNetwork.swift */; }; + A5FC691080848921A6D86C349E32AFB3 /* MachineLearningKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9868FD249081AA56BD34C6162A6E0FB3 /* MachineLearningKit-dummy.m */; }; + A8F7AF423D60D84B30D46CA84A88819D /* DSL+Wait.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED75267527D223ED50D65EC87059D48 /* DSL+Wait.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + AC0DC051DDF5D34B02E9A4938226F8FC /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337B8D2516336668DC0F954A21611095 /* PostNotification.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + AE0F790B7BC316B1D8AE83B58753E213 /* Behavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = F127827C31D06829D019510F822834F7 /* Behavior.swift */; }; + AF504059860A2519D681686DC8C56D5A /* QuickTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7849017A446FAAC1AA464BF30B3DB9A9 /* QuickTestSuite.swift */; }; + B034B1EA1C94BBDFFA3564E010A56A04 /* Quick.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D83F506716B92E26EDB9E77BE6F7159 /* Quick.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B0A24F0E24E02201A246F0D58523ED7E /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = C3CA0DD982FBC2D3667E3DDA63B24456 /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B0C88072D75620D68F7C690CF2CD2D92 /* CwlMachBadInstructionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F0DA4837482BDAF49EE0CFC14E653077 /* CwlMachBadInstructionHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B0CE1B8655743386970201D46EA88589 /* Equal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 901B5CAA4EB5DC150DF830F34762A545 /* Equal.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B15E411FFF3E2AD78A5B5D6094B48AE3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */; }; + B3091203BBEFA70B87EAC5CCFB28E32C /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 52F937831EEA31D8B58ACEA667057BEE /* XCTestSuite+QuickTestSuiteBuilder.m */; }; + B4984DA0EF9EFB51A61EB447F969389D /* XCTestObservationCenter+Register.m in Sources */ = {isa = PBXBuildFile; fileRef = 147E17B49D366E81D21A0B73472E5A23 /* XCTestObservationCenter+Register.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B51FCB764739D557C3BB3FDBE8107D39 /* AdapterProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B8FD5147603F141BD056C0756090B6F /* AdapterProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B76E5CB09EC007EED55BB57E320692AE /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C545BAF94B4B6AAF8AE48FFFFE1F791 /* Value.swift */; }; + B88F9184DF2ECC40C8EE0C63EDDCA197 /* Exponential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E19E5E330F0B730F5C71B8F67C235DA /* Exponential.swift */; }; + B992D07E451C740A64C11452ADAC34C8 /* Population.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BC2DB3712E23D9A69F1AACCD762C0 /* Population.swift */; }; + BA65AB10ECCDF1B685D0BBDE49FF255F /* Auxiliary.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC04D0B55B2DF98E82BDFDBDAA249C23 /* Auxiliary.swift */; }; + BAABCE6AB9AC7ABC3C9A7CDF8A6FF8A7 /* BeLogical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3C80A7C25D576D1F551F878DBA6AF8C /* BeLogical.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + BAAD4E7A01DD015FCB6E2AE29462D2EE /* NMBStringify.m in Sources */ = {isa = PBXBuildFile; fileRef = E136F98E96561490178FBCFC9686F5E0 /* NMBStringify.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + BB11FBD2359EF261F71F076ED124D8B1 /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B713FD278927D49885E1904255F064 /* Closures.swift */; }; + BB1F8C46AB981EA52FA280F8E2B8E4AB /* InputDataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041AFB8E22C5AAD543EDA1F96A9BCBAB /* InputDataType.swift */; }; + BB85CDB5A7F9D7C9733ED9A3AFDBDEA2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C54F7F18FAF0353E348C4DD3B716DB00 /* UIKit.framework */; }; + BDA66F64BCBE78B25D470F3184B50532 /* NMBObjCMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0AFF316A4EDB73779600E89CF19632 /* NMBObjCMatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + C09CE51A451E72D653FD4923A86EB852 /* LinearOperators.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2912F84DAE219F366CB90C00C6248FA6 /* LinearOperators.swift */; }; + C7155137CD896EFAD562C90E1A461EE2 /* ValueArraySlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = D44A37484B179283B009A5229D427246 /* ValueArraySlice.swift */; }; + C83188A450E13A233EF77D94306E926D /* Pods-MLKit_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 26B0E28532E762E9902A82E87EC50B64 /* Pods-MLKit_Example-dummy.m */; }; + CA5821BE1C1F8E0CBC0D1330410FC7C0 /* Hyperbolic.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8A0A7BD8FBCF34C54C12F615A32D045 /* Hyperbolic.swift */; }; + CC7D11A33BD4AC9581D2C01C28B26C1D /* NimbleXCTestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF8ADAE9FEE03A3463D9A4A6E72AB360 /* NimbleXCTestHandler.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + CD780F20B5B520C03C95726C6E23A4A1 /* NMBExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 489ECA679D24E54A6CC7B87EACD3D221 /* NMBExpectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + CE0B2DB399E32E476CCC40B18DF1BD3E /* HooksPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CCBBC9C55535D0AC68C2CA15578DA91 /* HooksPhase.swift */; }; + D000AB338C568FBCCDFAF753350E1E6D /* ComplexArrayRealSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 144B5707254D157A52910519D2F17C8D /* ComplexArrayRealSlice.swift */; }; + D03B3661A806DB01D904EC24E59B7E2E /* NMBExceptionCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 46BA399BDE1B6DE7B14C30EF6055327D /* NMBExceptionCapture.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D0FF7942A83B866A85C4EEA65BE2A8BC /* QuickSpecBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 1142E838EF9E0ECBE2816DC30D200AF0 /* QuickSpecBase.m */; }; + D3F727B55FB86EA9C679DEC4ABF8C136 /* PolynomialRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = F107EA658C6B53E0B84DD2A10C8FCFE8 /* PolynomialRegression.swift */; }; + D4854F8569321A500968B34987FFFB30 /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3463C2B70E2BDD90E3CE7FCAC5292630 /* Match.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D4B3F9CB9B4FF5379324C4D94DE2B189 /* LassoRegression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9832ABE1993F30F8D46161D2D60B7F /* LassoRegression.swift */; }; + D60BCC22E506E252B7F4C6E9675D7B57 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DC137D322A128441EBF52B5FFE5BE58 /* Filter.swift */; }; + D61297130E9E49830B044AA557E4A06F /* ExampleGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A9880E45E7F3B3785B9FBFF52CEAA60 /* ExampleGroup.swift */; }; + D69CEF312A13F98B8E5746A02F5A59AB /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 395A5303D2C1ED53000412E2C3DCF92D /* MatcherProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D7540984B876954995215DBAFF52EF9B /* TensorSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E148306C6BA950FCA137CD27AEB033 /* TensorSlice.swift */; }; + D99EEA3143EABF137D39E3A97FFD84DE /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E9ECD30E2954373F475721AA57A24C /* BeGreaterThanOrEqualTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DA2554FF0F87BDD44B56650B7C483B50 /* World+DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD7F1CBDC973E32E006EB9A8DCF2B225 /* World+DSL.swift */; }; + DCCC78645AB51BCBDC92B41E7178C5DA /* Genome.swift in Sources */ = {isa = PBXBuildFile; fileRef = 149C087BF5CF9736F9C47759977B4DCD /* Genome.swift */; }; + DE1AF2FCB9BD497D0A0D866D8895AC3A /* BiologicalProcessManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83BCF2F8D63C19C2434BD6853C915D86 /* BiologicalProcessManager.swift */; }; + DE4C1C79903A92287FD102F1E28C3A49 /* TensorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D75FB88DD2222A56D717AAF228FFE78 /* TensorType.swift */; }; + E638C6BA5AF87A5D632C0EF4EC935EDF /* DSP.swift in Sources */ = {isa = PBXBuildFile; fileRef = D18C3D56C8E6AC4C4D8AF2D71F127EC2 /* DSP.swift */; }; + E679DCFB9825A7B5B92CF584273D20F7 /* ErrorUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C0B466BB0421312D8078CED0B71E6BE /* ErrorUtility.swift */; }; + E693ED027F354D0C0B26BA260073C5D1 /* QuickConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 038A760F895431B48CEA5B48437243EA /* QuickConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E6B23012319D7A5969C414F36A2B5DEE /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 866F20B5ADA342A20100B077B4CC0F22 /* mach_excServer.c */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E72A47B4B76741BE1090EED5A84F5A08 /* Upsurge-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = C4DD537815AD750380E3798229FAB811 /* Upsurge-dummy.m */; }; + ED70B4997FC9EEA54B89CBFF3DCC27A9 /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 335991C55FC2A3EEDDFE264BA0C64169 /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EDC4B37063B934740542A03374BE3DC7 /* CwlBadInstructionException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96945A916008CD4B69F1E34AD69B7922 /* CwlBadInstructionException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F02C4FA6C6F8D9B7C8FECB076DCEC9EE /* BeVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = C008229A23584B84BE1AE6061F6FBA63 /* BeVoid.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F376FB1DBE7FB046CDA7388B7035FBB5 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = A521626B7302B082F1B39A00AA2C3A0C /* DSL.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F401580BB3F94199850EE085919D337B /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBE1188D696473745440C84BF05C42B7 /* Accelerate.framework */; }; + F5F7F03D04479B0EE47D69DF65EA53B6 /* BeginWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88ACC22A83253002DF3E9F48F72ECD0 /* BeginWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F6FD9357A3EF5F6736CC2AFA82520534 /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 521B35F4C031ABE1E2E2EF830840542B /* SourceLocation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F714F0DD6B5353FBF76FA23B94519C4E /* MachineLearningKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B79A4758A80BCE9213C86BEFA1D243 /* MachineLearningKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F7AC37D64DE8E79CC8275835892F4490 /* CwlCatchException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B273D8C6E67454E52F2780AE08AFD37 /* CwlCatchException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F82D4E195C2879A141A4DA12CB912078 /* Expectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CFC567F8A1B22F61DC542426B15B60 /* Expectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F878F23B6132166302F83F543699B457 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */; }; + F969AEB2E68708B5A0B901C7EA6BBD93 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1EC271834216A505262D80AF2EF61DE /* Functional.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + FAE9DB89C9544E5C56345A371A49F7FD /* ThrowError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FADB247880A1DED3E6643AEE0F9D3216 /* ThrowError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + FD175D10EE7DBD2C7A83BF8BD9125329 /* Callsite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DAFCD1EAB3A11FCBE8181968A1EF4DC /* Callsite.swift */; }; + FDADDA2F644E74CFFBC21DAE8B34D209 /* ComplexArraySlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21FC20B789CA93B273E0BC1AA0AB7F7C /* ComplexArraySlice.swift */; }; + FF62BEF08E929321B76037A261B9D23C /* Nimble-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D926C598D07A72EACCD54FF65A67092A /* Nimble-dummy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -182,26 +186,33 @@ remoteGlobalIDString = 6C57B4D688C9D6216427DD10ADDFFCB6; remoteInfo = Upsurge; }; - 6261E54E70518E4B80DE3D3A4B3823C4 /* PBXContainerItemProxy */ = { + 197D4E6B5F102611AC7352D8583E7BA3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 0921CC2F4398BE9A4F1CEACB30684B56; + remoteGlobalIDString = 0C900B9C11E235F9DF95A64E8C83D049; + remoteInfo = Quick; + }; + 61B7CC3502E6878E7FB482C64CEF9454 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + proxyType = 1; + remoteGlobalIDString = BA85E3619866E2EAA8CC3EDE21C659FC; remoteInfo = Nimble; }; - 9438A9C923DBE3D0619348D344A7421F /* PBXContainerItemProxy */ = { + 80173E14C71EB3A528D671C26839B22F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 28C1C0C2E20677EBC9884E8E60383F6C; - remoteInfo = MachineLearningKit; + remoteGlobalIDString = 11214F2158317CCF8497B1AFC05251A3; + remoteInfo = "Pods-MLKit_Example"; }; - A5D12A1484F74731661DDE4440445475 /* PBXContainerItemProxy */ = { + 9438A9C923DBE3D0619348D344A7421F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 405857F01F82B80417D1BCAA762E7FA5; - remoteInfo = Quick; + remoteGlobalIDString = 28C1C0C2E20677EBC9884E8E60383F6C; + remoteInfo = MachineLearningKit; }; C595E3A155D1433C52691795FEC29880 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -213,205 +224,212 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 012916E1116F4F544559C4FFCDD0D170 /* Auxiliary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Auxiliary.swift; path = Source/Operations/Auxiliary.swift; sourceTree = ""; }; - 023DA655BA54CB7DEA97C57AD9725DDE /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; - 02862E2FB988A3D26C860CD548A14BEB /* QuickSpec.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpec.h; path = Sources/QuickObjectiveC/QuickSpec.h; sourceTree = ""; }; - 05BA3CAD29488F2C5317D831BB6931BF /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; - 077C0519A2057F471035D14A7027344E /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; - 07FB5885E183C905F1B353BA590212F0 /* HaveCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HaveCount.swift; path = Sources/Nimble/Matchers/HaveCount.swift; sourceTree = ""; }; - 0841731251EEDE7ACA21267B1A8A673F /* ErrorUtility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ErrorUtility.swift; path = Sources/Quick/ErrorUtility.swift; sourceTree = ""; }; - 0874FE88223748474F9540CC3A7B2CDD /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; - 08D39735D7DBDB3A52B19BB1A1BEAD08 /* Pods-MLKit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-MLKit_Example.modulemap"; sourceTree = ""; }; - 0912AB47C2FD8B724C2FF78EB04DA146 /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Nimble/DSL.swift; sourceTree = ""; }; - 09DB8A700464608EEC997EB8F70F5A97 /* RidgeRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RidgeRegression.swift; sourceTree = ""; }; - 0AB6F2F34E76936E5DCD781D737E8D0E /* Tensor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tensor.swift; path = Source/ND/Tensor.swift; sourceTree = ""; }; - 0C3B0FE4A67C53BAE82ACF00A907244A /* LinearOperators.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LinearOperators.swift; path = Source/1D/LinearOperators.swift; sourceTree = ""; }; - 0D765DA753FAB21A06C81689DCF49863 /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; - 0EB98267420E501E4F7B0573E2C5F96F /* QuickConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickConfiguration.m; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.m; sourceTree = ""; }; - 0FB8099238DE7DDCFE3FE4C07E86CF1E /* ExampleHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleHooks.swift; path = Sources/Quick/Hooks/ExampleHooks.swift; sourceTree = ""; }; - 1210BE3C711459C58AE9F743F7B82931 /* ComplexArrayRealSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArrayRealSlice.swift; path = Source/Complex/ComplexArrayRealSlice.swift; sourceTree = ""; }; - 124FF2A96FE15393763BC63572EEC184 /* Nimble.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Nimble.h; path = Sources/Nimble/Nimble.h; sourceTree = ""; }; - 13CD84A26A08B3EC263D565FE02D7940 /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; - 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 162303716510B6A1AC25BFD0F74F2544 /* Nimble-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-umbrella.h"; sourceTree = ""; }; - 16D03C36A6892F0A0BA80E3B43181599 /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; - 19D06F6EACA4C3A8FB660F983B8C2500 /* ValueArraySlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ValueArraySlice.swift; path = Source/1D/ValueArraySlice.swift; sourceTree = ""; }; - 1C9E249A32DD13B27BA05B3CDE01B22E /* TensorType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TensorType.swift; path = Source/ND/TensorType.swift; sourceTree = ""; }; + 0072087E9838D243ABAAAB182449A157 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 030A59ECDA8F7D3C591CE152B3BBBA87 /* Real.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Real.swift; path = Sources/Upsurge/Real.swift; sourceTree = ""; }; + 035C2EED1791B7BE6BE9D42969BAB1C9 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; + 0365A681452A1DA13C0E39C5DC0675EB /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 038A760F895431B48CEA5B48437243EA /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; + 041AFB8E22C5AAD543EDA1F96A9BCBAB /* InputDataType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = InputDataType.swift; sourceTree = ""; }; + 04B8E32AD23B2D12CA57341D936CAB3A /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; + 07E148306C6BA950FCA137CD27AEB033 /* TensorSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TensorSlice.swift; path = Sources/Upsurge/TensorSlice.swift; sourceTree = ""; }; + 0994970A2155ACFCCAF3F3AF8BE2E5CC /* QuickConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickConfiguration.m; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.m; sourceTree = ""; }; + 0B05419F27BE1D11F326BDE23BEBF0E7 /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; + 10276B77433F1E402AA83B42483AA81C /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; + 103DE453E6596254E367B645D93B900C /* Pods-MLKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Tests.debug.xcconfig"; sourceTree = ""; }; + 1142E838EF9E0ECBE2816DC30D200AF0 /* QuickSpecBase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpecBase.m; path = Sources/QuickSpecBase/QuickSpecBase.m; sourceTree = ""; }; + 12D4D8665E25B2D00E226E53BD267285 /* MatcherFunc.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherFunc.swift; path = Sources/Nimble/Matchers/MatcherFunc.swift; sourceTree = ""; }; + 137AA47B11FCF8DFAD21FDBFDF07E50A /* Example.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Example.swift; path = Sources/Quick/Example.swift; sourceTree = ""; }; + 144B5707254D157A52910519D2F17C8D /* ComplexArrayRealSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArrayRealSlice.swift; path = Sources/Upsurge/ComplexArrayRealSlice.swift; sourceTree = ""; }; + 147E17B49D366E81D21A0B73472E5A23 /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestObservationCenter+Register.m"; path = "Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m"; sourceTree = ""; }; + 149C087BF5CF9736F9C47759977B4DCD /* Genome.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Genome.swift; sourceTree = ""; }; + 16606F3887D1DCD0FEBD520F792DA300 /* SatisfyAllOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAllOf.swift; path = Sources/Nimble/Matchers/SatisfyAllOf.swift; sourceTree = ""; }; + 169BC2DB3712E23D9A69F1AACCD762C0 /* Population.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Population.swift; sourceTree = ""; }; + 16E6DC1E5FD69A192A194383B26C8EC3 /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; + 197CCEAC9008FEF55260A0F2FF0C7B32 /* Span.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Span.swift; path = Sources/Upsurge/Span.swift; sourceTree = ""; }; 1CA1E0D7EDD11FD11C55B7AC425EA02C /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Quick.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1CFC980E2966F69FA4D771EB69B2072A /* NMBExceptionCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBExceptionCapture.h; path = Sources/NimbleObjectiveC/NMBExceptionCapture.h; sourceTree = ""; }; - 1DAB4E6A2EB3A9C3629C2062F345461A /* Genome.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Genome.swift; sourceTree = ""; }; - 2002FFD090C435360F60A33E88C41DBB /* Pods-MLKit_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MLKit_Tests-acknowledgements.markdown"; sourceTree = ""; }; - 20BF642EFEB79518E353D7F8F3D860F1 /* mach_excServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mach_excServer.h; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h; sourceTree = ""; }; - 224B74EEB01665D46840260470EA4991 /* BiologicalProcessManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BiologicalProcessManager.swift; sourceTree = ""; }; - 227DDFCD5D9F3918AB624B74E886C8A5 /* BeLogical.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLogical.swift; path = Sources/Nimble/Matchers/BeLogical.swift; sourceTree = ""; }; - 24D478FE2127475CABEE5C5AE5B9772D /* Hyperbolic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Hyperbolic.swift; path = Source/Operations/Hyperbolic.swift; sourceTree = ""; }; - 256AA66B0C109C259E2D0DDA42B32EDB /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Utils/Async.swift; sourceTree = ""; }; - 26788572C6F366401AFEC63C14A45513 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; - 27B970E9789C66FDD4D00112E12E321A /* BeVoid.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeVoid.swift; path = Sources/Nimble/Matchers/BeVoid.swift; sourceTree = ""; }; + 1D83F506716B92E26EDB9E77BE6F7159 /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; + 1F1DAF6BB9F55D39AF40337558D846AE /* QuickSpecBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpecBase.h; path = Sources/QuickSpecBase/include/QuickSpecBase.h; sourceTree = ""; }; + 2166FFC06EE0F270A009284D29A4995A /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 21FC20B789CA93B273E0BC1AA0AB7F7C /* ComplexArraySlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArraySlice.swift; path = Sources/Upsurge/ComplexArraySlice.swift; sourceTree = ""; }; + 24359C2419BC40E913F7E18F66162068 /* MatrixSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatrixSlice.swift; path = Sources/Upsurge/MatrixSlice.swift; sourceTree = ""; }; + 24B713FD278927D49885E1904255F064 /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; + 26B0E28532E762E9902A82E87EC50B64 /* Pods-MLKit_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MLKit_Example-dummy.m"; sourceTree = ""; }; + 26B79A4758A80BCE9213C86BEFA1D243 /* MachineLearningKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MachineLearningKit-umbrella.h"; sourceTree = ""; }; 289B26827495B1EA15C10A9AFE473C7A /* Upsurge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Upsurge.framework; path = Upsurge.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2912F84DAE219F366CB90C00C6248FA6 /* LinearOperators.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LinearOperators.swift; path = Sources/Upsurge/LinearOperators.swift; sourceTree = ""; }; 29E88E2BB63028C27C1E53746F101DF7 /* Upsurge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Upsurge.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2C176355D2DA1EB17207AE84594804D6 /* Pods-MLKit_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Tests-resources.sh"; sourceTree = ""; }; - 2D3E3057A07EA15E4008F933E8752DD2 /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; - 2D60404BA78CC7BF6C1144F008DDDDBC /* MachineLearningKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MachineLearningKit-dummy.m"; sourceTree = ""; }; - 32AA223B57196F7790D905F38D2517BF /* Pods-MLKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Tests.debug.xcconfig"; sourceTree = ""; }; - 33447FAB1F2844FCF376B75EB97C4666 /* SimpleLinearRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SimpleLinearRegression.swift; sourceTree = ""; }; - 383A4DC8ACFD6B49ECF2DFE23764A2D3 /* DSP.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSP.swift; path = Source/DSP/DSP.swift; sourceTree = ""; }; - 38FE998DBDEEBCE33949AAA9F3296550 /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestObservationCenter+Register.m"; path = "Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m"; sourceTree = ""; }; - 3949269DDD43CCFF544917979779224B /* CwlCatchBadInstruction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchBadInstruction.h; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.h; sourceTree = ""; }; - 3A0C56CEE8C3AD43FF8AE40F6AFFF4C7 /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; - 3A2A011722B21DE42A32C785BC89EA01 /* MatrixArithmetic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatrixArithmetic.swift; path = Source/2D/MatrixArithmetic.swift; sourceTree = ""; }; - 3A46C9CABC6D7C94BE0864668B74F949 /* World+DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "World+DSL.swift"; path = "Sources/Quick/DSL/World+DSL.swift"; sourceTree = ""; }; - 3AE3D8AECCC1ACCEA8F2C3B88B7A5070 /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; - 3AFFFEB5837A94482C2215EB9EFEEEDD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3C9A0B54C6BC094E3CD3A2A61EDA9D85 /* MatchError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatchError.swift; path = Sources/Nimble/Matchers/MatchError.swift; sourceTree = ""; }; - 3D34DA76C844CF16C054BA1344541C74 /* Pods-MLKit_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Example-resources.sh"; sourceTree = ""; }; - 3D5025AF8F620B99C3283F0975D09FE3 /* Pods-MLKit_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MLKit_Example-dummy.m"; sourceTree = ""; }; - 3EB4893036DEB2A1EB8B6111A120F5A2 /* BeAnInstanceOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAnInstanceOf.swift; path = Sources/Nimble/Matchers/BeAnInstanceOf.swift; sourceTree = ""; }; - 40FFCF7710FDE9792C5747C276F2DF4F /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; - 424CEA9DC77FE5D725C9551F2ACAA8BA /* AllPass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllPass.swift; path = Sources/Nimble/Matchers/AllPass.swift; sourceTree = ""; }; - 436FD53B1F1C37D3650BE5FE2C882A5E /* LassoRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LassoRegression.swift; sourceTree = ""; }; - 440AC79C4CAC00E64494654CCFEB3615 /* Pods-MLKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Tests.release.xcconfig"; sourceTree = ""; }; - 445AD67BD05424A184443D2B95D450E1 /* Expression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expression.swift; path = Sources/Nimble/Expression.swift; sourceTree = ""; }; - 460AA53800E69CBD26BBD78537857F1E /* NMBObjCMatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBObjCMatcher.swift; path = Sources/Nimble/Adapters/NMBObjCMatcher.swift; sourceTree = ""; }; - 46306D0BBA1452AFEA95521C31EF74FD /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; - 477B34BD1FFA8820D6EF220B0BC0118F /* DataManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = ""; }; - 494C0F635D5836E872EF3C5A39E97D40 /* QuadraticType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuadraticType.swift; path = Source/2D/QuadraticType.swift; sourceTree = ""; }; - 4A6452D2CC7C17DD01ECD91742AF746F /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Quick/DSL/DSL.swift; sourceTree = ""; }; - 4A7F3D729C82E75AB35940B80EDE5960 /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; - 4C397B78C2E0CE51B2767D2AF1CD9817 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; }; - 4F8B6CE41AAC2E1823ECFFB4021CC6E2 /* NeuralNetwork.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NeuralNetwork.swift; sourceTree = ""; }; - 50F4D75F4A1D2B2E24633488475931A3 /* CwlCatchException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchException.h; path = Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.h; sourceTree = ""; }; - 538A45E8224CD67C4262A9B8B8F1F37D /* NMBStringify.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBStringify.m; path = Sources/NimbleObjectiveC/NMBStringify.m; sourceTree = ""; }; - 5480FBA1F6D203291F193F6D19878DBA /* Upsurge-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Upsurge-umbrella.h"; sourceTree = ""; }; - 55F8E5E39CFFED8C8B0162606918FB20 /* MachineLearningKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MachineLearningKit.xcconfig; sourceTree = ""; }; - 564EE9F32DE4725529A52326B19EA90F /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; - 56C0D020BB9A8FA4BD0F26AC76A2E14A /* DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DSL.m; path = Sources/NimbleObjectiveC/DSL.m; sourceTree = ""; }; + 2D7DE08F4564DB849F36813C94F66821 /* HaveCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HaveCount.swift; path = Sources/Nimble/Matchers/HaveCount.swift; sourceTree = ""; }; + 2E5093D5F993BB458C93C325732AC182 /* PointerUtilities.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PointerUtilities.swift; path = Sources/Upsurge/PointerUtilities.swift; sourceTree = ""; }; + 30C1619989EFFEFB685F646D70830431 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 30CFC567F8A1B22F61DC542426B15B60 /* Expectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expectation.swift; path = Sources/Nimble/Expectation.swift; sourceTree = ""; }; + 3157754E17798B264F621373EBDE7CBB /* ValueArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ValueArray.swift; path = Sources/Upsurge/ValueArray.swift; sourceTree = ""; }; + 335991C55FC2A3EEDDFE264BA0C64169 /* 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 = ""; }; + 337B8D2516336668DC0F954A21611095 /* PostNotification.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PostNotification.swift; path = Sources/Nimble/Matchers/PostNotification.swift; sourceTree = ""; }; + 3463C2B70E2BDD90E3CE7FCAC5292630 /* Match.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Match.swift; path = Sources/Nimble/Matchers/Match.swift; sourceTree = ""; }; + 34AC4F5E4E39D1C3AF89CEC5B360EA2D /* QuickSpec.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpec.h; path = Sources/QuickObjectiveC/QuickSpec.h; sourceTree = ""; }; + 37945938F521BFB59BCF46DD7A0BF594 /* Upsurge-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Upsurge-umbrella.h"; sourceTree = ""; }; + 38E6B7D825EED250A8A2E507119F4709 /* AllPass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllPass.swift; path = Sources/Nimble/Matchers/AllPass.swift; sourceTree = ""; }; + 395A5303D2C1ED53000412E2C3DCF92D /* MatcherProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherProtocols.swift; path = Sources/Nimble/Matchers/MatcherProtocols.swift; sourceTree = ""; }; + 3A9832ABE1993F30F8D46161D2D60B7F /* LassoRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LassoRegression.swift; sourceTree = ""; }; + 3CCBBC9C55535D0AC68C2CA15578DA91 /* HooksPhase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HooksPhase.swift; path = Sources/Quick/Hooks/HooksPhase.swift; sourceTree = ""; }; + 3D75FB88DD2222A56D717AAF228FFE78 /* TensorType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TensorType.swift; path = Sources/Upsurge/TensorType.swift; sourceTree = ""; }; + 3DAFCD1EAB3A11FCBE8181968A1EF4DC /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; + 42C3D67146BDBA10CAC51CFD228F2FAB /* BeCloseTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeCloseTo.swift; path = Sources/Nimble/Matchers/BeCloseTo.swift; sourceTree = ""; }; + 45944744A832416BF5020527CAD33A70 /* NeuralNetwork.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NeuralNetwork.swift; sourceTree = ""; }; + 46BA399BDE1B6DE7B14C30EF6055327D /* NMBExceptionCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBExceptionCapture.m; path = Sources/NimbleObjectiveC/NMBExceptionCapture.m; sourceTree = ""; }; + 47E4190D74012C482B496182A661F4C4 /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; + 482052EDFA9575D28D64E9549C44197E /* CwlCatchException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchException.m; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m; sourceTree = ""; }; + 489ECA679D24E54A6CC7B87EACD3D221 /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; + 4B251496F77D014ADC2729BF32DC0756 /* Trigonometric.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Trigonometric.swift; path = Sources/Upsurge/Trigonometric.swift; sourceTree = ""; }; + 4BF613065B011698DDBE313953239BF2 /* ComplexArithmetic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArithmetic.swift; path = Sources/Upsurge/ComplexArithmetic.swift; sourceTree = ""; }; + 4C9D615FAE0AA7C543BE7F92529CA1C1 /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Sources/Nimble/Utils/Errors.swift; sourceTree = ""; }; + 4F825E5C5C07AABCDF90FAD0630DA30B /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; }; + 508C55FD4AE738ACC7274ADDBEB2028E /* Upsurge.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Upsurge.modulemap; sourceTree = ""; }; + 50C03EEF29C5CE0126A004280345CEB5 /* BeIdenticalTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeIdenticalTo.swift; path = Sources/Nimble/Matchers/BeIdenticalTo.swift; sourceTree = ""; }; + 521B35F4C031ABE1E2E2EF830840542B /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; + 52F937831EEA31D8B58ACEA667057BEE /* XCTestSuite+QuickTestSuiteBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestSuite+QuickTestSuiteBuilder.m"; path = "Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m"; sourceTree = ""; }; + 556B768D5C717E2EFDBF20FC039624F5 /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; 57189BBB8E0A886933E15F0E294E2908 /* Pods_MLKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MLKit_Tests.framework; path = "Pods-MLKit_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5CEECA1264E2048F119396D446D14C91 /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mach_excServer.c; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.c; sourceTree = ""; }; - 5ECF49E5836E9754AAF942842CE1B960 /* MachineLearningKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MachineLearningKit-umbrella.h"; sourceTree = ""; }; - 6030DF38EBDBF336FFAE0120EEA4D959 /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; - 60979E4BD68DB0DE4501D0BCC7234D91 /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; - 617F2E0CEEF4C400A8D6EADD86F6145C /* Quick.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Quick.xcconfig; sourceTree = ""; }; - 632231BFC26E16C229D32687B917D3A0 /* Trigonometric.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Trigonometric.swift; path = Source/Operations/Trigonometric.swift; sourceTree = ""; }; - 636673BDA1F06E469643F565D84270B5 /* Pods-MLKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Example.debug.xcconfig"; sourceTree = ""; }; - 64BEBE3A1D4FF0196925EEA64015469B /* World.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = World.h; path = Sources/QuickObjectiveC/World.h; sourceTree = ""; }; - 674822B4E356741B78B38B007C88BB9C /* MatrixSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatrixSlice.swift; path = Source/2D/MatrixSlice.swift; sourceTree = ""; }; - 67BD782939C66E9C3619A77243519BF6 /* QuickSpec.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpec.m; path = Sources/QuickObjectiveC/QuickSpec.m; sourceTree = ""; }; - 68FA4E20FBA69E54B8641FB7E2A67324 /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = Sources/Quick/Configuration/Configuration.swift; sourceTree = ""; }; - 692BA097D08B9592A8A24370C50D81D0 /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; - 6E5F3C7C7DEC67A40AB30E806AC7D1E2 /* Pods-MLKit_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MLKit_Example-acknowledgements.markdown"; sourceTree = ""; }; - 6F7958F9886E618114345F800A8E55FF /* DSL+Wait.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DSL+Wait.swift"; path = "Sources/Nimble/DSL+Wait.swift"; sourceTree = ""; }; - 711A9AC0701A2E08E65DD82429B871BA /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; - 7264F4D0435F000E2684EB1DAACEBDD1 /* CSVReader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CSVReader.swift; sourceTree = ""; }; - 761E70C09096AF7E9F07C0940571D8E8 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - 76A2C52BB2BC141539B6A02006AE6422 /* Value.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Value.swift; path = Source/Types/Value.swift; sourceTree = ""; }; - 7738AD08C39FE55EBEED43F72217AD23 /* AdapterProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AdapterProtocols.swift; path = Sources/Nimble/Adapters/AdapterProtocols.swift; sourceTree = ""; }; - 79862A111E88CCA41E254825B0A2B523 /* NSString+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSString+C99ExtendedIdentifier.swift"; path = "Sources/Quick/NSString+C99ExtendedIdentifier.swift"; sourceTree = ""; }; - 7A45BA6EC001C35D2D0B9BFE6072BD59 /* Population.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Population.swift; sourceTree = ""; }; - 7CCCA0D5F8BB724A0B342E39C887F56C /* Match.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Match.swift; path = Sources/Nimble/Matchers/Match.swift; sourceTree = ""; }; - 851E4FB881FC4ED5D39D0CBCB7DAA845 /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; - 8696FA5715205A2FE823260539588590 /* FFT.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FFT.swift; path = Source/DSP/FFT.swift; sourceTree = ""; }; - 895545B440ABA73C074838125D4DDCD5 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = Sources/Quick/Filter.swift; sourceTree = ""; }; - 8AAD299764DE8C9B43BA8AFF5C36053F /* ValueArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ValueArray.swift; path = Source/1D/ValueArray.swift; sourceTree = ""; }; - 8AB15E15A6C417380F4BDE4F104E73FA /* LinearType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LinearType.swift; path = Source/1D/LinearType.swift; sourceTree = ""; }; - 8B964EBE2CDB51FDD20A12FCFCB2CA92 /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; + 5939A7201581DF730418B213139A659D /* CwlCatchBadInstruction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstruction.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift; sourceTree = ""; }; + 5981D3D86D2E06AC38A3978635C9DED8 /* Nimble.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Nimble.h; path = Sources/Nimble/Nimble.h; sourceTree = ""; }; + 5D5F1F566CEFFF34B2EDFA4761A30736 /* MatrixArithmetic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatrixArithmetic.swift; path = Sources/Upsurge/MatrixArithmetic.swift; sourceTree = ""; }; + 5E704933645FA99C8E634547C49786E9 /* Interval.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Interval.swift; path = Sources/Upsurge/Interval.swift; sourceTree = ""; }; + 5F737BB93131E723165509AE01FA5729 /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; + 6183EF695DE254CDFF2B81C50B41F244 /* Pods-MLKit_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MLKit_Tests-umbrella.h"; sourceTree = ""; }; + 66977DC443BDBFD0C106D7A4F184AC01 /* MatchError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatchError.swift; path = Sources/Nimble/Matchers/MatchError.swift; sourceTree = ""; }; + 691B44A14B74DB67BCC78D5ED07E8881 /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Utils/Async.swift; sourceTree = ""; }; + 6A9880E45E7F3B3785B9FBFF52CEAA60 /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; + 6B26AC147A0657266508051439D0675F /* Matrix.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Matrix.swift; path = Sources/Upsurge/Matrix.swift; sourceTree = ""; }; + 6D6EB106E4321D22F26A52B5B8DE64CD /* ExampleMetadata.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleMetadata.swift; path = Sources/Quick/ExampleMetadata.swift; sourceTree = ""; }; + 6EB6C1B9DCCA2688998730FBBEED6A1E /* AssertionRecorder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionRecorder.swift; path = Sources/Nimble/Adapters/AssertionRecorder.swift; sourceTree = ""; }; + 6FB3756871335B5449117CCB19CAA652 /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Quick.modulemap; sourceTree = ""; }; + 71F3393CED3AA91406E2F69CC8918BB8 /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Nimble.modulemap; sourceTree = ""; }; + 7285349CCF57C337C73827A7D17A9CEF /* FFT.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FFT.swift; path = Sources/Upsurge/FFT.swift; sourceTree = ""; }; + 743433A01B8BAF2AB26BE6DB7BA78D04 /* BeLessThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThan.swift; path = Sources/Nimble/Matchers/BeLessThan.swift; sourceTree = ""; }; + 74ADF229929EC6D9711C899553BE6EE1 /* Pods-MLKit_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Example-frameworks.sh"; sourceTree = ""; }; + 76B89ABEC28DF672A809E705A4840A93 /* Pods-MLKit_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Example-resources.sh"; sourceTree = ""; }; + 7849017A446FAAC1AA464BF30B3DB9A9 /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; + 788D53525A0B21F8BC8F27DDA78143E6 /* DataManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = ""; }; + 78E63F59786E0FA12C7D604E0A89EA14 /* Pods-MLKit_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MLKit_Tests-acknowledgements.plist"; sourceTree = ""; }; + 7A0D4F1E4771931E554C14EBD530BBF0 /* Pods-MLKit_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MLKit_Example-acknowledgements.markdown"; sourceTree = ""; }; + 7B273D8C6E67454E52F2780AE08AFD37 /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; + 7C545BAF94B4B6AAF8AE48FFFFE1F791 /* Value.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Value.swift; path = Sources/Upsurge/Value.swift; sourceTree = ""; }; + 7DC137D322A128441EBF52B5FFE5BE58 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = Sources/Quick/Filter.swift; sourceTree = ""; }; + 7F7F2720A7CF251866B1B65971F0EA81 /* CwlMachBadInstructionHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlMachBadInstructionHandler.m; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m; sourceTree = ""; }; + 7F87494EB08182EBB6C6DFC0A40EDE44 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 80DFF51CCA5EBBCE893D89BB5F3498AD /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; }; + 82120BC34AAA8690AB35CBC4292002FC /* Pods-MLKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Tests.release.xcconfig"; sourceTree = ""; }; + 83BCF2F8D63C19C2434BD6853C915D86 /* BiologicalProcessManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BiologicalProcessManager.swift; sourceTree = ""; }; + 84AEA96C7D58C6932E550A8F5F49CDF2 /* Complex.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Complex.swift; path = Sources/Upsurge/Complex.swift; sourceTree = ""; }; + 864DD86938280C9A69C5A1E4B9663C84 /* MachineLearningKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = MachineLearningKit.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 8652DE537D4205F41CABDA2982BA1C25 /* Tensor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Tensor.swift; path = Sources/Upsurge/Tensor.swift; sourceTree = ""; }; + 866F20B5ADA342A20100B077B4CC0F22 /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; + 8964581D635112603B39EFBBF40DE387 /* Pods-MLKit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MLKit_Example.modulemap"; sourceTree = ""; }; + 8989F80BF9DE58885C888CAF78A4C095 /* Upsurge.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Upsurge.xcconfig; sourceTree = ""; }; + 89EF396CF1EE4E75AD050BDF3EC68560 /* Predicate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Predicate.swift; path = Sources/Nimble/Matchers/Predicate.swift; sourceTree = ""; }; + 8C0B466BB0421312D8078CED0B71E6BE /* ErrorUtility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ErrorUtility.swift; path = Sources/Quick/ErrorUtility.swift; sourceTree = ""; }; + 8CAC8E3CABDE963E50CBC99B73B23A2D /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; + 8CE78F76EE57AA3351A3BDC2DF75A472 /* KMeans.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = KMeans.swift; sourceTree = ""; }; 8D5D6E6E6D3B6CCBD5B8D01D78A6C3A1 /* MachineLearningKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MachineLearningKit.framework; path = MachineLearningKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8E2478F9C2B8F6A4FD3E290EB66D2967 /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; - 8F643B28D12D7235D05A86D94E704075 /* CwlDarwinDefinitions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlDarwinDefinitions.swift; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift; sourceTree = ""; }; - 904FEA0622628AADB1CA02AA57ED1A48 /* TensorSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TensorSlice.swift; path = Source/ND/TensorSlice.swift; sourceTree = ""; }; - 918BC97B218D0A8A64BDD621B91F9069 /* Upsurge-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Upsurge-prefix.pch"; sourceTree = ""; }; - 922D9654CE04819948A343CA3B1429F3 /* CwlCatchException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchException.m; path = Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.m; sourceTree = ""; }; + 8DD06D99DA5CD87A0BF51FB6056AD802 /* ComplexArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArray.swift; path = Sources/Upsurge/ComplexArray.swift; sourceTree = ""; }; + 8E19E5E330F0B730F5C71B8F67C235DA /* Exponential.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Exponential.swift; path = Sources/Upsurge/Exponential.swift; sourceTree = ""; }; + 8EC6FB98BC9B9C5A27A8BF747A7F6C7E /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = Sources/Quick/Configuration/Configuration.swift; sourceTree = ""; }; + 901B5CAA4EB5DC150DF830F34762A545 /* Equal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Equal.swift; path = Sources/Nimble/Matchers/Equal.swift; sourceTree = ""; }; + 903B1867081A10809FA5BF96301EAC0E /* CSVReader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CSVReader.swift; path = MLKit/Classes/CSVReader.swift; sourceTree = ""; }; + 91CFF7338D8B2EFEE0292C206A40EE84 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 92787D690F848868A35127DDA567E382 /* Pods-MLKit_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MLKit_Tests-acknowledgements.markdown"; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 93BD78CE597862CCAAF3A214DF9A8D46 /* Interval.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Interval.swift; path = Source/Types/Interval.swift; sourceTree = ""; }; - 93DE7AC6CBCC1E15E3EC4491A5B45D7C /* KMeans.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = KMeans.swift; sourceTree = ""; }; - 94F560C6B000B2C3D6E49CCFD3562B68 /* MachineLearningKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MachineLearningKit-prefix.pch"; sourceTree = ""; }; - 95FD3F8CEA2A60510B93CE50FFDAEC43 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; - 9624E19BE6F7377A79FB879764B1B1DE /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; - 97CC96CA68BA0815524C996D3FD7D4C8 /* ActivationFunctionType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ActivationFunctionType.swift; sourceTree = ""; }; - 985F35A8C7BB37C0852C7E45F32619DA /* BeCloseTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeCloseTo.swift; path = Sources/Nimble/Matchers/BeCloseTo.swift; sourceTree = ""; }; - 98C52913DD43FF732C4CB0156035175F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9951688C60A46DD572589F5DACF0C4A5 /* Pods-MLKit_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MLKit_Example-umbrella.h"; sourceTree = ""; }; - 99A3B4EC6DA19FEADCCDCA96CA327574 /* Span.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Span.swift; path = Source/ND/Span.swift; sourceTree = ""; }; - 9AEF9A30B4EAA4E623AC004398637120 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; }; - 9B8C04FE82A09C3FC32594EBFC743E53 /* PolynomialRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PolynomialRegression.swift; sourceTree = ""; }; - 9C13EEF6CE7B8665E06332AD77882466 /* 2DTensorSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = 2DTensorSlice.swift; path = Source/2D/2DTensorSlice.swift; sourceTree = ""; }; - 9C6B6A08749A762D9174E03E4409BD8E /* Pods-MLKit_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Example-frameworks.sh"; sourceTree = ""; }; - 9D128A10EA2E300A21235B91F63A2AA3 /* QuickSpecBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpecBase.h; path = Sources/QuickSpecBase/include/QuickSpecBase.h; sourceTree = ""; }; - 9D3A07F4F6A05CA6A00CF85FDA94AB57 /* Pods-MLKit_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MLKit_Tests-dummy.m"; sourceTree = ""; }; - 9E0EB0151B5DDBCEC7706C08CB3F6D0A /* ComplexArithmetic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArithmetic.swift; path = Source/Complex/ComplexArithmetic.swift; sourceTree = ""; }; - 9E6576B5347A8A01F10941469B1EA3EB /* MachineLeanringErrorEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MachineLeanringErrorEnum.swift; sourceTree = ""; }; - 9F2FFA2871232A17F74D97604A516636 /* AssertionDispatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionDispatcher.swift; path = Sources/Nimble/Adapters/AssertionDispatcher.swift; sourceTree = ""; }; - A6F138A9EBF54B5A06DCE9CD171D6071 /* Pods-MLKit_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MLKit_Tests-umbrella.h"; sourceTree = ""; }; - A7A7DD8570BF793B588ADA5EE940E963 /* Pods-MLKit_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MLKit_Tests-acknowledgements.plist"; sourceTree = ""; }; - A7EC0E4FEBE039947272C3B4A867BE43 /* NimbleXCTestHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleXCTestHandler.swift; path = Sources/Nimble/Adapters/NimbleXCTestHandler.swift; sourceTree = ""; }; - A8255BF758512319BCEC8A9465100F12 /* BeNil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeNil.swift; path = Sources/Nimble/Matchers/BeNil.swift; sourceTree = ""; }; - A9C1D721B2C6C17E12FA8322E6E16682 /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Sources/Nimble/Utils/Errors.swift; sourceTree = ""; }; - ABF3645F0FF96B3623FC6818DA9B5E03 /* Pods-MLKit_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Tests-frameworks.sh"; sourceTree = ""; }; - AD94BC820DCB168006B7673EF857A635 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AF83868F61F3BD4402D23052FDEA773A /* Example.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Example.swift; path = Sources/Quick/Example.swift; sourceTree = ""; }; - B05A2B00A7660C87F990F90901BB61C2 /* Real.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Real.swift; path = Source/Types/Real.swift; sourceTree = ""; }; - B8F95C5A721744403DDF5D71E3B20A06 /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; - B90161234C0D9C58144F0D114775D3E8 /* Matrix.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Matrix.swift; path = Source/2D/Matrix.swift; sourceTree = ""; }; - B9D3FED038BE3338641A141732755B00 /* QuickSpecBase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpecBase.m; path = Sources/QuickSpecBase/QuickSpecBase.m; sourceTree = ""; }; - BA8E6B68CD5B9186B6EC6647BF81A356 /* HooksPhase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HooksPhase.swift; path = Sources/Quick/Hooks/HooksPhase.swift; sourceTree = ""; }; - BA9401876190B7BA1B70B7A9752180D5 /* CurrentTestCaseTracker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CurrentTestCaseTracker.h; path = Sources/NimbleObjectiveC/CurrentTestCaseTracker.h; sourceTree = ""; }; + 943AC779D543443D52F1E0E5A33E7E8F /* MachineLearningKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MachineLearningKit.xcconfig; sourceTree = ""; }; + 944520EB51852FB71B9B018254FCB428 /* MachineLearningKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = MachineLearningKit.modulemap; sourceTree = ""; }; + 952F2775024622B4796405322A6794DB /* QuadraticType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuadraticType.swift; path = Sources/Upsurge/QuadraticType.swift; sourceTree = ""; }; + 96945A916008CD4B69F1E34AD69B7922 /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; + 9774CA86DF8D2DC26C4830B97504FBD6 /* Nimble.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Nimble.xcconfig; sourceTree = ""; }; + 9868FD249081AA56BD34C6162A6E0FB3 /* MachineLearningKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MachineLearningKit-dummy.m"; sourceTree = ""; }; + 99AE607EC3AE432038B8D01ED43874F5 /* ActivationFunctionType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ActivationFunctionType.swift; sourceTree = ""; }; + 99CBDFC2C80E00FA020DA53C005E838C /* Layer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Layer.swift; sourceTree = ""; }; + 9B8FD5147603F141BD056C0756090B6F /* AdapterProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AdapterProtocols.swift; path = Sources/Nimble/Adapters/AdapterProtocols.swift; sourceTree = ""; }; + 9D7A706141B0D9509964E0CB47AA457C /* AssertionDispatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionDispatcher.swift; path = Sources/Nimble/Adapters/AssertionDispatcher.swift; sourceTree = ""; }; + 9F0AFF316A4EDB73779600E89CF19632 /* NMBObjCMatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBObjCMatcher.swift; path = Sources/Nimble/Adapters/NMBObjCMatcher.swift; sourceTree = ""; }; + 9FF09F25EDC45AF504AE7DB3E25153AC /* DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DSL.m; path = Sources/NimbleObjectiveC/DSL.m; sourceTree = ""; }; + A521626B7302B082F1B39A00AA2C3A0C /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Nimble/DSL.swift; sourceTree = ""; }; + A859BC8BAFA1A204B91C3D70FD7A64A6 /* BeAKindOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAKindOf.swift; path = Sources/Nimble/Matchers/BeAKindOf.swift; sourceTree = ""; }; + A8A0A7BD8FBCF34C54C12F615A32D045 /* Hyperbolic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Hyperbolic.swift; path = Sources/Upsurge/Hyperbolic.swift; sourceTree = ""; }; + A8E9ECD30E2954373F475721AA57A24C /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; + B1AE425ACC355E279BDA5F98580C7CA4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B2D375478530E99780737CD66CD8DD93 /* QuickSpec.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpec.m; path = Sources/QuickObjectiveC/QuickSpec.m; sourceTree = ""; }; + B2D683B1F99B9F712F2EE56447823F6E /* Sequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sequence.swift; path = Sources/Upsurge/Sequence.swift; sourceTree = ""; }; + B3C80A7C25D576D1F551F878DBA6AF8C /* BeLogical.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLogical.swift; path = Sources/Nimble/Matchers/BeLogical.swift; sourceTree = ""; }; + B621E050BD878B9F6C3BBA0EDA15F0B0 /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; + B6C49FC9DB8F6D1AD5CE50C0A47653B7 /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; + B70FD9CD88E839C57AEB90CE095321E4 /* Pods-MLKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Example.debug.xcconfig"; sourceTree = ""; }; + B9B1A75006593B42ED0AC43E5AF1A6C4 /* CwlPreconditionTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlPreconditionTesting.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h; sourceTree = ""; }; + B9FE4D96E9551D946E8D2BB7312C0EBD /* QuickSelectedTestSuiteBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickSelectedTestSuiteBuilder.swift; path = Sources/Quick/QuickSelectedTestSuiteBuilder.swift; sourceTree = ""; }; BC1FE7307C927E1E6A92842F57E0C7C9 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Nimble.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BE29DF31652B34FA490E23487B83FBEE /* QuickSelectedTestSuiteBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickSelectedTestSuiteBuilder.swift; path = Sources/Quick/QuickSelectedTestSuiteBuilder.swift; sourceTree = ""; }; - C00D1260FC691D4C91B5C7B0C1E51CED /* Exponential.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Exponential.swift; path = Source/Operations/Exponential.swift; sourceTree = ""; }; - C0CED4BACCDE5B346DA1AF62EB6AF781 /* MatcherFunc.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherFunc.swift; path = Sources/Nimble/Matchers/MatcherFunc.swift; sourceTree = ""; }; - C17505640C9782BB9C72471DFBF96025 /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; - C22F81E5621CF7F9199426C6B30396E0 /* Layer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Layer.swift; sourceTree = ""; }; - C3523CB10A94DA7970870A6190C1CB1C /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; - C77F9745A1AEE0419DE285232F7A4B46 /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; - C7E15AEC4FF3B6933962B82D62626FC0 /* Pods-MLKit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-MLKit_Tests.modulemap"; sourceTree = ""; }; - CA483EF72520B01CF4A81ED38901CC64 /* AssertionRecorder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionRecorder.swift; path = Sources/Nimble/Adapters/AssertionRecorder.swift; sourceTree = ""; }; + BC4AC27D0E6B3366260B309A77BF1DEE /* SimpleLinearRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SimpleLinearRegression.swift; sourceTree = ""; }; + BD2B7A69A92DA0BFAC01F38D57957048 /* NSString+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSString+C99ExtendedIdentifier.swift"; path = "Sources/Quick/NSString+C99ExtendedIdentifier.swift"; sourceTree = ""; }; + BF556D4573DC7F987D53D889524FE92C /* NMBExceptionCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBExceptionCapture.h; path = Sources/NimbleObjectiveC/NMBExceptionCapture.h; sourceTree = ""; }; + C008229A23584B84BE1AE6061F6FBA63 /* BeVoid.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeVoid.swift; path = Sources/Nimble/Matchers/BeVoid.swift; sourceTree = ""; }; + C1EC271834216A505262D80AF2EF61DE /* Functional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Functional.swift; path = Sources/Nimble/Utils/Functional.swift; sourceTree = ""; }; + C3CA0DD982FBC2D3667E3DDA63B24456 /* CwlCatchException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchException.h; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h; sourceTree = ""; }; + C4DD537815AD750380E3798229FAB811 /* Upsurge-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Upsurge-dummy.m"; sourceTree = ""; }; + C54F7F18FAF0353E348C4DD3B716DB00 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + C62DBF5F4F814CA68B3097F0248FB2ED /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; + C86BC4FC4C5A0AC48D066EA367D9F1A1 /* BeAnInstanceOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAnInstanceOf.swift; path = Sources/Nimble/Matchers/BeAnInstanceOf.swift; sourceTree = ""; }; + C88ACC22A83253002DF3E9F48F72ECD0 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; + C8DABCC737B4BE064BB957352D867302 /* LinearType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LinearType.swift; path = Sources/Upsurge/LinearType.swift; sourceTree = ""; }; + CA5D01A26D43913794F56D3A7971FF5E /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; + CA6E390EC13AA8DFEFCF8F64F83ED7F0 /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; CA785AB3A9A0B1FEB1F8D8297A1DEB72 /* Pods_MLKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MLKit_Example.framework; path = "Pods-MLKit_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - CABE7AA02D1F045430D6A230BD3B4C19 /* ExampleMetadata.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleMetadata.swift; path = Sources/Quick/ExampleMetadata.swift; sourceTree = ""; }; - CAC74302C6BE8BE111885420D68AEFA2 /* MachineLearningKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = MachineLearningKit.modulemap; sourceTree = ""; }; - CACBB118DD81CDBEFB6559A57C883F50 /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Quick.modulemap; sourceTree = ""; }; - CC69007AFC0A65564291043D24B15E3D /* BeLessThanOrEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThanOrEqual.swift; path = Sources/Nimble/Matchers/BeLessThanOrEqual.swift; sourceTree = ""; }; - CC698E9958DEF380C0198EAA773F7DFF /* Pods-MLKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Example.release.xcconfig"; sourceTree = ""; }; - CD25694F61A3303C6994E49FD926F60C /* MatcherProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherProtocols.swift; path = Sources/Nimble/Matchers/MatcherProtocols.swift; sourceTree = ""; }; - CE766189385F7E575AD7202D0316AFFC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - CE7B423E7D950D806D1D781D4D9FC8B1 /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; - CECAF283BF4E0E908EDD2145F46A956C /* XCTestSuite+QuickTestSuiteBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestSuite+QuickTestSuiteBuilder.m"; path = "Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m"; sourceTree = ""; }; - CFF92402EDA16EB6806DBA1684B4C0F0 /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Nimble.modulemap; sourceTree = ""; }; - D04D296FB2AE0035E8400F25EBD3EF4B /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; - D1601B2905CD07F5813DA81623EDCA6C /* AsyncMatcherWrapper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncMatcherWrapper.swift; path = Sources/Nimble/Matchers/AsyncMatcherWrapper.swift; sourceTree = ""; }; - D17AF65B06ED8A966DDAA320DDAE3508 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D1849FDC7F164FD02BFDF72640C9F951 /* BeAKindOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAKindOf.swift; path = Sources/Nimble/Matchers/BeAKindOf.swift; sourceTree = ""; }; - D227D633B0111C5DC188D1C75FBC2BB6 /* MLKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MLKit.h; sourceTree = ""; }; - D24FCB1F18D8CD9497E67BE1BC119854 /* Arithmetic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Arithmetic.swift; path = Source/Operations/Arithmetic.swift; sourceTree = ""; }; - D88E93CB6BC77FCE57F53E52EA5D23E8 /* CwlCatchBadInstruction.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchBadInstruction.m; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m; sourceTree = ""; }; - D90BB83409612B6B1623CBC644ACC3FE /* NMBExceptionCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBExceptionCapture.m; path = Sources/NimbleObjectiveC/NMBExceptionCapture.m; sourceTree = ""; }; - D9452A9050B54245FBAA633769A8E911 /* Upsurge.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Upsurge.xcconfig; sourceTree = ""; }; - DB163EBF7C9440E868AC98AFF69EA4BF /* ComplexArraySlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArraySlice.swift; path = Source/Complex/ComplexArraySlice.swift; sourceTree = ""; }; - DB7D8CD585F3E3E717E1D6C1E2E0094E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DBD0EB0CE3764BD0D10DF460F60B14F7 /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; - DCBBD5A13ECC31F538E7CFD189D0DC70 /* SatisfyAnyOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAnyOf.swift; path = Sources/Nimble/Matchers/SatisfyAnyOf.swift; sourceTree = ""; }; - DD78B0C12B597C5AADB88DE894863255 /* Pods-MLKit_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MLKit_Example-acknowledgements.plist"; sourceTree = ""; }; - DEA09D70E089028B813F7E3B421C5F78 /* InputDataType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = InputDataType.swift; sourceTree = ""; }; - E0117B79C919D9B561E2A88CF83B7969 /* ThrowError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowError.swift; path = Sources/Nimble/Matchers/ThrowError.swift; sourceTree = ""; }; - E173D8DBF9F7B3031B549B2E0D20C12A /* BeLessThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThan.swift; path = Sources/Nimble/Matchers/BeLessThan.swift; sourceTree = ""; }; - E2D5869169BD2131A228B383AB451505 /* Functional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Functional.swift; path = Sources/Nimble/Utils/Functional.swift; sourceTree = ""; }; - E3118F695CEE1A70F01A9E795A35D87A /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; - E429FE9C8505AE999927833503F9CB86 /* BeIdenticalTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeIdenticalTo.swift; path = Sources/Nimble/Matchers/BeIdenticalTo.swift; sourceTree = ""; }; - E4891C3E0E5A4953C1B99E8D3D29EE77 /* ContainElementSatisfying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ContainElementSatisfying.swift; path = Sources/Nimble/Matchers/ContainElementSatisfying.swift; sourceTree = ""; }; - E676FEA2024624A7035E564D4FD4C518 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; - E73EAAE4A9B8B04A94992730F2F8F808 /* Complex.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Complex.swift; path = Source/Complex/Complex.swift; sourceTree = ""; }; - E7B1ECDF505544DD10698F0466B6541D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - E7D069980D480A434318340B49416C2C /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; - E91835FDAA353C4CC63023DDB96B91F6 /* Equal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Equal.swift; path = Sources/Nimble/Matchers/Equal.swift; sourceTree = ""; }; - E9C36512E8311F1878F954D885D3EF9B /* Upsurge-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Upsurge-dummy.m"; sourceTree = ""; }; - EAC4FF748D013369FE77FEB13FA517D2 /* CwlCatchBadInstruction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstruction.swift; path = Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift; sourceTree = ""; }; - EC2B937DBAE6CC4BCEE683AA80588DC7 /* Expectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expectation.swift; path = Sources/Nimble/Expectation.swift; sourceTree = ""; }; - ED533B83CC472C5A00FECB4769AAC30A /* Nimble.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Nimble.xcconfig; sourceTree = ""; }; - EDA0AC86CACECCE2595819A08D31B2BE /* Upsurge.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Upsurge.modulemap; sourceTree = ""; }; - EDC143C76D629D8D454DC5D8AA30F893 /* ComplexArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComplexArray.swift; path = Source/Complex/ComplexArray.swift; sourceTree = ""; }; - F4AA2FCE20C3F50B7669DC36BD5B9FD0 /* World+DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "World+DSL.h"; path = "Sources/QuickObjectiveC/DSL/World+DSL.h"; sourceTree = ""; }; - F6C176A86FD62B15FEA0A36C68FCEBF8 /* PostNotification.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PostNotification.swift; path = Sources/Nimble/Matchers/PostNotification.swift; sourceTree = ""; }; - FCF0CD880E6B5A4F29D38A6CE05AAFA8 /* PointerUtilities.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PointerUtilities.swift; path = Source/Operations/PointerUtilities.swift; sourceTree = ""; }; - FD3593FEB98ECA8845615527BF4C07B6 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; }; + CBE1188D696473745440C84BF05C42B7 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; }; + CC8D67D5F51E353FFEB079CCBB4185AB /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Quick/DSL/DSL.swift; sourceTree = ""; }; + D083DBFCD198E8DF228467AF0BB09175 /* Arithmetic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Arithmetic.swift; path = Sources/Upsurge/Arithmetic.swift; sourceTree = ""; }; + D1621D3CC99AA55323D74A449B312FCB /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + D18C3D56C8E6AC4C4D8AF2D71F127EC2 /* DSP.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSP.swift; path = Sources/Upsurge/DSP.swift; sourceTree = ""; }; + D1FBBDEE20AB0367D1E895BFF7BAFB74 /* BeNil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeNil.swift; path = Sources/Nimble/Matchers/BeNil.swift; sourceTree = ""; }; + D2865B6ED5D6CC83F8E66C35548F7893 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; + D2BFE4634D330CC7BDB6FD050266645B /* Pods-MLKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MLKit_Example.release.xcconfig"; sourceTree = ""; }; + D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + D3A75F0368092983A16979F80FBADF25 /* RidgeRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RidgeRegression.swift; sourceTree = ""; }; + D44A37484B179283B009A5229D427246 /* ValueArraySlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ValueArraySlice.swift; path = Sources/Upsurge/ValueArraySlice.swift; sourceTree = ""; }; + D452C3BB7BB1790D5A4903D0B514CBF0 /* Pods-MLKit_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MLKit_Example-acknowledgements.plist"; sourceTree = ""; }; + D5B2080DE017858E1C4F1180D226ADE5 /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; + D75D2A081911A92CAAA13793F43C1F75 /* AsyncMatcherWrapper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncMatcherWrapper.swift; path = Sources/Nimble/Matchers/AsyncMatcherWrapper.swift; sourceTree = ""; }; + D926C598D07A72EACCD54FF65A67092A /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; + DA8A10C6381DD2BA184C44E716A301AA /* SatisfyAnyOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAnyOf.swift; path = Sources/Nimble/Matchers/SatisfyAnyOf.swift; sourceTree = ""; }; + DB1CB1AFD9F2B0C76F52519316F890D8 /* Upsurge-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Upsurge-prefix.pch"; sourceTree = ""; }; + DB4CCD4C09F2E233F7EA1F7876D2AF18 /* MLKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MLKit.h; path = MLKit/Classes/MLKit.h; sourceTree = ""; }; + DB876AD0511C8EA666EF8E4C0C08E306 /* ExampleHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleHooks.swift; path = Sources/Quick/Hooks/ExampleHooks.swift; sourceTree = ""; }; + DC56E3DE936D1D3231E8D92095668DB8 /* ToSucceed.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToSucceed.swift; path = Sources/Nimble/Matchers/ToSucceed.swift; sourceTree = ""; }; + DC94E0F4BCD7B7FE9B85BA34D118700B /* 2DTensorSlice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = 2DTensorSlice.swift; path = Sources/Upsurge/2DTensorSlice.swift; sourceTree = ""; }; + DDF4EB4F151410D97C620DA409F22EFC /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; + DE2CD684208F87ED0F834DB064BDC989 /* Pods-MLKit_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Tests-resources.sh"; sourceTree = ""; }; + DF85C3F736F31B6E3DB7DFC71BD097C4 /* Pods-MLKit_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MLKit_Tests-dummy.m"; sourceTree = ""; }; + DF91AA966FF23FD34A8A2A6CA13B6D92 /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; + DFC79DCAC3566B7A977FA02418445C5A /* ContainElementSatisfying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ContainElementSatisfying.swift; path = Sources/Nimble/Matchers/ContainElementSatisfying.swift; sourceTree = ""; }; + E11A16A5E738A6972FCB39D12D520E9C /* Pods-MLKit_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MLKit_Example-umbrella.h"; sourceTree = ""; }; + E136F98E96561490178FBCFC9686F5E0 /* NMBStringify.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBStringify.m; path = Sources/NimbleObjectiveC/NMBStringify.m; sourceTree = ""; }; + E3D739338A7631D1462E2684F771CCDE /* BeLessThanOrEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThanOrEqual.swift; path = Sources/Nimble/Matchers/BeLessThanOrEqual.swift; sourceTree = ""; }; + E5C08A8967C75927DD6642B47902110B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + E5E37B4BB6EC6AFEFF78D4BA53518B58 /* Pods-MLKit_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MLKit_Tests-frameworks.sh"; sourceTree = ""; }; + E711FA07BCB7DDF1C300B40F196A5A8C /* Pods-MLKit_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MLKit_Tests.modulemap"; sourceTree = ""; }; + EC04D0B55B2DF98E82BDFDBDAA249C23 /* Auxiliary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Auxiliary.swift; path = Sources/Upsurge/Auxiliary.swift; sourceTree = ""; }; + EC1ED54D7A581E3899A873412515A27A /* Nimble-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-umbrella.h"; sourceTree = ""; }; + ED86E004A5AE80E2A32D547215794042 /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; + EDE1009D96FFAEDC002FCE0D35C778CC /* CwlDarwinDefinitions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlDarwinDefinitions.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift; sourceTree = ""; }; + EED75267527D223ED50D65EC87059D48 /* DSL+Wait.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DSL+Wait.swift"; path = "Sources/Nimble/DSL+Wait.swift"; sourceTree = ""; }; + EF8ADAE9FEE03A3463D9A4A6E72AB360 /* NimbleXCTestHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleXCTestHandler.swift; path = Sources/Nimble/Adapters/NimbleXCTestHandler.swift; sourceTree = ""; }; + F0DA4837482BDAF49EE0CFC14E653077 /* CwlMachBadInstructionHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlMachBadInstructionHandler.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h; sourceTree = ""; }; + F107EA658C6B53E0B84DD2A10C8FCFE8 /* PolynomialRegression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PolynomialRegression.swift; sourceTree = ""; }; + F127827C31D06829D019510F822834F7 /* Behavior.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Behavior.swift; path = Sources/Quick/Behavior.swift; sourceTree = ""; }; + F138797CE87D370358418C683E65A0C8 /* MachineLeanringErrorEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MachineLeanringErrorEnum.swift; sourceTree = ""; }; + F227CF09F2AD26717EECB3B56B8A901A /* Quick.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Quick.xcconfig; sourceTree = ""; }; + F6810A90251928F55D7237C647E8D9EA /* MachineLearningKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MachineLearningKit-prefix.pch"; sourceTree = ""; }; + F704A1EAB5E5CD9661BD1D9CBC759BB6 /* Expression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expression.swift; path = Sources/Nimble/Expression.swift; sourceTree = ""; }; + F8E2F9F631419C82139E99139B7128F1 /* ExpectationMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpectationMessage.swift; path = Sources/Nimble/ExpectationMessage.swift; sourceTree = ""; }; + FADB247880A1DED3E6643AEE0F9D3216 /* ThrowError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowError.swift; path = Sources/Nimble/Matchers/ThrowError.swift; sourceTree = ""; }; + FBB274627F3CCD45711698273E0F3E15 /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; + FC029CDED30DA7B2ABF33E6954B7EB6D /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; + FD7F1CBDC973E32E006EB9A8DCF2B225 /* World+DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "World+DSL.swift"; path = "Sources/Quick/DSL/World+DSL.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -419,16 +437,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B24A0A8140995A495C05A9D6209847CA /* Accelerate.framework in Frameworks */, - 76C86B1AE6D2B6BED9ABBA270B6EC2F5 /* Foundation.framework in Frameworks */, + F401580BB3F94199850EE085919D337B /* Accelerate.framework in Frameworks */, + B15E411FFF3E2AD78A5B5D6094B48AE3 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A0673853CCFEF089C0BF4D09E710CC4F /* Frameworks */ = { + 574B86180AA21635BD44FF3398DFA2E2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C710B6A7B1A479349273B3AC04CF07C5 /* Foundation.framework in Frameworks */, + 50B22FA5505CE61D56DD50D37BF90FC0 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -436,24 +454,24 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A167AE1A23ECB0052ECE3E97BCE40E70 /* Foundation.framework in Frameworks */, + F878F23B6132166302F83F543699B457 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - B86FB0EBB7F7A201A10E81C25CD1B0E2 /* Frameworks */ = { + DC385C7AD4FA36B921F14CA4DF14FDF3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4780B7DFD8E5DC959B44110EEB2AD935 /* Foundation.framework in Frameworks */, + 35C948170BDAB55532CB1F547389EA0C /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - E4DCA3407A8C0FB721EDC1348B32DECF /* Frameworks */ = { + E883C83B47F861096C0E2E69092FB001 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4D5C0E52B4D1231A2E3057B4A048D1C5 /* Foundation.framework in Frameworks */, - 2211BD314546EEC0AB7B56FC3A45B4E5 /* XCTest.framework in Frameworks */, + 86BE1B34AD7742A81064C43766751FC4 /* Foundation.framework in Frameworks */, + 502B570C39B2814E60BC55201BB02414 /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -461,9 +479,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F5F8D1CB9DDF071F399D675E73649244 /* Foundation.framework in Frameworks */, - 71CD456EE3712FFF55CB7BF70ED20647 /* MapKit.framework in Frameworks */, - E1DC6CA2B4B8D7E6F175D02BE729E637 /* UIKit.framework in Frameworks */, + 294B014BE7FF231808A123355C1DDDCC /* Foundation.framework in Frameworks */, + 756A8D952F562DC0D1540F4E21EFEF56 /* MapKit.framework in Frameworks */, + BB85CDB5A7F9D7C9733ED9A3AFDBDEA2 /* UIKit.framework in Frameworks */, 327749EF14CAE658519971A5FDD0AB95 /* Upsurge.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -471,408 +489,405 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0066F3595AACA5F22AD82B642CFD8ED3 /* MachineLearningKit */ = { + 043EA181C52180C09B04C84EBE7AD5B7 /* Support Files */ = { isa = PBXGroup; children = ( - F551375ACF695895BAD2B86463E2BE0F /* MLKit */, - D59683A2F228DFD2049EE3B2C6076128 /* Support Files */, + 0072087E9838D243ABAAAB182449A157 /* Info.plist */, + 944520EB51852FB71B9B018254FCB428 /* MachineLearningKit.modulemap */, + 943AC779D543443D52F1E0E5A33E7E8F /* MachineLearningKit.xcconfig */, + 9868FD249081AA56BD34C6162A6E0FB3 /* MachineLearningKit-dummy.m */, + F6810A90251928F55D7237C647E8D9EA /* MachineLearningKit-prefix.pch */, + 26B79A4758A80BCE9213C86BEFA1D243 /* MachineLearningKit-umbrella.h */, ); - name = MachineLearningKit; - path = ../..; + name = "Support Files"; + path = "Example/Pods/Target Support Files/MachineLearningKit"; sourceTree = ""; }; - 079067B8263219CD4F9533B01088DD9E /* Quick */ = { + 09D7DFC9E09DB2917AA006E7FEF1330D /* Support Files */ = { isa = PBXGroup; children = ( - D04D296FB2AE0035E8400F25EBD3EF4B /* Callsite.swift */, - 9624E19BE6F7377A79FB879764B1B1DE /* Closures.swift */, - 68FA4E20FBA69E54B8641FB7E2A67324 /* Configuration.swift */, - 4A6452D2CC7C17DD01ECD91742AF746F /* DSL.swift */, - 0841731251EEDE7ACA21267B1A8A673F /* ErrorUtility.swift */, - AF83868F61F3BD4402D23052FDEA773A /* Example.swift */, - 711A9AC0701A2E08E65DD82429B871BA /* ExampleGroup.swift */, - 0FB8099238DE7DDCFE3FE4C07E86CF1E /* ExampleHooks.swift */, - CABE7AA02D1F045430D6A230BD3B4C19 /* ExampleMetadata.swift */, - 895545B440ABA73C074838125D4DDCD5 /* Filter.swift */, - BA8E6B68CD5B9186B6EC6647BF81A356 /* HooksPhase.swift */, - B8F95C5A721744403DDF5D71E3B20A06 /* NSBundle+CurrentTestBundle.swift */, - 79862A111E88CCA41E254825B0A2B523 /* NSString+C99ExtendedIdentifier.swift */, - E676FEA2024624A7035E564D4FD4C518 /* QCKDSL.h */, - E3118F695CEE1A70F01A9E795A35D87A /* QCKDSL.m */, - 8B964EBE2CDB51FDD20A12FCFCB2CA92 /* Quick.h */, - 16D03C36A6892F0A0BA80E3B43181599 /* QuickConfiguration.h */, - 0EB98267420E501E4F7B0573E2C5F96F /* QuickConfiguration.m */, - BE29DF31652B34FA490E23487B83FBEE /* QuickSelectedTestSuiteBuilder.swift */, - 02862E2FB988A3D26C860CD548A14BEB /* QuickSpec.h */, - 67BD782939C66E9C3619A77243519BF6 /* QuickSpec.m */, - 9D128A10EA2E300A21235B91F63A2AA3 /* QuickSpecBase.h */, - B9D3FED038BE3338641A141732755B00 /* QuickSpecBase.m */, - CE7B423E7D950D806D1D781D4D9FC8B1 /* QuickTestSuite.swift */, - 0D765DA753FAB21A06C81689DCF49863 /* SuiteHooks.swift */, - 2D3E3057A07EA15E4008F933E8752DD2 /* URL+FileName.swift */, - 64BEBE3A1D4FF0196925EEA64015469B /* World.h */, - E7D069980D480A434318340B49416C2C /* World.swift */, - F4AA2FCE20C3F50B7669DC36BD5B9FD0 /* World+DSL.h */, - 3A46C9CABC6D7C94BE0864668B74F949 /* World+DSL.swift */, - CECAF283BF4E0E908EDD2145F46A956C /* XCTestSuite+QuickTestSuiteBuilder.m */, - BC003FE70FEB7D13ABECA4112A71C975 /* Support Files */, + 7F87494EB08182EBB6C6DFC0A40EDE44 /* Info.plist */, + 71F3393CED3AA91406E2F69CC8918BB8 /* Nimble.modulemap */, + 9774CA86DF8D2DC26C4830B97504FBD6 /* Nimble.xcconfig */, + D926C598D07A72EACCD54FF65A67092A /* Nimble-dummy.m */, + B621E050BD878B9F6C3BBA0EDA15F0B0 /* Nimble-prefix.pch */, + EC1ED54D7A581E3899A873412515A27A /* Nimble-umbrella.h */, ); - name = Quick; - path = Quick; + name = "Support Files"; + path = "../Target Support Files/Nimble"; sourceTree = ""; }; 1778580F4F8EE091B81F359F5D5D5FBA /* Targets Support Files */ = { isa = PBXGroup; children = ( - C33BE72AAA8A6B3C0353F4762B4B7270 /* Pods-MLKit_Example */, - F0131D05BEC2BD586052E0ECAF5DD440 /* Pods-MLKit_Tests */, + E9C62807DC6498F4D3C6E96926B82AF7 /* Pods-MLKit_Example */, + DF9535B1A88C3A536047C0CAE39F16EC /* Pods-MLKit_Tests */, ); name = "Targets Support Files"; sourceTree = ""; }; - 1D9290CBB8F9FDE0A430DD2D913AC93B /* K Means Clustering */ = { + 2B6CC3750AA37500856DAA883E48FC3A /* Nimble */ = { isa = PBXGroup; children = ( - 93DE7AC6CBCC1E15E3EC4491A5B45D7C /* KMeans.swift */, + 9B8FD5147603F141BD056C0756090B6F /* AdapterProtocols.swift */, + 38E6B7D825EED250A8A2E507119F4709 /* AllPass.swift */, + 9D7A706141B0D9509964E0CB47AA457C /* AssertionDispatcher.swift */, + 6EB6C1B9DCCA2688998730FBBEED6A1E /* AssertionRecorder.swift */, + 691B44A14B74DB67BCC78D5ED07E8881 /* Async.swift */, + D75D2A081911A92CAAA13793F43C1F75 /* AsyncMatcherWrapper.swift */, + A859BC8BAFA1A204B91C3D70FD7A64A6 /* BeAKindOf.swift */, + C86BC4FC4C5A0AC48D066EA367D9F1A1 /* BeAnInstanceOf.swift */, + 42C3D67146BDBA10CAC51CFD228F2FAB /* BeCloseTo.swift */, + 10276B77433F1E402AA83B42483AA81C /* BeEmpty.swift */, + C88ACC22A83253002DF3E9F48F72ECD0 /* BeginWith.swift */, + CA6E390EC13AA8DFEFCF8F64F83ED7F0 /* BeGreaterThan.swift */, + A8E9ECD30E2954373F475721AA57A24C /* BeGreaterThanOrEqualTo.swift */, + 50C03EEF29C5CE0126A004280345CEB5 /* BeIdenticalTo.swift */, + 743433A01B8BAF2AB26BE6DB7BA78D04 /* BeLessThan.swift */, + E3D739338A7631D1462E2684F771CCDE /* BeLessThanOrEqual.swift */, + B3C80A7C25D576D1F551F878DBA6AF8C /* BeLogical.swift */, + D1FBBDEE20AB0367D1E895BFF7BAFB74 /* BeNil.swift */, + C008229A23584B84BE1AE6061F6FBA63 /* BeVoid.swift */, + D2865B6ED5D6CC83F8E66C35548F7893 /* Contain.swift */, + DFC79DCAC3566B7A977FA02418445C5A /* ContainElementSatisfying.swift */, + 96945A916008CD4B69F1E34AD69B7922 /* CwlBadInstructionException.swift */, + 5939A7201581DF730418B213139A659D /* CwlCatchBadInstruction.swift */, + C3CA0DD982FBC2D3667E3DDA63B24456 /* CwlCatchException.h */, + 482052EDFA9575D28D64E9549C44197E /* CwlCatchException.m */, + 7B273D8C6E67454E52F2780AE08AFD37 /* CwlCatchException.swift */, + EDE1009D96FFAEDC002FCE0D35C778CC /* CwlDarwinDefinitions.swift */, + F0DA4837482BDAF49EE0CFC14E653077 /* CwlMachBadInstructionHandler.h */, + 7F7F2720A7CF251866B1B65971F0EA81 /* CwlMachBadInstructionHandler.m */, + B9B1A75006593B42ED0AC43E5AF1A6C4 /* CwlPreconditionTesting.h */, + B6C49FC9DB8F6D1AD5CE50C0A47653B7 /* DSL.h */, + 9FF09F25EDC45AF504AE7DB3E25153AC /* DSL.m */, + A521626B7302B082F1B39A00AA2C3A0C /* DSL.swift */, + EED75267527D223ED50D65EC87059D48 /* DSL+Wait.swift */, + DF91AA966FF23FD34A8A2A6CA13B6D92 /* EndWith.swift */, + 901B5CAA4EB5DC150DF830F34762A545 /* Equal.swift */, + 4C9D615FAE0AA7C543BE7F92529CA1C1 /* Errors.swift */, + 30CFC567F8A1B22F61DC542426B15B60 /* Expectation.swift */, + F8E2F9F631419C82139E99139B7128F1 /* ExpectationMessage.swift */, + F704A1EAB5E5CD9661BD1D9CBC759BB6 /* Expression.swift */, + 47E4190D74012C482B496182A661F4C4 /* FailureMessage.swift */, + C1EC271834216A505262D80AF2EF61DE /* Functional.swift */, + 2D7DE08F4564DB849F36813C94F66821 /* HaveCount.swift */, + 866F20B5ADA342A20100B077B4CC0F22 /* mach_excServer.c */, + 335991C55FC2A3EEDDFE264BA0C64169 /* mach_excServer.h */, + 3463C2B70E2BDD90E3CE7FCAC5292630 /* Match.swift */, + 12D4D8665E25B2D00E226E53BD267285 /* MatcherFunc.swift */, + 395A5303D2C1ED53000412E2C3DCF92D /* MatcherProtocols.swift */, + 66977DC443BDBFD0C106D7A4F184AC01 /* MatchError.swift */, + 5981D3D86D2E06AC38A3978635C9DED8 /* Nimble.h */, + D5B2080DE017858E1C4F1180D226ADE5 /* NimbleEnvironment.swift */, + EF8ADAE9FEE03A3463D9A4A6E72AB360 /* NimbleXCTestHandler.swift */, + BF556D4573DC7F987D53D889524FE92C /* NMBExceptionCapture.h */, + 46BA399BDE1B6DE7B14C30EF6055327D /* NMBExceptionCapture.m */, + 489ECA679D24E54A6CC7B87EACD3D221 /* NMBExpectation.swift */, + 9F0AFF316A4EDB73779600E89CF19632 /* NMBObjCMatcher.swift */, + C62DBF5F4F814CA68B3097F0248FB2ED /* NMBStringify.h */, + E136F98E96561490178FBCFC9686F5E0 /* NMBStringify.m */, + 337B8D2516336668DC0F954A21611095 /* PostNotification.swift */, + 89EF396CF1EE4E75AD050BDF3EC68560 /* Predicate.swift */, + ED86E004A5AE80E2A32D547215794042 /* RaisesException.swift */, + 16606F3887D1DCD0FEBD520F792DA300 /* SatisfyAllOf.swift */, + DA8A10C6381DD2BA184C44E716A301AA /* SatisfyAnyOf.swift */, + 521B35F4C031ABE1E2E2EF830840542B /* SourceLocation.swift */, + 04B8E32AD23B2D12CA57341D936CAB3A /* Stringers.swift */, + 556B768D5C717E2EFDBF20FC039624F5 /* ThrowAssertion.swift */, + FADB247880A1DED3E6643AEE0F9D3216 /* ThrowError.swift */, + DC56E3DE936D1D3231E8D92095668DB8 /* ToSucceed.swift */, + 147E17B49D366E81D21A0B73472E5A23 /* XCTestObservationCenter+Register.m */, + 09D7DFC9E09DB2917AA006E7FEF1330D /* Support Files */, ); - name = "K Means Clustering"; - path = "K Means Clustering"; + name = Nimble; + path = Nimble; sourceTree = ""; }; - 3E25486F8A00548F48F062EE3E3C5DA6 /* Upsurge */ = { + 2BC9D7FC0581B53AD03D521F505E91D7 /* Support Files */ = { isa = PBXGroup; children = ( - 9C13EEF6CE7B8665E06332AD77882466 /* 2DTensorSlice.swift */, - D24FCB1F18D8CD9497E67BE1BC119854 /* Arithmetic.swift */, - 012916E1116F4F544559C4FFCDD0D170 /* Auxiliary.swift */, - E73EAAE4A9B8B04A94992730F2F8F808 /* Complex.swift */, - 9E0EB0151B5DDBCEC7706C08CB3F6D0A /* ComplexArithmetic.swift */, - EDC143C76D629D8D454DC5D8AA30F893 /* ComplexArray.swift */, - 1210BE3C711459C58AE9F743F7B82931 /* ComplexArrayRealSlice.swift */, - DB163EBF7C9440E868AC98AFF69EA4BF /* ComplexArraySlice.swift */, - 383A4DC8ACFD6B49ECF2DFE23764A2D3 /* DSP.swift */, - C00D1260FC691D4C91B5C7B0C1E51CED /* Exponential.swift */, - 8696FA5715205A2FE823260539588590 /* FFT.swift */, - 24D478FE2127475CABEE5C5AE5B9772D /* Hyperbolic.swift */, - 93BD78CE597862CCAAF3A214DF9A8D46 /* Interval.swift */, - 0C3B0FE4A67C53BAE82ACF00A907244A /* LinearOperators.swift */, - 8AB15E15A6C417380F4BDE4F104E73FA /* LinearType.swift */, - B90161234C0D9C58144F0D114775D3E8 /* Matrix.swift */, - 3A2A011722B21DE42A32C785BC89EA01 /* MatrixArithmetic.swift */, - 674822B4E356741B78B38B007C88BB9C /* MatrixSlice.swift */, - FCF0CD880E6B5A4F29D38A6CE05AAFA8 /* PointerUtilities.swift */, - 494C0F635D5836E872EF3C5A39E97D40 /* QuadraticType.swift */, - B05A2B00A7660C87F990F90901BB61C2 /* Real.swift */, - 99A3B4EC6DA19FEADCCDCA96CA327574 /* Span.swift */, - 0AB6F2F34E76936E5DCD781D737E8D0E /* Tensor.swift */, - 904FEA0622628AADB1CA02AA57ED1A48 /* TensorSlice.swift */, - 1C9E249A32DD13B27BA05B3CDE01B22E /* TensorType.swift */, - 632231BFC26E16C229D32687B917D3A0 /* Trigonometric.swift */, - 76A2C52BB2BC141539B6A02006AE6422 /* Value.swift */, - 8AAD299764DE8C9B43BA8AFF5C36053F /* ValueArray.swift */, - 19D06F6EACA4C3A8FB660F983B8C2500 /* ValueArraySlice.swift */, - A819A510A47562E3C92C1A44685374D7 /* Support Files */, + B1AE425ACC355E279BDA5F98580C7CA4 /* Info.plist */, + 6FB3756871335B5449117CCB19CAA652 /* Quick.modulemap */, + F227CF09F2AD26717EECB3B56B8A901A /* Quick.xcconfig */, + FBB274627F3CCD45711698273E0F3E15 /* Quick-dummy.m */, + 8CAC8E3CABDE963E50CBC99B73B23A2D /* Quick-prefix.pch */, + 5F737BB93131E723165509AE01FA5729 /* Quick-umbrella.h */, ); - name = Upsurge; - path = Upsurge; - sourceTree = ""; - }; - 4AE7C6F0FD3648726140001A937F65A4 /* Classes */ = { - isa = PBXGroup; - children = ( - 7264F4D0435F000E2684EB1DAACEBDD1 /* CSVReader.swift */, - D227D633B0111C5DC188D1C75FBC2BB6 /* MLKit.h */, - EB5A14FBFFD7D19B1C8F35011074CE5C /* ANN */, - A150A522CB01D506F45AAD0F0D18E638 /* Genetic Algorithms */, - 68F4F244E826EF084EF6419CB442D871 /* Helper Classes & Extensions */, - 1D9290CBB8F9FDE0A430DD2D913AC93B /* K Means Clustering */, - AE798DB5CB6B3DFD4A133D9CC0382AE8 /* Regression */, - ); - name = Classes; - path = Classes; + name = "Support Files"; + path = "../Target Support Files/Quick"; sourceTree = ""; }; - 68F4F244E826EF084EF6419CB442D871 /* Helper Classes & Extensions */ = { + 310CCCD67B366821FCFF08B1D0CE3F34 /* Helper Classes & Extensions */ = { isa = PBXGroup; children = ( - 477B34BD1FFA8820D6EF220B0BC0118F /* DataManager.swift */, - 4C397B78C2E0CE51B2767D2AF1CD9817 /* Extensions.swift */, - 9E6576B5347A8A01F10941469B1EA3EB /* MachineLeanringErrorEnum.swift */, + 788D53525A0B21F8BC8F27DDA78143E6 /* DataManager.swift */, + 4F825E5C5C07AABCDF90FAD0630DA30B /* Extensions.swift */, + F138797CE87D370358418C683E65A0C8 /* MachineLeanringErrorEnum.swift */, ); name = "Helper Classes & Extensions"; - path = "Helper Classes & Extensions"; + path = "MLKit/Classes/Helper Classes & Extensions"; sourceTree = ""; }; - 7DB346D0F39D3F0E887471402A8071AB = { + 3297101FCA0B5EFD82A6C89296B4AF06 /* Upsurge */ = { isa = PBXGroup; children = ( - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - BC2B2678BE1390F494E86569403E23DF /* Development Pods */, - FC789AF5844FCEF085DA24E590C6103E /* Frameworks */, - EC0EE2C9C961DB08307B5DAA831499AD /* Pods */, - 8940009BC4C8AC45886903989E2DC4B3 /* Products */, - 1778580F4F8EE091B81F359F5D5D5FBA /* Targets Support Files */, + DC94E0F4BCD7B7FE9B85BA34D118700B /* 2DTensorSlice.swift */, + D083DBFCD198E8DF228467AF0BB09175 /* Arithmetic.swift */, + EC04D0B55B2DF98E82BDFDBDAA249C23 /* Auxiliary.swift */, + 84AEA96C7D58C6932E550A8F5F49CDF2 /* Complex.swift */, + 4BF613065B011698DDBE313953239BF2 /* ComplexArithmetic.swift */, + 8DD06D99DA5CD87A0BF51FB6056AD802 /* ComplexArray.swift */, + 144B5707254D157A52910519D2F17C8D /* ComplexArrayRealSlice.swift */, + 21FC20B789CA93B273E0BC1AA0AB7F7C /* ComplexArraySlice.swift */, + D18C3D56C8E6AC4C4D8AF2D71F127EC2 /* DSP.swift */, + 8E19E5E330F0B730F5C71B8F67C235DA /* Exponential.swift */, + 7285349CCF57C337C73827A7D17A9CEF /* FFT.swift */, + A8A0A7BD8FBCF34C54C12F615A32D045 /* Hyperbolic.swift */, + 5E704933645FA99C8E634547C49786E9 /* Interval.swift */, + 2912F84DAE219F366CB90C00C6248FA6 /* LinearOperators.swift */, + C8DABCC737B4BE064BB957352D867302 /* LinearType.swift */, + 6B26AC147A0657266508051439D0675F /* Matrix.swift */, + 5D5F1F566CEFFF34B2EDFA4761A30736 /* MatrixArithmetic.swift */, + 24359C2419BC40E913F7E18F66162068 /* MatrixSlice.swift */, + 2E5093D5F993BB458C93C325732AC182 /* PointerUtilities.swift */, + 952F2775024622B4796405322A6794DB /* QuadraticType.swift */, + 030A59ECDA8F7D3C591CE152B3BBBA87 /* Real.swift */, + B2D683B1F99B9F712F2EE56447823F6E /* Sequence.swift */, + 197CCEAC9008FEF55260A0F2FF0C7B32 /* Span.swift */, + 8652DE537D4205F41CABDA2982BA1C25 /* Tensor.swift */, + 07E148306C6BA950FCA137CD27AEB033 /* TensorSlice.swift */, + 3D75FB88DD2222A56D717AAF228FFE78 /* TensorType.swift */, + 4B251496F77D014ADC2729BF32DC0756 /* Trigonometric.swift */, + 7C545BAF94B4B6AAF8AE48FFFFE1F791 /* Value.swift */, + 3157754E17798B264F621373EBDE7CBB /* ValueArray.swift */, + D44A37484B179283B009A5229D427246 /* ValueArraySlice.swift */, + 5510A90382E274F2A3E199D10A441D08 /* Support Files */, ); + name = Upsurge; + path = Upsurge; sourceTree = ""; }; - 86A92A0E0B9EA4165121541D41E203EE /* Support Files */ = { + 3DE3A7F69BF58415D468B864706A8F53 /* Pod */ = { isa = PBXGroup; children = ( - DB7D8CD585F3E3E717E1D6C1E2E0094E /* Info.plist */, - CFF92402EDA16EB6806DBA1684B4C0F0 /* Nimble.modulemap */, - ED533B83CC472C5A00FECB4769AAC30A /* Nimble.xcconfig */, - DBD0EB0CE3764BD0D10DF460F60B14F7 /* Nimble-dummy.m */, - C17505640C9782BB9C72471DFBF96025 /* Nimble-prefix.pch */, - 162303716510B6A1AC25BFD0F74F2544 /* Nimble-umbrella.h */, + D1621D3CC99AA55323D74A449B312FCB /* LICENSE */, + 864DD86938280C9A69C5A1E4B9663C84 /* MachineLearningKit.podspec */, + 91CFF7338D8B2EFEE0292C206A40EE84 /* README.md */, ); - name = "Support Files"; - path = "../Target Support Files/Nimble"; + name = Pod; sourceTree = ""; }; - 8940009BC4C8AC45886903989E2DC4B3 /* Products */ = { + 5510A90382E274F2A3E199D10A441D08 /* Support Files */ = { isa = PBXGroup; children = ( - 8D5D6E6E6D3B6CCBD5B8D01D78A6C3A1 /* MachineLearningKit.framework */, - BC1FE7307C927E1E6A92842F57E0C7C9 /* Nimble.framework */, - CA785AB3A9A0B1FEB1F8D8297A1DEB72 /* Pods_MLKit_Example.framework */, - 57189BBB8E0A886933E15F0E294E2908 /* Pods_MLKit_Tests.framework */, - 1CA1E0D7EDD11FD11C55B7AC425EA02C /* Quick.framework */, - 289B26827495B1EA15C10A9AFE473C7A /* Upsurge.framework */, + 2166FFC06EE0F270A009284D29A4995A /* Info.plist */, + 508C55FD4AE738ACC7274ADDBEB2028E /* Upsurge.modulemap */, + 8989F80BF9DE58885C888CAF78A4C095 /* Upsurge.xcconfig */, + C4DD537815AD750380E3798229FAB811 /* Upsurge-dummy.m */, + DB1CB1AFD9F2B0C76F52519316F890D8 /* Upsurge-prefix.pch */, + 37945938F521BFB59BCF46DD7A0BF594 /* Upsurge-umbrella.h */, ); - name = Products; + name = "Support Files"; + path = "../Target Support Files/Upsurge"; sourceTree = ""; }; - A150A522CB01D506F45AAD0F0D18E638 /* Genetic Algorithms */ = { + 5AD1C05961E019BF9DB7CF316E8EA218 /* MachineLearningKit */ = { isa = PBXGroup; children = ( - 224B74EEB01665D46840260470EA4991 /* BiologicalProcessManager.swift */, - 1DAB4E6A2EB3A9C3629C2062F345461A /* Genome.swift */, - 7A45BA6EC001C35D2D0B9BFE6072BD59 /* Population.swift */, + 903B1867081A10809FA5BF96301EAC0E /* CSVReader.swift */, + DB4CCD4C09F2E233F7EA1F7876D2AF18 /* MLKit.h */, + 8BBE0D6BA15F5D3FDE21B715C2EBAE68 /* ANN */, + 93FF52822A5EBE893B03B280227A7504 /* Genetic Algorithms */, + 310CCCD67B366821FCFF08B1D0CE3F34 /* Helper Classes & Extensions */, + E3315A0E863D94D2852A046A57C6381D /* K Means Clustering */, + 3DE3A7F69BF58415D468B864706A8F53 /* Pod */, + C4BB4ABCD345AEF37D6D62D3319D65A0 /* Regression */, + 043EA181C52180C09B04C84EBE7AD5B7 /* Support Files */, ); - name = "Genetic Algorithms"; - path = "Genetic Algorithms"; + name = MachineLearningKit; + path = ../..; sourceTree = ""; }; - A819A510A47562E3C92C1A44685374D7 /* Support Files */ = { + 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - AD94BC820DCB168006B7673EF857A635 /* Info.plist */, - EDA0AC86CACECCE2595819A08D31B2BE /* Upsurge.modulemap */, - D9452A9050B54245FBAA633769A8E911 /* Upsurge.xcconfig */, - E9C36512E8311F1878F954D885D3EF9B /* Upsurge-dummy.m */, - 918BC97B218D0A8A64BDD621B91F9069 /* Upsurge-prefix.pch */, - 5480FBA1F6D203291F193F6D19878DBA /* Upsurge-umbrella.h */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, + 837D77061913806BBAAF9DC7B85BCA1C /* Development Pods */, + FC789AF5844FCEF085DA24E590C6103E /* Frameworks */, + C07EFE2A3CFEEF2B26E60033417B8717 /* Pods */, + 8940009BC4C8AC45886903989E2DC4B3 /* Products */, + 1778580F4F8EE091B81F359F5D5D5FBA /* Targets Support Files */, ); - name = "Support Files"; - path = "../Target Support Files/Upsurge"; sourceTree = ""; }; - ABCDED8B3EE7643CE616D3F7D8243E3B /* iOS */ = { + 837D77061913806BBAAF9DC7B85BCA1C /* Development Pods */ = { isa = PBXGroup; children = ( - FD3593FEB98ECA8845615527BF4C07B6 /* Accelerate.framework */, - 15E689FA8F35DA0540DAED36BA321F6E /* Foundation.framework */, - 9AEF9A30B4EAA4E623AC004398637120 /* MapKit.framework */, - CE766189385F7E575AD7202D0316AFFC /* UIKit.framework */, - 761E70C09096AF7E9F07C0940571D8E8 /* XCTest.framework */, + 5AD1C05961E019BF9DB7CF316E8EA218 /* MachineLearningKit */, ); - name = iOS; + name = "Development Pods"; sourceTree = ""; }; - ACF52AC05372AE6D4CFF78D07529B37B /* Nimble */ = { + 8940009BC4C8AC45886903989E2DC4B3 /* Products */ = { isa = PBXGroup; children = ( - 7738AD08C39FE55EBEED43F72217AD23 /* AdapterProtocols.swift */, - 424CEA9DC77FE5D725C9551F2ACAA8BA /* AllPass.swift */, - 9F2FFA2871232A17F74D97604A516636 /* AssertionDispatcher.swift */, - CA483EF72520B01CF4A81ED38901CC64 /* AssertionRecorder.swift */, - 256AA66B0C109C259E2D0DDA42B32EDB /* Async.swift */, - D1601B2905CD07F5813DA81623EDCA6C /* AsyncMatcherWrapper.swift */, - D1849FDC7F164FD02BFDF72640C9F951 /* BeAKindOf.swift */, - 3EB4893036DEB2A1EB8B6111A120F5A2 /* BeAnInstanceOf.swift */, - 985F35A8C7BB37C0852C7E45F32619DA /* BeCloseTo.swift */, - 851E4FB881FC4ED5D39D0CBCB7DAA845 /* BeEmpty.swift */, - 26788572C6F366401AFEC63C14A45513 /* BeginWith.swift */, - 46306D0BBA1452AFEA95521C31EF74FD /* BeGreaterThan.swift */, - C77F9745A1AEE0419DE285232F7A4B46 /* BeGreaterThanOrEqualTo.swift */, - E429FE9C8505AE999927833503F9CB86 /* BeIdenticalTo.swift */, - E173D8DBF9F7B3031B549B2E0D20C12A /* BeLessThan.swift */, - CC69007AFC0A65564291043D24B15E3D /* BeLessThanOrEqual.swift */, - 227DDFCD5D9F3918AB624B74E886C8A5 /* BeLogical.swift */, - A8255BF758512319BCEC8A9465100F12 /* BeNil.swift */, - 27B970E9789C66FDD4D00112E12E321A /* BeVoid.swift */, - 95FD3F8CEA2A60510B93CE50FFDAEC43 /* Contain.swift */, - E4891C3E0E5A4953C1B99E8D3D29EE77 /* ContainElementSatisfying.swift */, - BA9401876190B7BA1B70B7A9752180D5 /* CurrentTestCaseTracker.h */, - 3A0C56CEE8C3AD43FF8AE40F6AFFF4C7 /* CwlBadInstructionException.swift */, - 3949269DDD43CCFF544917979779224B /* CwlCatchBadInstruction.h */, - D88E93CB6BC77FCE57F53E52EA5D23E8 /* CwlCatchBadInstruction.m */, - EAC4FF748D013369FE77FEB13FA517D2 /* CwlCatchBadInstruction.swift */, - 50F4D75F4A1D2B2E24633488475931A3 /* CwlCatchException.h */, - 922D9654CE04819948A343CA3B1429F3 /* CwlCatchException.m */, - 40FFCF7710FDE9792C5747C276F2DF4F /* CwlCatchException.swift */, - 8F643B28D12D7235D05A86D94E704075 /* CwlDarwinDefinitions.swift */, - 0874FE88223748474F9540CC3A7B2CDD /* DSL.h */, - 56C0D020BB9A8FA4BD0F26AC76A2E14A /* DSL.m */, - 0912AB47C2FD8B724C2FF78EB04DA146 /* DSL.swift */, - 6F7958F9886E618114345F800A8E55FF /* DSL+Wait.swift */, - 05BA3CAD29488F2C5317D831BB6931BF /* EndWith.swift */, - E91835FDAA353C4CC63023DDB96B91F6 /* Equal.swift */, - A9C1D721B2C6C17E12FA8322E6E16682 /* Errors.swift */, - EC2B937DBAE6CC4BCEE683AA80588DC7 /* Expectation.swift */, - 445AD67BD05424A184443D2B95D450E1 /* Expression.swift */, - 077C0519A2057F471035D14A7027344E /* FailureMessage.swift */, - E2D5869169BD2131A228B383AB451505 /* Functional.swift */, - 07FB5885E183C905F1B353BA590212F0 /* HaveCount.swift */, - 5CEECA1264E2048F119396D446D14C91 /* mach_excServer.c */, - 20BF642EFEB79518E353D7F8F3D860F1 /* mach_excServer.h */, - 7CCCA0D5F8BB724A0B342E39C887F56C /* Match.swift */, - C0CED4BACCDE5B346DA1AF62EB6AF781 /* MatcherFunc.swift */, - CD25694F61A3303C6994E49FD926F60C /* MatcherProtocols.swift */, - 3C9A0B54C6BC094E3CD3A2A61EDA9D85 /* MatchError.swift */, - 124FF2A96FE15393763BC63572EEC184 /* Nimble.h */, - 8E2478F9C2B8F6A4FD3E290EB66D2967 /* NimbleEnvironment.swift */, - A7EC0E4FEBE039947272C3B4A867BE43 /* NimbleXCTestHandler.swift */, - 1CFC980E2966F69FA4D771EB69B2072A /* NMBExceptionCapture.h */, - D90BB83409612B6B1623CBC644ACC3FE /* NMBExceptionCapture.m */, - 60979E4BD68DB0DE4501D0BCC7234D91 /* NMBExpectation.swift */, - 460AA53800E69CBD26BBD78537857F1E /* NMBObjCMatcher.swift */, - 4A7F3D729C82E75AB35940B80EDE5960 /* NMBStringify.h */, - 538A45E8224CD67C4262A9B8B8F1F37D /* NMBStringify.m */, - F6C176A86FD62B15FEA0A36C68FCEBF8 /* PostNotification.swift */, - 13CD84A26A08B3EC263D565FE02D7940 /* RaisesException.swift */, - DCBBD5A13ECC31F538E7CFD189D0DC70 /* SatisfyAnyOf.swift */, - 6030DF38EBDBF336FFAE0120EEA4D959 /* SourceLocation.swift */, - 692BA097D08B9592A8A24370C50D81D0 /* Stringers.swift */, - 564EE9F32DE4725529A52326B19EA90F /* ThrowAssertion.swift */, - E0117B79C919D9B561E2A88CF83B7969 /* ThrowError.swift */, - 38FE998DBDEEBCE33949AAA9F3296550 /* XCTestObservationCenter+Register.m */, - 86A92A0E0B9EA4165121541D41E203EE /* Support Files */, + 8D5D6E6E6D3B6CCBD5B8D01D78A6C3A1 /* MachineLearningKit.framework */, + BC1FE7307C927E1E6A92842F57E0C7C9 /* Nimble.framework */, + CA785AB3A9A0B1FEB1F8D8297A1DEB72 /* Pods_MLKit_Example.framework */, + 57189BBB8E0A886933E15F0E294E2908 /* Pods_MLKit_Tests.framework */, + 1CA1E0D7EDD11FD11C55B7AC425EA02C /* Quick.framework */, + 289B26827495B1EA15C10A9AFE473C7A /* Upsurge.framework */, ); - name = Nimble; - path = Nimble; + name = Products; sourceTree = ""; }; - AE798DB5CB6B3DFD4A133D9CC0382AE8 /* Regression */ = { + 8BBE0D6BA15F5D3FDE21B715C2EBAE68 /* ANN */ = { isa = PBXGroup; children = ( - 436FD53B1F1C37D3650BE5FE2C882A5E /* LassoRegression.swift */, - 9B8C04FE82A09C3FC32594EBFC743E53 /* PolynomialRegression.swift */, - 09DB8A700464608EEC997EB8F70F5A97 /* RidgeRegression.swift */, - 33447FAB1F2844FCF376B75EB97C4666 /* SimpleLinearRegression.swift */, + 99AE607EC3AE432038B8D01ED43874F5 /* ActivationFunctionType.swift */, + 041AFB8E22C5AAD543EDA1F96A9BCBAB /* InputDataType.swift */, + 99CBDFC2C80E00FA020DA53C005E838C /* Layer.swift */, + 45944744A832416BF5020527CAD33A70 /* NeuralNetwork.swift */, ); - name = Regression; - path = Regression; + name = ANN; + path = MLKit/Classes/ANN; sourceTree = ""; }; - BC003FE70FEB7D13ABECA4112A71C975 /* Support Files */ = { + 93FF52822A5EBE893B03B280227A7504 /* Genetic Algorithms */ = { isa = PBXGroup; children = ( - 3AFFFEB5837A94482C2215EB9EFEEEDD /* Info.plist */, - CACBB118DD81CDBEFB6559A57C883F50 /* Quick.modulemap */, - 617F2E0CEEF4C400A8D6EADD86F6145C /* Quick.xcconfig */, - 023DA655BA54CB7DEA97C57AD9725DDE /* Quick-dummy.m */, - 3AE3D8AECCC1ACCEA8F2C3B88B7A5070 /* Quick-prefix.pch */, - C3523CB10A94DA7970870A6190C1CB1C /* Quick-umbrella.h */, + 83BCF2F8D63C19C2434BD6853C915D86 /* BiologicalProcessManager.swift */, + 149C087BF5CF9736F9C47759977B4DCD /* Genome.swift */, + 169BC2DB3712E23D9A69F1AACCD762C0 /* Population.swift */, ); - name = "Support Files"; - path = "../Target Support Files/Quick"; + name = "Genetic Algorithms"; + path = "MLKit/Classes/Genetic Algorithms"; sourceTree = ""; }; - BC2B2678BE1390F494E86569403E23DF /* Development Pods */ = { + C07EFE2A3CFEEF2B26E60033417B8717 /* Pods */ = { isa = PBXGroup; children = ( - 0066F3595AACA5F22AD82B642CFD8ED3 /* MachineLearningKit */, + 2B6CC3750AA37500856DAA883E48FC3A /* Nimble */, + DE8665BBFD8A0E6E3B08DBF7CB1D3C1D /* Quick */, + 3297101FCA0B5EFD82A6C89296B4AF06 /* Upsurge */, ); - name = "Development Pods"; + name = Pods; sourceTree = ""; }; - C33BE72AAA8A6B3C0353F4762B4B7270 /* Pods-MLKit_Example */ = { + C4BB4ABCD345AEF37D6D62D3319D65A0 /* Regression */ = { isa = PBXGroup; children = ( - 98C52913DD43FF732C4CB0156035175F /* Info.plist */, - 08D39735D7DBDB3A52B19BB1A1BEAD08 /* Pods-MLKit_Example.modulemap */, - 6E5F3C7C7DEC67A40AB30E806AC7D1E2 /* Pods-MLKit_Example-acknowledgements.markdown */, - DD78B0C12B597C5AADB88DE894863255 /* Pods-MLKit_Example-acknowledgements.plist */, - 3D5025AF8F620B99C3283F0975D09FE3 /* Pods-MLKit_Example-dummy.m */, - 9C6B6A08749A762D9174E03E4409BD8E /* Pods-MLKit_Example-frameworks.sh */, - 3D34DA76C844CF16C054BA1344541C74 /* Pods-MLKit_Example-resources.sh */, - 9951688C60A46DD572589F5DACF0C4A5 /* Pods-MLKit_Example-umbrella.h */, - 636673BDA1F06E469643F565D84270B5 /* Pods-MLKit_Example.debug.xcconfig */, - CC698E9958DEF380C0198EAA773F7DFF /* Pods-MLKit_Example.release.xcconfig */, + 3A9832ABE1993F30F8D46161D2D60B7F /* LassoRegression.swift */, + F107EA658C6B53E0B84DD2A10C8FCFE8 /* PolynomialRegression.swift */, + D3A75F0368092983A16979F80FBADF25 /* RidgeRegression.swift */, + BC4AC27D0E6B3366260B309A77BF1DEE /* SimpleLinearRegression.swift */, ); - name = "Pods-MLKit_Example"; - path = "Target Support Files/Pods-MLKit_Example"; + name = Regression; + path = MLKit/Classes/Regression; sourceTree = ""; }; - D59683A2F228DFD2049EE3B2C6076128 /* Support Files */ = { + DE8665BBFD8A0E6E3B08DBF7CB1D3C1D /* Quick */ = { isa = PBXGroup; children = ( - D17AF65B06ED8A966DDAA320DDAE3508 /* Info.plist */, - CAC74302C6BE8BE111885420D68AEFA2 /* MachineLearningKit.modulemap */, - 55F8E5E39CFFED8C8B0162606918FB20 /* MachineLearningKit.xcconfig */, - 2D60404BA78CC7BF6C1144F008DDDDBC /* MachineLearningKit-dummy.m */, - 94F560C6B000B2C3D6E49CCFD3562B68 /* MachineLearningKit-prefix.pch */, - 5ECF49E5836E9754AAF942842CE1B960 /* MachineLearningKit-umbrella.h */, + F127827C31D06829D019510F822834F7 /* Behavior.swift */, + 3DAFCD1EAB3A11FCBE8181968A1EF4DC /* Callsite.swift */, + 24B713FD278927D49885E1904255F064 /* Closures.swift */, + 8EC6FB98BC9B9C5A27A8BF747A7F6C7E /* Configuration.swift */, + CC8D67D5F51E353FFEB079CCBB4185AB /* DSL.swift */, + 8C0B466BB0421312D8078CED0B71E6BE /* ErrorUtility.swift */, + 137AA47B11FCF8DFAD21FDBFDF07E50A /* Example.swift */, + 6A9880E45E7F3B3785B9FBFF52CEAA60 /* ExampleGroup.swift */, + DB876AD0511C8EA666EF8E4C0C08E306 /* ExampleHooks.swift */, + 6D6EB106E4321D22F26A52B5B8DE64CD /* ExampleMetadata.swift */, + 7DC137D322A128441EBF52B5FFE5BE58 /* Filter.swift */, + 3CCBBC9C55535D0AC68C2CA15578DA91 /* HooksPhase.swift */, + CA5D01A26D43913794F56D3A7971FF5E /* NSBundle+CurrentTestBundle.swift */, + BD2B7A69A92DA0BFAC01F38D57957048 /* NSString+C99ExtendedIdentifier.swift */, + 035C2EED1791B7BE6BE9D42969BAB1C9 /* QCKDSL.h */, + 16E6DC1E5FD69A192A194383B26C8EC3 /* QCKDSL.m */, + 1D83F506716B92E26EDB9E77BE6F7159 /* Quick.h */, + 038A760F895431B48CEA5B48437243EA /* QuickConfiguration.h */, + 0994970A2155ACFCCAF3F3AF8BE2E5CC /* QuickConfiguration.m */, + B9FE4D96E9551D946E8D2BB7312C0EBD /* QuickSelectedTestSuiteBuilder.swift */, + 34AC4F5E4E39D1C3AF89CEC5B360EA2D /* QuickSpec.h */, + B2D375478530E99780737CD66CD8DD93 /* QuickSpec.m */, + 1F1DAF6BB9F55D39AF40337558D846AE /* QuickSpecBase.h */, + 1142E838EF9E0ECBE2816DC30D200AF0 /* QuickSpecBase.m */, + 7849017A446FAAC1AA464BF30B3DB9A9 /* QuickTestSuite.swift */, + DDF4EB4F151410D97C620DA409F22EFC /* SuiteHooks.swift */, + 0B05419F27BE1D11F326BDE23BEBF0E7 /* URL+FileName.swift */, + FC029CDED30DA7B2ABF33E6954B7EB6D /* World.swift */, + FD7F1CBDC973E32E006EB9A8DCF2B225 /* World+DSL.swift */, + 52F937831EEA31D8B58ACEA667057BEE /* XCTestSuite+QuickTestSuiteBuilder.m */, + 2BC9D7FC0581B53AD03D521F505E91D7 /* Support Files */, ); - name = "Support Files"; - path = "Example/Pods/Target Support Files/MachineLearningKit"; + name = Quick; + path = Quick; sourceTree = ""; }; - EB5A14FBFFD7D19B1C8F35011074CE5C /* ANN */ = { + DF9535B1A88C3A536047C0CAE39F16EC /* Pods-MLKit_Tests */ = { isa = PBXGroup; children = ( - 97CC96CA68BA0815524C996D3FD7D4C8 /* ActivationFunctionType.swift */, - DEA09D70E089028B813F7E3B421C5F78 /* InputDataType.swift */, - C22F81E5621CF7F9199426C6B30396E0 /* Layer.swift */, - 4F8B6CE41AAC2E1823ECFFB4021CC6E2 /* NeuralNetwork.swift */, + 0365A681452A1DA13C0E39C5DC0675EB /* Info.plist */, + E711FA07BCB7DDF1C300B40F196A5A8C /* Pods-MLKit_Tests.modulemap */, + 92787D690F848868A35127DDA567E382 /* Pods-MLKit_Tests-acknowledgements.markdown */, + 78E63F59786E0FA12C7D604E0A89EA14 /* Pods-MLKit_Tests-acknowledgements.plist */, + DF85C3F736F31B6E3DB7DFC71BD097C4 /* Pods-MLKit_Tests-dummy.m */, + E5E37B4BB6EC6AFEFF78D4BA53518B58 /* Pods-MLKit_Tests-frameworks.sh */, + DE2CD684208F87ED0F834DB064BDC989 /* Pods-MLKit_Tests-resources.sh */, + 6183EF695DE254CDFF2B81C50B41F244 /* Pods-MLKit_Tests-umbrella.h */, + 103DE453E6596254E367B645D93B900C /* Pods-MLKit_Tests.debug.xcconfig */, + 82120BC34AAA8690AB35CBC4292002FC /* Pods-MLKit_Tests.release.xcconfig */, ); - name = ANN; - path = ANN; + name = "Pods-MLKit_Tests"; + path = "Target Support Files/Pods-MLKit_Tests"; sourceTree = ""; }; - EC0EE2C9C961DB08307B5DAA831499AD /* Pods */ = { + E3315A0E863D94D2852A046A57C6381D /* K Means Clustering */ = { isa = PBXGroup; children = ( - ACF52AC05372AE6D4CFF78D07529B37B /* Nimble */, - 079067B8263219CD4F9533B01088DD9E /* Quick */, - 3E25486F8A00548F48F062EE3E3C5DA6 /* Upsurge */, + 8CE78F76EE57AA3351A3BDC2DF75A472 /* KMeans.swift */, ); - name = Pods; + name = "K Means Clustering"; + path = "MLKit/Classes/K Means Clustering"; sourceTree = ""; }; - F0131D05BEC2BD586052E0ECAF5DD440 /* Pods-MLKit_Tests */ = { + E9C62807DC6498F4D3C6E96926B82AF7 /* Pods-MLKit_Example */ = { isa = PBXGroup; children = ( - E7B1ECDF505544DD10698F0466B6541D /* Info.plist */, - C7E15AEC4FF3B6933962B82D62626FC0 /* Pods-MLKit_Tests.modulemap */, - 2002FFD090C435360F60A33E88C41DBB /* Pods-MLKit_Tests-acknowledgements.markdown */, - A7A7DD8570BF793B588ADA5EE940E963 /* Pods-MLKit_Tests-acknowledgements.plist */, - 9D3A07F4F6A05CA6A00CF85FDA94AB57 /* Pods-MLKit_Tests-dummy.m */, - ABF3645F0FF96B3623FC6818DA9B5E03 /* Pods-MLKit_Tests-frameworks.sh */, - 2C176355D2DA1EB17207AE84594804D6 /* Pods-MLKit_Tests-resources.sh */, - A6F138A9EBF54B5A06DCE9CD171D6071 /* Pods-MLKit_Tests-umbrella.h */, - 32AA223B57196F7790D905F38D2517BF /* Pods-MLKit_Tests.debug.xcconfig */, - 440AC79C4CAC00E64494654CCFEB3615 /* Pods-MLKit_Tests.release.xcconfig */, + 30C1619989EFFEFB685F646D70830431 /* Info.plist */, + 8964581D635112603B39EFBBF40DE387 /* Pods-MLKit_Example.modulemap */, + 7A0D4F1E4771931E554C14EBD530BBF0 /* Pods-MLKit_Example-acknowledgements.markdown */, + D452C3BB7BB1790D5A4903D0B514CBF0 /* Pods-MLKit_Example-acknowledgements.plist */, + 26B0E28532E762E9902A82E87EC50B64 /* Pods-MLKit_Example-dummy.m */, + 74ADF229929EC6D9711C899553BE6EE1 /* Pods-MLKit_Example-frameworks.sh */, + 76B89ABEC28DF672A809E705A4840A93 /* Pods-MLKit_Example-resources.sh */, + E11A16A5E738A6972FCB39D12D520E9C /* Pods-MLKit_Example-umbrella.h */, + B70FD9CD88E839C57AEB90CE095321E4 /* Pods-MLKit_Example.debug.xcconfig */, + D2BFE4634D330CC7BDB6FD050266645B /* Pods-MLKit_Example.release.xcconfig */, ); - name = "Pods-MLKit_Tests"; - path = "Target Support Files/Pods-MLKit_Tests"; + name = "Pods-MLKit_Example"; + path = "Target Support Files/Pods-MLKit_Example"; sourceTree = ""; }; - F551375ACF695895BAD2B86463E2BE0F /* MLKit */ = { + F78C7557EE1B6D8A7347A3729962D3E0 /* iOS */ = { isa = PBXGroup; children = ( - 4AE7C6F0FD3648726140001A937F65A4 /* Classes */, + CBE1188D696473745440C84BF05C42B7 /* Accelerate.framework */, + D30148A07FBE46E8C69E5F875B9AD8E6 /* Foundation.framework */, + 80DFF51CCA5EBBCE893D89BB5F3498AD /* MapKit.framework */, + C54F7F18FAF0353E348C4DD3B716DB00 /* UIKit.framework */, + E5C08A8967C75927DD6642B47902110B /* XCTest.framework */, ); - name = MLKit; - path = MLKit; + name = iOS; sourceTree = ""; }; FC789AF5844FCEF085DA24E590C6103E /* Frameworks */ = { isa = PBXGroup; children = ( 29E88E2BB63028C27C1E53746F101DF7 /* Upsurge.framework */, - ABCDED8B3EE7643CE616D3F7D8243E3B /* iOS */, + F78C7557EE1B6D8A7347A3729962D3E0 /* iOS */, ); name = Frameworks; sourceTree = ""; @@ -880,88 +895,86 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 25A84B3E3A024D9BF706D46FD80B1BFA /* Headers */ = { + 218360F643848CEAD782B4444605846F /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 20C32450383B494CC9EF7F3072369EE0 /* Pods-MLKit_Tests-umbrella.h in Headers */, + 6487761C38E6711E2C194CFDF3BF0447 /* Pods-MLKit_Tests-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 6715D50B9530063A587A479ADF8A97C0 /* Headers */ = { + 2B487A80240E070C2FF26BD41CAFED64 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - B16340143CE7FF40A32CD8082ED4152D /* CurrentTestCaseTracker.h in Headers */, - 88B771FB81DD05BF7E48A0D9271D9EB4 /* CwlCatchBadInstruction.h in Headers */, - DEF289C7BF4E97D42B06B1EB7CAE0951 /* CwlCatchException.h in Headers */, - 4A17E1DB4EA2CCBF04B76F5F8EB417A1 /* DSL.h in Headers */, - 874EF0A06B9FC80B877261425BAB4ED2 /* mach_excServer.h in Headers */, - 7BD907A708031D5361E1A97CACF9F24E /* Nimble-umbrella.h in Headers */, - 409A3ECDDC680D0BD343E3F203862E25 /* Nimble.h in Headers */, - E9CD7EF9DD6E75404E4264F6F0AC8D26 /* NMBExceptionCapture.h in Headers */, - 926F67C94121C19A959745138E5B42B6 /* NMBStringify.h in Headers */, + B0A24F0E24E02201A246F0D58523ED7E /* CwlCatchException.h in Headers */, + B0C88072D75620D68F7C690CF2CD2D92 /* CwlMachBadInstructionHandler.h in Headers */, + 1CFDB94DFF57F98BA7A40829DDB3CFC0 /* CwlPreconditionTesting.h in Headers */, + 40A171EDCB95C2F32A957676476A25BC /* DSL.h in Headers */, + ED70B4997FC9EEA54B89CBFF3DCC27A9 /* mach_excServer.h in Headers */, + 9108613C28FC0D1A7948C6B4FE64932F /* Nimble-umbrella.h in Headers */, + 1D230EC73A17C8494F279447636B6D51 /* Nimble.h in Headers */, + 1B1A26FD4363A19DEFED48BF5E5341BE /* NMBExceptionCapture.h in Headers */, + 0EFF888E42BD1DF8B77FA6B547BC9149 /* NMBStringify.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 7C5B32BF357C66C1587EAF79DA4844AF /* Headers */ = { + 37E3933EAFC38DEA5F8D2568A143F484 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 51CE8C2AEBC657C98FFC03B61E97B412 /* Upsurge-umbrella.h in Headers */, + F714F0DD6B5353FBF76FA23B94519C4E /* MachineLearningKit-umbrella.h in Headers */, + 3D166297C8E5CFF2F002B9CEC9D5C6F1 /* MLKit.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 87CDD88C8BC6FB4A0E318A7AF6364EBF /* Headers */ = { + 7C5B32BF357C66C1587EAF79DA4844AF /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 61554BF9F5D2997AD26BC61F4674CD68 /* Pods-MLKit_Example-umbrella.h in Headers */, + 51CE8C2AEBC657C98FFC03B61E97B412 /* Upsurge-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - A1CA5F639B850916A375701104ECB0BE /* Headers */ = { + 87CDD88C8BC6FB4A0E318A7AF6364EBF /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - DA5FD83FA962C78A2484186465AB5AF2 /* MachineLearningKit-umbrella.h in Headers */, - 06701D0572D99FF3577E0C4F3E308FE8 /* MLKit.h in Headers */, + 61554BF9F5D2997AD26BC61F4674CD68 /* Pods-MLKit_Example-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - F1E8026C9E06D051DD2D14CB16938926 /* Headers */ = { + BBA184D6390CAF591C3ED4020A773FCD /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3068D78E8F744939B04CA6B03D3380AA /* QCKDSL.h in Headers */, - DA90A10D3A108672F7D61F8A96C42650 /* Quick-umbrella.h in Headers */, - 15B880A364E4467B8496FB49A27371AA /* Quick.h in Headers */, - 86E4EF6BCCB1EF6E67552FCD7A3B6D6E /* QuickConfiguration.h in Headers */, - 4FDFB4587C55A09C0A2E3A3780568B54 /* QuickSpec.h in Headers */, - 74534A7B8A7904903E206702029453C8 /* QuickSpecBase.h in Headers */, - 4540D4FBCD937483258578DE32634108 /* World+DSL.h in Headers */, - 8E00B22C6FE14FEF9B828106A8B1622F /* World.h in Headers */, + 835ED63895528314B94936A1222496AE /* QCKDSL.h in Headers */, + 8BE24F68EE0482CBCA709E049318823A /* Quick-umbrella.h in Headers */, + B034B1EA1C94BBDFFA3564E010A56A04 /* Quick.h in Headers */, + E693ED027F354D0C0B26BA260073C5D1 /* QuickConfiguration.h in Headers */, + 6021482B94C91267E84D163309B95763 /* QuickSpec.h in Headers */, + 73913EBEE109B560765B9C354EE333DE /* QuickSpecBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 0921CC2F4398BE9A4F1CEACB30684B56 /* Nimble */ = { + 0C900B9C11E235F9DF95A64E8C83D049 /* Quick */ = { isa = PBXNativeTarget; - buildConfigurationList = 761C67FF258DB3BE6B2D4612FA9938E8 /* Build configuration list for PBXNativeTarget "Nimble" */; + buildConfigurationList = 4F29BCC7A631798DD7E69AAB9EB114C9 /* Build configuration list for PBXNativeTarget "Quick" */; buildPhases = ( - 41E146CA370726574B1C3087CF111D13 /* Sources */, - A0673853CCFEF089C0BF4D09E710CC4F /* Frameworks */, - 6715D50B9530063A587A479ADF8A97C0 /* Headers */, + E5B61EF4550B15D136D57EE7CA2DEF72 /* Sources */, + E883C83B47F861096C0E2E69092FB001 /* Frameworks */, + BBA184D6390CAF591C3ED4020A773FCD /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = Nimble; - productName = Nimble; - productReference = BC1FE7307C927E1E6A92842F57E0C7C9 /* Nimble.framework */; + name = Quick; + productName = Quick; + productReference = 1CA1E0D7EDD11FD11C55B7AC425EA02C /* Quick.framework */; productType = "com.apple.product-type.framework"; }; 11214F2158317CCF8497B1AFC05251A3 /* Pods-MLKit_Example */ = { @@ -987,9 +1000,9 @@ isa = PBXNativeTarget; buildConfigurationList = 1E2225DCCFCA6849974B71B670645A6C /* Build configuration list for PBXNativeTarget "MachineLearningKit" */; buildPhases = ( - 601A39245B6A4430792A69ED3568C841 /* Sources */, + 537D89B97E31DE3011C2F76992463FCA /* Sources */, F66E990DDCA2AB92E5BE088582FF8849 /* Frameworks */, - A1CA5F639B850916A375701104ECB0BE /* Headers */, + 37E3933EAFC38DEA5F8D2568A143F484 /* Headers */, ); buildRules = ( ); @@ -1001,28 +1014,31 @@ productReference = 8D5D6E6E6D3B6CCBD5B8D01D78A6C3A1 /* MachineLearningKit.framework */; productType = "com.apple.product-type.framework"; }; - 405857F01F82B80417D1BCAA762E7FA5 /* Quick */ = { + 51546CB00C38E8676C273E818A48875F /* Pods-MLKit_Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 4521CA563498BBBB8638765DDF2E0D43 /* Build configuration list for PBXNativeTarget "Quick" */; + buildConfigurationList = C5C4F6359CB2CD785308C45900AD3C1D /* Build configuration list for PBXNativeTarget "Pods-MLKit_Tests" */; buildPhases = ( - DAACD664EAA3ACAA0A0B897994FBF48E /* Sources */, - E4DCA3407A8C0FB721EDC1348B32DECF /* Frameworks */, - F1E8026C9E06D051DD2D14CB16938926 /* Headers */, + C86DEDD44497AAC99191FB189AC915B3 /* Sources */, + DC385C7AD4FA36B921F14CA4DF14FDF3 /* Frameworks */, + 218360F643848CEAD782B4444605846F /* Headers */, ); buildRules = ( ); dependencies = ( + 54DE40E47A756BEA8F4E1F16710682CE /* PBXTargetDependency */, + C2B0478F257BCC06196A231459EC4CF9 /* PBXTargetDependency */, + 262565959319F45D1859827CB52E66D8 /* PBXTargetDependency */, ); - name = Quick; - productName = Quick; - productReference = 1CA1E0D7EDD11FD11C55B7AC425EA02C /* Quick.framework */; + name = "Pods-MLKit_Tests"; + productName = "Pods-MLKit_Tests"; + productReference = 57189BBB8E0A886933E15F0E294E2908 /* Pods_MLKit_Tests.framework */; productType = "com.apple.product-type.framework"; }; 6C57B4D688C9D6216427DD10ADDFFCB6 /* Upsurge */ = { isa = PBXNativeTarget; buildConfigurationList = 1689072BD2C522D2F716D50D402AEC59 /* Build configuration list for PBXNativeTarget "Upsurge" */; buildPhases = ( - C589758AE8B90E8A34CC11BE88742800 /* Sources */, + 0E2B00E1C4E97300A50735D8F5A52AA7 /* Sources */, 4FA44FA5690174F265A6D6C6A7652A7B /* Frameworks */, 7C5B32BF357C66C1587EAF79DA4844AF /* Headers */, ); @@ -1035,23 +1051,21 @@ productReference = 289B26827495B1EA15C10A9AFE473C7A /* Upsurge.framework */; productType = "com.apple.product-type.framework"; }; - 9E9C8675948A927700EE9576202C417B /* Pods-MLKit_Tests */ = { + BA85E3619866E2EAA8CC3EDE21C659FC /* Nimble */ = { isa = PBXNativeTarget; - buildConfigurationList = 82174FC6C6E04470F8797B33ACE22503 /* Build configuration list for PBXNativeTarget "Pods-MLKit_Tests" */; + buildConfigurationList = 8FC360693D1D0CDE34D2234C9BEDB081 /* Build configuration list for PBXNativeTarget "Nimble" */; buildPhases = ( - 74D078A8B5616E755E7EAA8F963C6FC2 /* Sources */, - B86FB0EBB7F7A201A10E81C25CD1B0E2 /* Frameworks */, - 25A84B3E3A024D9BF706D46FD80B1BFA /* Headers */, + 7D3D6E878E76492930EDEF343B7440E4 /* Sources */, + 574B86180AA21635BD44FF3398DFA2E2 /* Frameworks */, + 2B487A80240E070C2FF26BD41CAFED64 /* Headers */, ); buildRules = ( ); dependencies = ( - FACCEFD04D031E45FBC293233B19F81C /* PBXTargetDependency */, - F4E22DFEB546DDB30C129288CE1D0702 /* PBXTargetDependency */, ); - name = "Pods-MLKit_Tests"; - productName = "Pods-MLKit_Tests"; - productReference = 57189BBB8E0A886933E15F0E294E2908 /* Pods_MLKit_Tests.framework */; + name = Nimble; + productName = Nimble; + productReference = BC1FE7307C927E1E6A92842F57E0C7C9 /* Nimble.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -1060,8 +1074,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0700; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -1076,187 +1090,193 @@ projectRoot = ""; targets = ( 28C1C0C2E20677EBC9884E8E60383F6C /* MachineLearningKit */, - 0921CC2F4398BE9A4F1CEACB30684B56 /* Nimble */, + BA85E3619866E2EAA8CC3EDE21C659FC /* Nimble */, 11214F2158317CCF8497B1AFC05251A3 /* Pods-MLKit_Example */, - 9E9C8675948A927700EE9576202C417B /* Pods-MLKit_Tests */, - 405857F01F82B80417D1BCAA762E7FA5 /* Quick */, + 51546CB00C38E8676C273E818A48875F /* Pods-MLKit_Tests */, + 0C900B9C11E235F9DF95A64E8C83D049 /* Quick */, 6C57B4D688C9D6216427DD10ADDFFCB6 /* Upsurge */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 41E146CA370726574B1C3087CF111D13 /* Sources */ = { + 0E2B00E1C4E97300A50735D8F5A52AA7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D5D4E8223C271A19448FCEAC36A9B441 /* AdapterProtocols.swift in Sources */, - FAACCCDBE0D2785212E37468636AAB0A /* AllPass.swift in Sources */, - 7272DB71A8C5325A0778F63E6F6C9957 /* AssertionDispatcher.swift in Sources */, - B612F1F906E3AF8B1FC6B893229E83B6 /* AssertionRecorder.swift in Sources */, - 0DF2D4E6B55D67E28D8BE9EC5A25F24E /* Async.swift in Sources */, - AA6EAFA71E1A6862AA312D89A601C34F /* AsyncMatcherWrapper.swift in Sources */, - 80D1788131B3D3326041E62364F8C7AA /* BeAKindOf.swift in Sources */, - A87CA098369D61EFC7A05BD61512A3F5 /* BeAnInstanceOf.swift in Sources */, - D7408861438442F67469ACE39D1604C1 /* BeCloseTo.swift in Sources */, - AD2B0E5BFF8EAD0EDF0449F8D198277C /* BeEmpty.swift in Sources */, - 288DBE855F794BA1AE8BC47AA413693E /* BeginWith.swift in Sources */, - 30F80459D8D536D8B99880EDD353987A /* BeGreaterThan.swift in Sources */, - ABEE3775B4FD25B3C86EE712BC2502B2 /* BeGreaterThanOrEqualTo.swift in Sources */, - 5685322E421AB4DA6A91B26C09833B29 /* BeIdenticalTo.swift in Sources */, - 318F9AE6D9561CFB487071A821B4217D /* BeLessThan.swift in Sources */, - 1F707004C05C63F90F0030E8E4902D66 /* BeLessThanOrEqual.swift in Sources */, - AF7F875677FF3EB4B6ADDB1373B34249 /* BeLogical.swift in Sources */, - F100D41C0564EE46CA47DA9E3540DA70 /* BeNil.swift in Sources */, - D6A1634CFD5243D18DB762116C8CEF8F /* BeVoid.swift in Sources */, - C97B9F51427BCD4C63EC7D75AB161833 /* Contain.swift in Sources */, - 2DF80575B9759A9E8004F4F642D0D123 /* ContainElementSatisfying.swift in Sources */, - 0B846370B6EA04F7D7909A403DD16317 /* CwlBadInstructionException.swift in Sources */, - C39921387DA273A0952A999B0CDC03F9 /* CwlCatchBadInstruction.m in Sources */, - 1C37D984F1BBBC7278E1FB6BDB153892 /* CwlCatchBadInstruction.swift in Sources */, - DB5066EBB8C95A3F8818628C9CA6794D /* CwlCatchException.m in Sources */, - 34E0569B2666F68A70EB676EFDCC4434 /* CwlCatchException.swift in Sources */, - B1D876C441B5F61984E35ABB5210AFE6 /* CwlDarwinDefinitions.swift in Sources */, - B138DBC0F7D2656EE7E413BEA735C71D /* DSL+Wait.swift in Sources */, - C9132B1E287B7ECA69A90F4766ADE9C2 /* DSL.m in Sources */, - A279D4DAE8E16C5D8F9019CDBED14D73 /* DSL.swift in Sources */, - 383B3EF018CDFD095EFEB7D74769144A /* EndWith.swift in Sources */, - D9921CDBA36587248C63AFDD5B3C1981 /* Equal.swift in Sources */, - 4B6579FFF0062EEBBABB8336C0871171 /* Errors.swift in Sources */, - D93C5A1929F8FD53F7EF2C3CA16CCC95 /* Expectation.swift in Sources */, - 65335E2F74AE71C270659EC7E8725030 /* Expression.swift in Sources */, - 704DA81E48A5263B35189F36C5247A53 /* FailureMessage.swift in Sources */, - 32AB6828BB98A679D3EBCC16C7BE9566 /* Functional.swift in Sources */, - DC9C69D7524AFEECCDC73D5CF1F4C028 /* HaveCount.swift in Sources */, - F2ED0A18E020A07A092F957B2C7EF0E2 /* mach_excServer.c in Sources */, - A665BE606F6B28E89B531EDE41657ECE /* Match.swift in Sources */, - 0D4B1951108CF54E1968467D30C351B5 /* MatcherFunc.swift in Sources */, - E1554E6ED22E94CAD97E211C7FBA530B /* MatcherProtocols.swift in Sources */, - AF814F353BF9C15BAED3E4067DCC3BF7 /* MatchError.swift in Sources */, - 748BB746CA429F9C5D510EEF3245ECFD /* Nimble-dummy.m in Sources */, - 69F9C31FC991A69337CE9B599993D68D /* NimbleEnvironment.swift in Sources */, - 7276DB3552398200B421D06F207EC0E3 /* NimbleXCTestHandler.swift in Sources */, - 6F36A431DE56B28FD400D20036A23DE4 /* NMBExceptionCapture.m in Sources */, - 9D9155396F48333B854DBE586138EDBF /* NMBExpectation.swift in Sources */, - 2173F4681D2DDDF63A01A7439EDE1FD4 /* NMBObjCMatcher.swift in Sources */, - 123D36BB9CA549C55BBE6FC7D21BAB97 /* NMBStringify.m in Sources */, - 10B953E63951E8DB495AA5B5EBDBBABA /* PostNotification.swift in Sources */, - FD9373DD3C1910FB513089F4CD39613B /* RaisesException.swift in Sources */, - C08FCDC247B35C971F5AE7E58987E8AC /* SatisfyAnyOf.swift in Sources */, - DB039F39038342DE5258F386F694A9A0 /* SourceLocation.swift in Sources */, - 04AE1DC56A0C088489EA27CED5190838 /* Stringers.swift in Sources */, - 11EEDB6DB6F03E2AF3FC368AA32274AC /* ThrowAssertion.swift in Sources */, - B1D59A1BD0FBDF3BA9A5B65ACFC25D56 /* ThrowError.swift in Sources */, - EEACC5B78AFB71C8594380C005C17A4B /* XCTestObservationCenter+Register.m in Sources */, + 26C2857031D2CB5DE4BFC55F71E64229 /* 2DTensorSlice.swift in Sources */, + 8B4A8B4617BE1D9580BC7653ED4E3CCF /* Arithmetic.swift in Sources */, + BA65AB10ECCDF1B685D0BBDE49FF255F /* Auxiliary.swift in Sources */, + 9839BAE4DF6D8962D2BBE8E2DFDD1F08 /* Complex.swift in Sources */, + 2A64C14CA0740E07DF5604A89045B736 /* ComplexArithmetic.swift in Sources */, + 56C429A204D9FC3CA3E5B72C8E93EF9F /* ComplexArray.swift in Sources */, + D000AB338C568FBCCDFAF753350E1E6D /* ComplexArrayRealSlice.swift in Sources */, + FDADDA2F644E74CFFBC21DAE8B34D209 /* ComplexArraySlice.swift in Sources */, + E638C6BA5AF87A5D632C0EF4EC935EDF /* DSP.swift in Sources */, + B88F9184DF2ECC40C8EE0C63EDDCA197 /* Exponential.swift in Sources */, + 1D6F244C93C8350C8BD032AEDC9402C5 /* FFT.swift in Sources */, + CA5821BE1C1F8E0CBC0D1330410FC7C0 /* Hyperbolic.swift in Sources */, + 10C8501040563F6DC661872488E4EE05 /* Interval.swift in Sources */, + C09CE51A451E72D653FD4923A86EB852 /* LinearOperators.swift in Sources */, + 6F5BB0DEDCB97B6CA9BDC6E2BC894BCD /* LinearType.swift in Sources */, + 9D2DB6D873E1BCB6FE2200D4328F675A /* Matrix.swift in Sources */, + 3D3D94A184EB5C93F8887954BFB12C0B /* MatrixArithmetic.swift in Sources */, + 6BD5954D6D97255245EFDA13D419F5D9 /* MatrixSlice.swift in Sources */, + 32303624D5644DFA368BB8ADE56A5A80 /* PointerUtilities.swift in Sources */, + 4998726555D0E6AC12D7683597D6F3F0 /* QuadraticType.swift in Sources */, + 767D96C3DE8A33843E313EC5080E13C9 /* Real.swift in Sources */, + 88F07F135909FB51B8B6DC3E564F94C9 /* Sequence.swift in Sources */, + 1E03644651C38FCCC0C5614DF1CC4541 /* Span.swift in Sources */, + 06A1ED28CC8A4A7AA51A74E3F066B890 /* Tensor.swift in Sources */, + D7540984B876954995215DBAFF52EF9B /* TensorSlice.swift in Sources */, + DE4C1C79903A92287FD102F1E28C3A49 /* TensorType.swift in Sources */, + 924746047825777BE99D81F35E875981 /* Trigonometric.swift in Sources */, + E72A47B4B76741BE1090EED5A84F5A08 /* Upsurge-dummy.m in Sources */, + B76E5CB09EC007EED55BB57E320692AE /* Value.swift in Sources */, + 3D5F2F7E4A2DE9B43A8965BB56179E4A /* ValueArray.swift in Sources */, + C7155137CD896EFAD562C90E1A461EE2 /* ValueArraySlice.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 601A39245B6A4430792A69ED3568C841 /* Sources */ = { + 537D89B97E31DE3011C2F76992463FCA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2DB201D5AC1FCE6C27412155BACDF7F6 /* ActivationFunctionType.swift in Sources */, - 8B633AB7CA7CD7773A1C426781C08948 /* BiologicalProcessManager.swift in Sources */, - 694FFDD18CDDC9EC5B5F52779DEC4133 /* CSVReader.swift in Sources */, - ABE2A268050AA3DEFDF8D945B9930866 /* DataManager.swift in Sources */, - AC3D1B5A37FB49CFDCC4C671C79B020F /* Extensions.swift in Sources */, - F4BD351BF32EA4E81E2971E225914D1E /* Genome.swift in Sources */, - B4590BB72005AC96211E469104D92DB5 /* InputDataType.swift in Sources */, - 5FB36CC3D65A05755802D9EC66B0AEDC /* KMeans.swift in Sources */, - 92EDDC00A5D940D4F7361AEE6644BD30 /* LassoRegression.swift in Sources */, - 48D3AEB90C6F865FB5128840EF13CAC8 /* Layer.swift in Sources */, - 04ADA7ED88E0D419D4DA1DB9DA1A2FF1 /* MachineLeanringErrorEnum.swift in Sources */, - 6B8EEA47C6BE87E17FD2F93747E2A4C5 /* MachineLearningKit-dummy.m in Sources */, - AE7464C0BFB56E8B11B0670A68B9CF12 /* NeuralNetwork.swift in Sources */, - 5B18BC28616DDC2DDE3442B98F00CF09 /* PolynomialRegression.swift in Sources */, - C7D1BAD68F1C67EA9AAE23534D3E9665 /* Population.swift in Sources */, - 6E55E227D9195A39F978F2DC1C408636 /* RidgeRegression.swift in Sources */, - 9FFFDDC2816EEAA4F74BE9FCF9681670 /* SimpleLinearRegression.swift in Sources */, + 0ECBFD6DD2705D603B58B6CDBB4ECB55 /* ActivationFunctionType.swift in Sources */, + DE1AF2FCB9BD497D0A0D866D8895AC3A /* BiologicalProcessManager.swift in Sources */, + 94299DD46562D02D0529FC16C10C39AF /* CSVReader.swift in Sources */, + 8A5B774CBE0C649BD8AE0C6EBD802777 /* DataManager.swift in Sources */, + 38987AF1005F71F197DE94320F9311A0 /* Extensions.swift in Sources */, + DCCC78645AB51BCBDC92B41E7178C5DA /* Genome.swift in Sources */, + BB1F8C46AB981EA52FA280F8E2B8E4AB /* InputDataType.swift in Sources */, + 7C01BD975A436D2AE25C109908B8E519 /* KMeans.swift in Sources */, + D4B3F9CB9B4FF5379324C4D94DE2B189 /* LassoRegression.swift in Sources */, + 51E8ED4E1C9624CEA91CE72E31A77352 /* Layer.swift in Sources */, + 6C761ED9AC2B10745751A1D07ADBFB5A /* MachineLeanringErrorEnum.swift in Sources */, + A5FC691080848921A6D86C349E32AFB3 /* MachineLearningKit-dummy.m in Sources */, + A5A9F8A2E529DDE72AC3A69E1649B607 /* NeuralNetwork.swift in Sources */, + D3F727B55FB86EA9C679DEC4ABF8C136 /* PolynomialRegression.swift in Sources */, + B992D07E451C740A64C11452ADAC34C8 /* Population.swift in Sources */, + 512C40F8402C23DFF6D7C8616B4A752B /* RidgeRegression.swift in Sources */, + 608484BC82ED853B02509AFF26C1DAF7 /* SimpleLinearRegression.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 74D078A8B5616E755E7EAA8F963C6FC2 /* Sources */ = { + 7B8C6AE84F93B90087CCA44B0AF2B2B7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 31DAC2CCBBF3C8BA68AB4DC7912A199B /* Pods-MLKit_Tests-dummy.m in Sources */, + C83188A450E13A233EF77D94306E926D /* Pods-MLKit_Example-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 7B8C6AE84F93B90087CCA44B0AF2B2B7 /* Sources */ = { + 7D3D6E878E76492930EDEF343B7440E4 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C83188A450E13A233EF77D94306E926D /* Pods-MLKit_Example-dummy.m in Sources */, + B51FCB764739D557C3BB3FDBE8107D39 /* AdapterProtocols.swift in Sources */, + 00D139EEB6792519BEAF55EA35ED8F83 /* AllPass.swift in Sources */, + 11B8DC63427760E55702E36491E82FA5 /* AssertionDispatcher.swift in Sources */, + 4A829DC29EC5600B259E1CA203C7131D /* AssertionRecorder.swift in Sources */, + 3C12D78CF670FBEDBC28AA6ED303CBEA /* Async.swift in Sources */, + 2339AFF95F06AB4A518AAA46A27255D6 /* AsyncMatcherWrapper.swift in Sources */, + 1BBFE5E8E35BF18EC9F4C8BD8EC1C060 /* BeAKindOf.swift in Sources */, + 2A58E899DD8B5F96FE9C3EDE09DA4275 /* BeAnInstanceOf.swift in Sources */, + 619CAC289E6EBE57D6AD4C6C4CA0CD17 /* BeCloseTo.swift in Sources */, + 37B2802744DEADBC4FD37AF8E53EAE8C /* BeEmpty.swift in Sources */, + F5F7F03D04479B0EE47D69DF65EA53B6 /* BeginWith.swift in Sources */, + 28CFC0568B5E674FF8F0AF1CC0E54ADF /* BeGreaterThan.swift in Sources */, + D99EEA3143EABF137D39E3A97FFD84DE /* BeGreaterThanOrEqualTo.swift in Sources */, + 90BA044032941979487072C733619240 /* BeIdenticalTo.swift in Sources */, + 442F136F23EFE21E3975E58EB88FEA2C /* BeLessThan.swift in Sources */, + 004C4A6F461C216F03A05253CA730BEF /* BeLessThanOrEqual.swift in Sources */, + BAABCE6AB9AC7ABC3C9A7CDF8A6FF8A7 /* BeLogical.swift in Sources */, + 258E93DF9434A618A4A4E48C5CAA41CD /* BeNil.swift in Sources */, + F02C4FA6C6F8D9B7C8FECB076DCEC9EE /* BeVoid.swift in Sources */, + 21979416B2B4389E1A489EE0C33A536B /* Contain.swift in Sources */, + 97E3A1B8E5B7EF1D2399B486FE63BCAB /* ContainElementSatisfying.swift in Sources */, + EDC4B37063B934740542A03374BE3DC7 /* CwlBadInstructionException.swift in Sources */, + 057FD6F9061B0A2B9BFE252D3C102A3B /* CwlCatchBadInstruction.swift in Sources */, + 6D35850AE79F6BB1812DB02D1D2C4B95 /* CwlCatchException.m in Sources */, + F7AC37D64DE8E79CC8275835892F4490 /* CwlCatchException.swift in Sources */, + A3F6738E2A7AC46F9C8F091372EB9331 /* CwlDarwinDefinitions.swift in Sources */, + 695BC1AED063402F2284EB3F846EBEB8 /* CwlMachBadInstructionHandler.m in Sources */, + A8F7AF423D60D84B30D46CA84A88819D /* DSL+Wait.swift in Sources */, + 44B5C5D451E86F04D22C0E2132D0424D /* DSL.m in Sources */, + F376FB1DBE7FB046CDA7388B7035FBB5 /* DSL.swift in Sources */, + 1F7C236A1386F8EDED5E6445FD19C9E3 /* EndWith.swift in Sources */, + B0CE1B8655743386970201D46EA88589 /* Equal.swift in Sources */, + 5D25D8140BE47BEDA9E07C8BB641BB4F /* Errors.swift in Sources */, + F82D4E195C2879A141A4DA12CB912078 /* Expectation.swift in Sources */, + 40CD85252642CD7C44BEFA855FF493D4 /* ExpectationMessage.swift in Sources */, + 413C30B3D21CDEA27D0B380A677F42F1 /* Expression.swift in Sources */, + A03E49A483BD40BD3A8B943A8A963764 /* FailureMessage.swift in Sources */, + F969AEB2E68708B5A0B901C7EA6BBD93 /* Functional.swift in Sources */, + 782667D2D5260BAEF7473BC258613D13 /* HaveCount.swift in Sources */, + E6B23012319D7A5969C414F36A2B5DEE /* mach_excServer.c in Sources */, + D4854F8569321A500968B34987FFFB30 /* Match.swift in Sources */, + 53DCB7202178EC5C3E6727168073391F /* MatcherFunc.swift in Sources */, + D69CEF312A13F98B8E5746A02F5A59AB /* MatcherProtocols.swift in Sources */, + 3AD17A92405C1EF8A71E7B2A24C84170 /* MatchError.swift in Sources */, + FF62BEF08E929321B76037A261B9D23C /* Nimble-dummy.m in Sources */, + 73EA7ECA35082C124EB45D82F12D027A /* NimbleEnvironment.swift in Sources */, + CC7D11A33BD4AC9581D2C01C28B26C1D /* NimbleXCTestHandler.swift in Sources */, + D03B3661A806DB01D904EC24E59B7E2E /* NMBExceptionCapture.m in Sources */, + CD780F20B5B520C03C95726C6E23A4A1 /* NMBExpectation.swift in Sources */, + BDA66F64BCBE78B25D470F3184B50532 /* NMBObjCMatcher.swift in Sources */, + BAAD4E7A01DD015FCB6E2AE29462D2EE /* NMBStringify.m in Sources */, + AC0DC051DDF5D34B02E9A4938226F8FC /* PostNotification.swift in Sources */, + 1995EBB8E64C83233C202827D2D642E9 /* Predicate.swift in Sources */, + 320DB9CF630DCAD9F57987783F2BCCA6 /* RaisesException.swift in Sources */, + 4B3023C8B818F53F59316503EA79812C /* SatisfyAllOf.swift in Sources */, + 0B24159FEC50346D438B9E0EECBEE8BE /* SatisfyAnyOf.swift in Sources */, + F6FD9357A3EF5F6736CC2AFA82520534 /* SourceLocation.swift in Sources */, + 12080BB18AFDA64D95FD31E27B28A66D /* Stringers.swift in Sources */, + 9C3FBF83F72E03F08F977DFA1218B5F9 /* ThrowAssertion.swift in Sources */, + FAE9DB89C9544E5C56345A371A49F7FD /* ThrowError.swift in Sources */, + 7322E5D673689B017FCF72610299ECF0 /* ToSucceed.swift in Sources */, + B4984DA0EF9EFB51A61EB447F969389D /* XCTestObservationCenter+Register.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - C589758AE8B90E8A34CC11BE88742800 /* Sources */ = { + C86DEDD44497AAC99191FB189AC915B3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A1F2BC02366DABC762E62F506B6D1AC2 /* 2DTensorSlice.swift in Sources */, - 17B85BEE3D018EB0AF42539D1658D24E /* Arithmetic.swift in Sources */, - 2991245B488F3F00EDCFD3EFB2244294 /* Auxiliary.swift in Sources */, - 249AC8A0B6CC8D4D92DA5D841D712900 /* Complex.swift in Sources */, - 6F74F8072E2C42E51624D0B89AB03048 /* ComplexArithmetic.swift in Sources */, - 7E08966D0A420CCE741F608370F4759C /* ComplexArray.swift in Sources */, - 7E950AE4BC7D603625CBFD877F63728C /* ComplexArrayRealSlice.swift in Sources */, - 86D13DA212D4F8A87E212941DF61361D /* ComplexArraySlice.swift in Sources */, - 78726014CB6610CA87B10E02D148478A /* DSP.swift in Sources */, - 519349F9AF137FFAD28A594685046460 /* Exponential.swift in Sources */, - DFA04175FF8EB3DFFA5FFEEF93996E7C /* FFT.swift in Sources */, - 178FA5CACF9ACD91FBBEB0DF8892201F /* Hyperbolic.swift in Sources */, - B1A6D9047AE13EF484B5F58F215440A1 /* Interval.swift in Sources */, - 50471C0EFA0C6F13833F63066765DCFF /* LinearOperators.swift in Sources */, - 3E456278E0D7B190269739DA08693C9E /* LinearType.swift in Sources */, - 153AA07F19B6F56DE6BB54E6D7BBF1E5 /* Matrix.swift in Sources */, - 438262E9AEBC5203D56677E842F563D5 /* MatrixArithmetic.swift in Sources */, - 7900A1BADFEB30B7D803D0869E548E10 /* MatrixSlice.swift in Sources */, - FCB81A907C61E1883C282A0271C05D7E /* PointerUtilities.swift in Sources */, - A711AA562D0AD3092BAF83E2CFCC86A7 /* QuadraticType.swift in Sources */, - 643B6917C3157C68C92A7260459DC694 /* Real.swift in Sources */, - 2B132F4EB4A9D60A8439EFAC1D0D6D2C /* Span.swift in Sources */, - 7F5D5AFA3C84AA582DEDC6A6C78E7533 /* Tensor.swift in Sources */, - D234F610A6025A894A8CF8971A8F96C0 /* TensorSlice.swift in Sources */, - 562D9F54656827753A037634D5385BFD /* TensorType.swift in Sources */, - CC420602CB84B73545CD09A3DAD3F638 /* Trigonometric.swift in Sources */, - 3E699E314F200C3EEF7C7E0D46E26B79 /* Upsurge-dummy.m in Sources */, - A8F199FA1C0D1AD05EADD8EFBC00592B /* Value.swift in Sources */, - BCA0250C524C4316B3D4D6415A4969C8 /* ValueArray.swift in Sources */, - 3C8CBA02B15729E98A0F63382FE6217B /* ValueArraySlice.swift in Sources */, + 9CFDD01A2D0AA56E4A6C72B232021B71 /* Pods-MLKit_Tests-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - DAACD664EAA3ACAA0A0B897994FBF48E /* Sources */ = { + E5B61EF4550B15D136D57EE7CA2DEF72 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3FFDB93012DF1EBF973430063D61C96D /* Callsite.swift in Sources */, - 508E5B8353068B37CA6F40E3D7B89D42 /* Closures.swift in Sources */, - F863E54F759068A89CD87B9121C7F6A0 /* Configuration.swift in Sources */, - BD782803F394A708E7D3223EBDE31C95 /* DSL.swift in Sources */, - F96CD569B97BF947F19270C6C1D0FA23 /* ErrorUtility.swift in Sources */, - 7C94AD7C4A4F54FB18623AD4E5CD64F7 /* Example.swift in Sources */, - BCCBC7CED6FB9D71D85D8044B209B09A /* ExampleGroup.swift in Sources */, - 646824AF5ADC1159EBC9CAC023BAED4E /* ExampleHooks.swift in Sources */, - B231D3FAB3CCEF59EC681C7C51C0AE56 /* ExampleMetadata.swift in Sources */, - 88FEF6149AF4FA0DEE3DBCBFD20BE64C /* Filter.swift in Sources */, - C9AAE13CC11B5370479EA08F706EA61F /* HooksPhase.swift in Sources */, - F6947DC02F61303F74AF8602F1A1BE68 /* NSBundle+CurrentTestBundle.swift in Sources */, - 8995462F1A16CFB4BB4B376A1DE531EA /* NSString+C99ExtendedIdentifier.swift in Sources */, - 59667A95671EEAF87FA2272CE0B01451 /* QCKDSL.m in Sources */, - FE877D0C3D6700F0C8E5CCC0C5020462 /* Quick-dummy.m in Sources */, - 387B27F0A4DD48F245FF12E5485FB9BE /* QuickConfiguration.m in Sources */, - 458ECBFAB660567138EFA52210058C36 /* QuickSelectedTestSuiteBuilder.swift in Sources */, - 4D339AFDC6B6AAA44BA5C0CD471B6EA2 /* QuickSpec.m in Sources */, - 46AAFE6E2E75D62AF8DFED367375002C /* QuickSpecBase.m in Sources */, - 6C52EF3CBF595A0DC903558A35E303D9 /* QuickTestSuite.swift in Sources */, - 35E498D7267B6961DED0706D43F883A0 /* SuiteHooks.swift in Sources */, - B18BBE44B0684143A1542A9ADC880697 /* URL+FileName.swift in Sources */, - 0B9A16DAD08AFA59EDD6058831216A70 /* World+DSL.swift in Sources */, - 96154D504405D81853EF3326A10CA05C /* World.swift in Sources */, - 18F58A2CDEFED6B5617F4944FC84DBEE /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */, + AE0F790B7BC316B1D8AE83B58753E213 /* Behavior.swift in Sources */, + FD175D10EE7DBD2C7A83BF8BD9125329 /* Callsite.swift in Sources */, + BB11FBD2359EF261F71F076ED124D8B1 /* Closures.swift in Sources */, + 4D0E207D7B0997A03091983024832904 /* Configuration.swift in Sources */, + 46C3577F6C8DB66064E956935F063CB7 /* DSL.swift in Sources */, + E679DCFB9825A7B5B92CF584273D20F7 /* ErrorUtility.swift in Sources */, + 6A6894A8FD8E3A149E513F76A752EC91 /* Example.swift in Sources */, + D61297130E9E49830B044AA557E4A06F /* ExampleGroup.swift in Sources */, + 3C1C9BDF15626EB1AF76EDD10A87F2CA /* ExampleHooks.swift in Sources */, + 13222A32A26429EB6E1D112C5F8B97D4 /* ExampleMetadata.swift in Sources */, + D60BCC22E506E252B7F4C6E9675D7B57 /* Filter.swift in Sources */, + CE0B2DB399E32E476CCC40B18DF1BD3E /* HooksPhase.swift in Sources */, + 22731B945A88C7E0BEE56C04EA79B854 /* NSBundle+CurrentTestBundle.swift in Sources */, + 36803D11BA838FB1E1D131AA6F366EB7 /* NSString+C99ExtendedIdentifier.swift in Sources */, + 8E3B0618CF9A19EE391875415CDD1E2E /* QCKDSL.m in Sources */, + 3623C7E6A6B2657435DC80924EB8DE60 /* Quick-dummy.m in Sources */, + 8995A017033F9847A868FA9B081471B7 /* QuickConfiguration.m in Sources */, + 9F05AD64FA1B9ED2EDD6C485C5E6D296 /* QuickSelectedTestSuiteBuilder.swift in Sources */, + A0A56298A62CC7D47428EAADCB13E913 /* QuickSpec.m in Sources */, + D0FF7942A83B866A85C4EEA65BE2A8BC /* QuickSpecBase.m in Sources */, + AF504059860A2519D681686DC8C56D5A /* QuickTestSuite.swift in Sources */, + 8F3D92A40D06F36E61FD7ED6FBEE69BC /* SuiteHooks.swift in Sources */, + 854787B57491875DFF74CBA89571C9F6 /* URL+FileName.swift in Sources */, + DA2554FF0F87BDD44B56650B7C483B50 /* World+DSL.swift in Sources */, + 6A85BF50303C56690DD0B2B66CBADDA0 /* World.swift in Sources */, + B3091203BBEFA70B87EAC5CCFB28E32C /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1269,6 +1289,18 @@ target = 28C1C0C2E20677EBC9884E8E60383F6C /* MachineLearningKit */; targetProxy = 9438A9C923DBE3D0619348D344A7421F /* PBXContainerItemProxy */; }; + 262565959319F45D1859827CB52E66D8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Quick; + target = 0C900B9C11E235F9DF95A64E8C83D049 /* Quick */; + targetProxy = 197D4E6B5F102611AC7352D8583E7BA3 /* PBXContainerItemProxy */; + }; + 54DE40E47A756BEA8F4E1F16710682CE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Nimble; + target = BA85E3619866E2EAA8CC3EDE21C659FC /* Nimble */; + targetProxy = 61B7CC3502E6878E7FB482C64CEF9454 /* PBXContainerItemProxy */; + }; 90DA5471E0E3538891588E48A4CB29A6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Upsurge; @@ -1281,519 +1313,548 @@ target = 6C57B4D688C9D6216427DD10ADDFFCB6 /* Upsurge */; targetProxy = 0514A879DA60A69D36EBAE4BF82733F3 /* PBXContainerItemProxy */; }; - F4E22DFEB546DDB30C129288CE1D0702 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Quick; - target = 405857F01F82B80417D1BCAA762E7FA5 /* Quick */; - targetProxy = A5D12A1484F74731661DDE4440445475 /* PBXContainerItemProxy */; - }; - FACCEFD04D031E45FBC293233B19F81C /* PBXTargetDependency */ = { + C2B0478F257BCC06196A231459EC4CF9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = Nimble; - target = 0921CC2F4398BE9A4F1CEACB30684B56 /* Nimble */; - targetProxy = 6261E54E70518E4B80DE3D3A4B3823C4 /* PBXContainerItemProxy */; + name = "Pods-MLKit_Example"; + target = 11214F2158317CCF8497B1AFC05251A3 /* Pods-MLKit_Example */; + targetProxy = 80173E14C71EB3A528D671C26839B22F /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 17B316A2899598BDD74C55E1B59D82FD /* Release */ = { + 199D972A13F2B4C56847F7A89CCA83BC /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CC698E9958DEF380C0198EAA773F7DFF /* Pods-MLKit_Example.release.xcconfig */; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Debug; + }; + 1B7BE1F6AF0EBCFD15F0D10C2C122C88 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D2BFE4634D330CC7BDB6FD050266645B /* Pods-MLKit_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; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "Target Support Files/Pods-MLKit_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-MLKit_Example/Pods-MLKit_Example.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_MLKit_Example; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 1F57ADE7C56706080006997E6C275DB3 /* Release */ = { + 3EF2A39388BC610E1725614C8974D8D6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 55F8E5E39CFFED8C8B0162606918FB20 /* MachineLearningKit.xcconfig */; + baseConfigurationReference = 9774CA86DF8D2DC26C4830B97504FBD6 /* 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; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/MachineLearningKit/MachineLearningKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/MachineLearningKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Nimble/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/MachineLearningKit/MachineLearningKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = MachineLearningKit; + MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; + PRODUCT_MODULE_NAME = Nimble; + PRODUCT_NAME = Nimble; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 3AE4BFD193087F0DEDCBBAB5132B0402 /* Release */ = { + 5443EAE217639430B12E710CD2C17550 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 617F2E0CEEF4C400A8D6EADD86F6145C /* Quick.xcconfig */; + baseConfigurationReference = 82120BC34AAA8690AB35CBC4292002FC /* Pods-MLKit_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; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Quick/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-MLKit_Tests/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"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = Quick; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MLKit_Tests/Pods-MLKit_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; - SWIFT_VERSION = 3.0; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 59088DD680854A1D5D3725EA8D8E1AE3 /* Release */ = { + 60B0B87B0EC1875934FA8FBFA62E8DD9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 440AC79C4CAC00E64494654CCFEB3615 /* Pods-MLKit_Tests.release.xcconfig */; + baseConfigurationReference = 8989F80BF9DE58885C888CAF78A4C095 /* Upsurge.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-MLKit_Tests/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Upsurge/Upsurge-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Upsurge/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-MLKit_Tests/Pods-MLKit_Tests.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_MLKit_Tests; + MODULEMAP_FILE = "Target Support Files/Upsurge/Upsurge.modulemap"; + PRODUCT_MODULE_NAME = Upsurge; + PRODUCT_NAME = Upsurge; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; - }; - 59B042A655B7C20CBAB90E385BF4E4C7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = NO; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - ONLY_ACTIVE_ARCH = YES; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - }; name = Debug; }; - 6E0EE5E4D9587D32D46FAB6E0C629563 /* Debug */ = { + 846BDF306D651C13C961DEAFD3774213 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 55F8E5E39CFFED8C8B0162606918FB20 /* MachineLearningKit.xcconfig */; + baseConfigurationReference = 943AC779D543443D52F1E0E5A33E7E8F /* MachineLearningKit.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/MachineLearningKit/MachineLearningKit-prefix.pch"; INFOPLIST_FILE = "Target Support Files/MachineLearningKit/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/MachineLearningKit/MachineLearningKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_MODULE_NAME = MachineLearningKit; PRODUCT_NAME = MachineLearningKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 7517CE46153100DA1635AF3CA5C55694 /* Debug */ = { + 8CDFD459644EDE319B67B65A790E9DD3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32AA223B57196F7790D905F38D2517BF /* Pods-MLKit_Tests.debug.xcconfig */; + baseConfigurationReference = F227CF09F2AD26717EECB3B56B8A901A /* 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; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-MLKit_Tests/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Quick/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + 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-MLKit_Tests/Pods-MLKit_Tests.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_MLKit_Tests; + 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_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 9BE117501B83DA19687D6FADCC4279F2 /* Debug */ = { + AC538AFD6E4DA8277040622A1D5617A1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED533B83CC472C5A00FECB4769AAC30A /* Nimble.xcconfig */; + baseConfigurationReference = B70FD9CD88E839C57AEB90CE095321E4 /* Pods-MLKit_Example.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; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Nimble/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-MLKit_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"; - MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = Nimble; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MLKit_Example/Pods-MLKit_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; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - B18A6CA3C5F89421CF2B850F71721DF9 /* Debug */ = { + C27FFC3800348A6208709B5327ED6588 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 636673BDA1F06E469643F565D84270B5 /* Pods-MLKit_Example.debug.xcconfig */; + baseConfigurationReference = 9774CA86DF8D2DC26C4830B97504FBD6 /* 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; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-MLKit_Example/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Nimble/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + 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-MLKit_Example/Pods-MLKit_Example.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_MLKit_Example; + 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_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - B7324857C38B065FEB1EEE3105C2367A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - B8A27CEE87BBFB37CB5E8AB07A8D2FCA /* Debug */ = { + C92CFF6E7D20E5F339324FCF41891631 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D9452A9050B54245FBAA633769A8E911 /* Upsurge.xcconfig */; + baseConfigurationReference = 943AC779D543443D52F1E0E5A33E7E8F /* MachineLearningKit.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Upsurge/Upsurge-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Upsurge/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/MachineLearningKit/MachineLearningKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/MachineLearningKit/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/Upsurge/Upsurge.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = Upsurge; + MODULEMAP_FILE = "Target Support Files/MachineLearningKit/MachineLearningKit.modulemap"; + PRODUCT_MODULE_NAME = MachineLearningKit; + PRODUCT_NAME = MachineLearningKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - BB15404BBBD24D84297323F3F2DF19DB /* Release */ = { + EBB4D54E5C49260056F690F4D42F78B3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D9452A9050B54245FBAA633769A8E911 /* Upsurge.xcconfig */; + baseConfigurationReference = 103DE453E6596254E367B645D93B900C /* Pods-MLKit_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; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Upsurge/Upsurge-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Upsurge/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-MLKit_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"; - MODULEMAP_FILE = "Target Support Files/Upsurge/Upsurge.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = Upsurge; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-MLKit_Tests/Pods-MLKit_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; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - DA47FD752D5D7A33A663F9B51F4B3C69 /* Debug */ = { + F4E7DE2A892CD33D33BB3FD481134003 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 617F2E0CEEF4C400A8D6EADD86F6145C /* Quick.xcconfig */; + baseConfigurationReference = F227CF09F2AD26717EECB3B56B8A901A /* 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; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; INFOPLIST_FILE = "Target Support Files/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"; - MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_MODULE_NAME = Quick; PRODUCT_NAME = Quick; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - EF02B74193B9D2E215CD4A2203BDABE7 /* Release */ = { + F884FBCF1A12E7B94B7E36CC82175FFC /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED533B83CC472C5A00FECB4769AAC30A /* Nimble.xcconfig */; + baseConfigurationReference = 8989F80BF9DE58885C888CAF78A4C095 /* Upsurge.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Nimble/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Upsurge/Upsurge-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Upsurge/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/Nimble/Nimble.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = Nimble; + MODULEMAP_FILE = "Target Support Files/Upsurge/Upsurge.modulemap"; + PRODUCT_MODULE_NAME = Upsurge; + PRODUCT_NAME = Upsurge; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; + FDB2FC4A1E5891381CD9D922145497F1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_RELEASE=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 1689072BD2C522D2F716D50D402AEC59 /* Build configuration list for PBXNativeTarget "Upsurge" */ = { isa = XCConfigurationList; buildConfigurations = ( - B8A27CEE87BBFB37CB5E8AB07A8D2FCA /* Debug */, - BB15404BBBD24D84297323F3F2DF19DB /* Release */, + 60B0B87B0EC1875934FA8FBFA62E8DD9 /* Debug */, + F884FBCF1A12E7B94B7E36CC82175FFC /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1801,8 +1862,8 @@ 1E2225DCCFCA6849974B71B670645A6C /* Build configuration list for PBXNativeTarget "MachineLearningKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 6E0EE5E4D9587D32D46FAB6E0C629563 /* Debug */, - 1F57ADE7C56706080006997E6C275DB3 /* Release */, + C92CFF6E7D20E5F339324FCF41891631 /* Debug */, + 846BDF306D651C13C961DEAFD3774213 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1810,44 +1871,44 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 59B042A655B7C20CBAB90E385BF4E4C7 /* Debug */, - B7324857C38B065FEB1EEE3105C2367A /* Release */, + 199D972A13F2B4C56847F7A89CCA83BC /* Debug */, + FDB2FC4A1E5891381CD9D922145497F1 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4521CA563498BBBB8638765DDF2E0D43 /* Build configuration list for PBXNativeTarget "Quick" */ = { + 4F29BCC7A631798DD7E69AAB9EB114C9 /* Build configuration list for PBXNativeTarget "Quick" */ = { isa = XCConfigurationList; buildConfigurations = ( - DA47FD752D5D7A33A663F9B51F4B3C69 /* Debug */, - 3AE4BFD193087F0DEDCBBAB5132B0402 /* Release */, + 8CDFD459644EDE319B67B65A790E9DD3 /* Debug */, + F4E7DE2A892CD33D33BB3FD481134003 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 761C67FF258DB3BE6B2D4612FA9938E8 /* Build configuration list for PBXNativeTarget "Nimble" */ = { + 8FC360693D1D0CDE34D2234C9BEDB081 /* Build configuration list for PBXNativeTarget "Nimble" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9BE117501B83DA19687D6FADCC4279F2 /* Debug */, - EF02B74193B9D2E215CD4A2203BDABE7 /* Release */, + C27FFC3800348A6208709B5327ED6588 /* Debug */, + 3EF2A39388BC610E1725614C8974D8D6 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 82174FC6C6E04470F8797B33ACE22503 /* Build configuration list for PBXNativeTarget "Pods-MLKit_Tests" */ = { + C30EA1DD6F77AFEF81C24D0127F979A4 /* Build configuration list for PBXNativeTarget "Pods-MLKit_Example" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7517CE46153100DA1635AF3CA5C55694 /* Debug */, - 59088DD680854A1D5D3725EA8D8E1AE3 /* Release */, + AC538AFD6E4DA8277040622A1D5617A1 /* Debug */, + 1B7BE1F6AF0EBCFD15F0D10C2C122C88 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C30EA1DD6F77AFEF81C24D0127F979A4 /* Build configuration list for PBXNativeTarget "Pods-MLKit_Example" */ = { + C5C4F6359CB2CD785308C45900AD3C1D /* Build configuration list for PBXNativeTarget "Pods-MLKit_Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - B18A6CA3C5F89421CF2B850F71721DF9 /* Debug */, - 17B316A2899598BDD74C55E1B59D82FD /* Release */, + EBB4D54E5C49260056F690F4D42F78B3 /* Debug */, + 5443EAE217639430B12E710CD2C17550 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Example/Pods/Quick/Sources/Quick/Behavior.swift b/Example/Pods/Quick/Sources/Quick/Behavior.swift new file mode 100644 index 0000000..1d98702 --- /dev/null +++ b/Example/Pods/Quick/Sources/Quick/Behavior.swift @@ -0,0 +1,17 @@ +/** + 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 { + + open static 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`). + + - parameter aContext: A closure that, when evaluated, returns a `Context` instance that provide the information on the subject. + */ + open class func spec(_ aContext: @escaping () -> Context) {} +} diff --git a/Example/Pods/Quick/Sources/Quick/Callsite.swift b/Example/Pods/Quick/Sources/Quick/Callsite.swift index bb5cc0c..f5e3711 100644 --- a/Example/Pods/Quick/Sources/Quick/Callsite.swift +++ b/Example/Pods/Quick/Sources/Quick/Callsite.swift @@ -1,10 +1,23 @@ import Foundation +// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` +// does not work as expected. +#if swift(>=3.2) + #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objcMembers + public class _CallsiteBase: NSObject {} + #else + public class _CallsiteBase: NSObject {} + #endif +#else +public class _CallsiteBase: NSObject {} +#endif + /** An object encapsulating the file and line number at which a particular example is defined. */ -final public class Callsite: NSObject { +final public class Callsite: _CallsiteBase { /** The absolute path of the file in which an example is defined. */ diff --git a/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift b/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift index 583651b..dbb95f1 100644 --- a/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift +++ b/Example/Pods/Quick/Sources/Quick/Configuration/Configuration.swift @@ -72,7 +72,7 @@ final public class Configuration: NSObject { provided with metadata on the example that the closure is being run prior to. */ -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) @objc(beforeEachWithMetadata:) public func beforeEach(_ closure: @escaping BeforeExampleWithMetadataClosure) { exampleHooks.appendBefore(closure) @@ -109,7 +109,7 @@ final public class Configuration: NSObject { is provided with metadata on the example that the closure is being run after. */ -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) @objc(afterEachWithMetadata:) public func afterEach(_ closure: @escaping AfterExampleWithMetadataClosure) { exampleHooks.appendAfter(closure) diff --git a/Example/Pods/Quick/Sources/Quick/DSL/DSL.swift b/Example/Pods/Quick/Sources/Quick/DSL/DSL.swift index 3da2c42..94f20c5 100644 --- a/Example/Pods/Quick/Sources/Quick/DSL/DSL.swift +++ b/Example/Pods/Quick/Sources/Quick/DSL/DSL.swift @@ -167,6 +167,22 @@ public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: String World.sharedWorld.itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line) } +/** + Inserts the examples defined using a `Behavior` into the current example group. + The shared examples are executed at this location, as if they were written out manually. + This function also passes a strongly-typed context that can be evaluated to give the shared examples extra information on the subject of the example. + + - parameter behavior: The type of `Behavior` class defining the example group to be executed. + - parameter context: A closure that, when evaluated, returns an instance of `Behavior`'s context type to provide its example group with extra information on the subject of the example. + - parameter flags: A mapping of string keys to booleans that can be used to filter examples or example groups. + Empty by default. + - parameter file: The absolute path to the file containing the current example group. A sensible default is provided. + - parameter line: The line containing the current example group. A sensible default is provided. + */ +public func itBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, context: @escaping () -> C) { + World.sharedWorld.itBehavesLike(behavior, context: context, flags: flags, file: file, line: line) +} + /** Defines an example or example group that should not be executed. Use `pending` to temporarily disable examples or groups that should not be run yet. @@ -202,6 +218,13 @@ public func xit(_ description: String, flags: FilterFlags = [:], file: String = World.sharedWorld.xit(description, flags: flags, file: file, line: line, closure: closure) } +/** + Use this to quicklu mark an `itBehavesLike` closure as pending. + This disables the example group defined by this behavior and ensures the code within is never run. +*/ +public func xitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, context: @escaping () -> C) { + World.sharedWorld.xitBehavesLike(behavior, context: context, flags: flags, file: file, line: line) +} /** Use this to quickly focus a `describe` closure, focusing the examples in the closure. If any examples in the test suite are focused, only those examples are executed. @@ -239,3 +262,10 @@ public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: Strin public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, sharedExampleContext: @escaping SharedExampleContext) { World.sharedWorld.fitBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line) } + +/** + Use this to quickly focus on `itBehavesLike` closure. + */ +public func fitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, context: @escaping () -> C) { + World.sharedWorld.fitBehavesLike(behavior, context: context, flags: flags, file: file, line: line) +} diff --git a/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift b/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift index 127ca54..942c2e6 100644 --- a/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift +++ b/Example/Pods/Quick/Sources/Quick/DSL/World+DSL.swift @@ -56,7 +56,7 @@ extension World { currentExampleGroup.hooks.appendBefore(closure) } -#if _runtime(_ObjC) +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE @objc(beforeEachWithMetadata:) internal func beforeEach(closure: @escaping BeforeExampleWithMetadataClosure) { currentExampleGroup.hooks.appendBefore(closure) @@ -74,7 +74,7 @@ extension World { currentExampleGroup.hooks.appendAfter(closure) } -#if _runtime(_ObjC) +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE @objc(afterEachWithMetadata:) internal func afterEach(closure: @escaping AfterExampleWithMetadataClosure) { currentExampleGroup.hooks.appendAfter(closure) @@ -85,6 +85,7 @@ extension World { } #endif + @nonobjc internal func it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { if beforesCurrentlyExecuting { raiseError("'it' cannot be used inside 'beforeEach', 'it' may only be used inside 'context' or 'describe'. ") @@ -100,18 +101,21 @@ extension World { currentExampleGroup.appendExample(example) } + @nonobjc internal func fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> 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: String, line: UInt, closure: @escaping () -> Void) { var pendingFlags = flags pendingFlags[Filter.pending] = true self.it(description, flags: pendingFlags, file: file, line: line, closure: closure) } + @nonobjc internal func itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { guard currentExampleMetadata == nil else { raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'. ") @@ -131,30 +135,61 @@ extension World { } } + @nonobjc internal func fitBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { var focusedFlags = flags focusedFlags[Filter.focused] = true self.itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: focusedFlags, file: file, line: line) } -#if _runtime(_ObjC) + internal func itBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: String, line: UInt) { + guard currentExampleMetadata == nil else { + 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 + let group = ExampleGroup(description: behavior.name, flags: flags) + currentExampleGroup.appendExampleGroup(group) + performWithCurrentExampleGroup(group) { + closure(context) + } + + group.walkDownExamples { (example: Example) in + example.isSharedExample = true + example.callsite = callsite + } + } + + internal func fitBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: String, line: UInt) { + var focusedFlags = flags + focusedFlags[Filter.focused] = true + self.itBehavesLike(behavior, context: context, flags: focusedFlags, file: file, line: line) + } + + internal func xitBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: String, line: UInt) { + var pendingFlags = flags + pendingFlags[Filter.pending] = true + self.itBehavesLike(behavior, context: context, flags: pendingFlags, file: file, line: line) + } + +#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE @objc(itWithDescription:flags:file:line:closure:) - private func objc_it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func objc_it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { it(description, flags: flags, file: file, line: line, closure: closure) } @objc(fitWithDescription:flags:file:line:closure:) - private func objc_fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func objc_fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { fit(description, flags: flags, file: file, line: line, closure: closure) } @objc(xitWithDescription:flags:file:line:closure:) - private func objc_xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func objc_xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { xit(description, flags: flags, file: file, line: line, closure: closure) } @objc(itBehavesLikeSharedExampleNamed:sharedExampleContext:flags:file:line:) - private func objc_itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { + internal func objc_itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line) } #endif diff --git a/Example/Pods/Quick/Sources/Quick/ErrorUtility.swift b/Example/Pods/Quick/Sources/Quick/ErrorUtility.swift index 8405a81..155fefd 100644 --- a/Example/Pods/Quick/Sources/Quick/ErrorUtility.swift +++ b/Example/Pods/Quick/Sources/Quick/ErrorUtility.swift @@ -1,7 +1,7 @@ import Foundation internal func raiseError(_ message: String) -> Never { -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) NSException(name: .internalInconsistencyException, reason: message, userInfo: nil).raise() #endif diff --git a/Example/Pods/Quick/Sources/Quick/Example.swift b/Example/Pods/Quick/Sources/Quick/Example.swift index 56b3303..cf7b4a3 100644 --- a/Example/Pods/Quick/Sources/Quick/Example.swift +++ b/Example/Pods/Quick/Sources/Quick/Example.swift @@ -1,12 +1,26 @@ import Foundation private var numberOfExamplesRun = 0 +private var numberOfIncludedExamples = 0 + +// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` +// does not work as expected. +#if swift(>=3.2) + #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objcMembers + public class _ExampleBase: NSObject {} + #else + public class _ExampleBase: NSObject {} + #endif +#else +public class _ExampleBase: NSObject {} +#endif /** Examples, defined with the `it` function, use assertions to demonstrate how code should behave. These are like "tests" in XCTest. */ -final public class Example: NSObject { +final public class Example: _ExampleBase { /** A boolean indicating whether the example is a shared example; i.e.: whether it is an example defined with `itBehavesLike`. @@ -57,12 +71,19 @@ final public class Example: NSObject { public func run() { let world = World.sharedWorld + if numberOfIncludedExamples == 0 { + numberOfIncludedExamples = world.includedExampleCount + } + if numberOfExamplesRun == 0 { world.suiteHooks.executeBefores() } let exampleMetadata = ExampleMetadata(example: self, exampleIndex: numberOfExamplesRun) world.currentExampleMetadata = exampleMetadata + defer { + world.currentExampleMetadata = nil + } world.exampleHooks.executeBefores(exampleMetadata) group!.phase = .beforesExecuting @@ -82,7 +103,7 @@ final public class Example: NSObject { numberOfExamplesRun += 1 - if !world.isRunningAdditionalSuites && numberOfExamplesRun >= world.includedExampleCount { + if !world.isRunningAdditionalSuites && numberOfExamplesRun >= numberOfIncludedExamples { world.suiteHooks.executeAfters() } } diff --git a/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift b/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift index ca38356..129bed0 100644 --- a/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift +++ b/Example/Pods/Quick/Sources/Quick/ExampleGroup.swift @@ -32,20 +32,16 @@ final public class ExampleGroup: NSObject { or to any of its descendant example groups. */ public var examples: [Example] { - var examples = childExamples - for group in childGroups { - examples.append(contentsOf: group.examples) - } - return examples + return childExamples + childGroups.flatMap { $0.examples } } internal var name: String? { - if let parent = parent { - guard let name = parent.name else { return description } - return "\(name), \(description)" - } else { + guard let parent = parent else { return isInternalRootExampleGroup ? nil : description } + + guard let name = parent.name else { return description } + return "\(name), \(description)" } internal var filterFlags: FilterFlags { diff --git a/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift b/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift index e7510f7..3dd28ab 100644 --- a/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift +++ b/Example/Pods/Quick/Sources/Quick/ExampleMetadata.swift @@ -1,11 +1,24 @@ import Foundation +// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` +// does not work as expected. +#if swift(>=3.2) + #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objcMembers + public class _ExampleMetadataBase: NSObject {} + #else + public class _ExampleMetadataBase: NSObject {} + #endif +#else +public class _ExampleMetadataBase: NSObject {} +#endif + /** A class that encapsulates information about an example, including the index at which the example was executed, as well as the example itself. */ -final public class ExampleMetadata: NSObject { +final public class ExampleMetadata: _ExampleMetadataBase { /** The example for which this metadata was collected. */ diff --git a/Example/Pods/Quick/Sources/Quick/Filter.swift b/Example/Pods/Quick/Sources/Quick/Filter.swift index d452efe..da137f8 100644 --- a/Example/Pods/Quick/Sources/Quick/Filter.swift +++ b/Example/Pods/Quick/Sources/Quick/Filter.swift @@ -1,5 +1,18 @@ import Foundation +// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` +// does not work as expected. +#if swift(>=3.2) + #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objcMembers + public class _FilterBase: NSObject {} + #else + public class _FilterBase: NSObject {} + #endif +#else +public class _FilterBase: NSObject {} +#endif + /** A mapping of string keys to booleans that can be used to filter examples or example groups. For example, a "focused" @@ -11,7 +24,7 @@ public typealias FilterFlags = [String: Bool] A namespace for filter flag keys, defined primarily to make the keys available in Objective-C. */ -final public class Filter: NSObject { +final public class Filter: _FilterBase { /** Example and example groups with [Focused: true] are included in test runs, excluding all other examples without this flag. Use this to only run one or diff --git a/Example/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift b/Example/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift index 994dd72..d7a1442 100644 --- a/Example/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift +++ b/Example/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift @@ -1,4 +1,4 @@ -#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) import Foundation diff --git a/Example/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift b/Example/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift index 4514863..8d67d8d 100644 --- a/Example/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift +++ b/Example/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift @@ -1,8 +1,7 @@ -#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) import Foundation -public extension NSString { - +extension NSString { private static var invalidCharacters: CharacterSet = { var invalidCharacters = CharacterSet() @@ -12,7 +11,7 @@ public extension NSString { .controlCharacters, .punctuationCharacters, .nonBaseCharacters, - .symbols, + .symbols ] for invalidSet in invalidCharacterSets { @@ -22,12 +21,29 @@ public extension NSString { return invalidCharacters }() + /// This API is not meant to be used outside Quick, so will be unavaialbe in + /// a next major version. @objc(qck_c99ExtendedIdentifier) - var c99ExtendedIdentifier: String { + public var c99ExtendedIdentifier: String { let validComponents = components(separatedBy: NSString.invalidCharacters) let result = validComponents.joined(separator: "_") return result.isEmpty ? "_" : result } } + +/// Extension methods or properties for NSObject subclasses are invisible from +/// the Objective-C runtime on static linking unless the consumers add `-ObjC` +/// linker flag, so let's make a wrapper class to mitigate that situation. +/// +/// See: https://github.com/Quick/Quick/issues/785 and https://github.com/Quick/Quick/pull/803 +@objc +class QCKObjCStringUtils: NSObject { + override private init() {} + + @objc + static func c99ExtendedIdentifier(from string: String) -> String { + return string.c99ExtendedIdentifier + } +} #endif diff --git a/Example/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift b/Example/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift index d49e859..415b680 100644 --- a/Example/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift +++ b/Example/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift @@ -1,4 +1,4 @@ -#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) import Foundation /** diff --git a/Example/Pods/Quick/Sources/Quick/QuickTestSuite.swift b/Example/Pods/Quick/Sources/Quick/QuickTestSuite.swift index 0cb5187..0fe76a7 100644 --- a/Example/Pods/Quick/Sources/Quick/QuickTestSuite.swift +++ b/Example/Pods/Quick/Sources/Quick/QuickTestSuite.swift @@ -1,4 +1,4 @@ -#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) import XCTest @@ -36,17 +36,17 @@ public class QuickTestSuite: XCTestSuite { It is expected that the first call should return a valid test suite, and all subsequent calls should return `nil`. */ + @objc public static func selectedTestSuite(forTestCaseWithName name: String) -> QuickTestSuite? { guard let builder = QuickSelectedTestSuiteBuilder(forTestCaseWithName: name) else { return nil } - if builtTestSuites.contains(builder.testSuiteClassName) { - return nil - } else { - builtTestSuites.insert(builder.testSuiteClassName) + let (inserted, _) = builtTestSuites.insert(builder.testSuiteClassName) + if inserted { return builder.buildTestSuite() + } else { + return nil } } - } #endif diff --git a/Example/Pods/Quick/Sources/Quick/World.swift b/Example/Pods/Quick/Sources/Quick/World.swift index fb5ec25..59ea7e6 100644 --- a/Example/Pods/Quick/Sources/Quick/World.swift +++ b/Example/Pods/Quick/Sources/Quick/World.swift @@ -12,6 +12,19 @@ public typealias SharedExampleContext = () -> [String: Any] */ public typealias SharedExampleClosure = (@escaping SharedExampleContext) -> Void +// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` +// does not work as expected. +#if swift(>=3.2) + #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + @objcMembers + internal class _WorldBase: NSObject {} + #else + internal class _WorldBase: NSObject {} + #endif +#else +internal class _WorldBase: NSObject {} +#endif + /** A collection of state Quick builds up in order to work its magic. World is primarily responsible for maintaining a mapping of QuickSpec @@ -23,7 +36,7 @@ public typealias SharedExampleClosure = (@escaping SharedExampleContext) -> Void You may configure how Quick behaves by calling the -[World configure:] method from within an overridden +[QuickConfiguration configure:] method. */ -final internal class World: NSObject { +final internal class World: _WorldBase { /** The example group that is currently being run. The DSL requires that this group is correctly set in order to build a @@ -44,7 +57,7 @@ final internal class World: NSObject { within this test suite. This is only true within the context of Quick functional tests. */ -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) // Convention of generating Objective-C selector has been changed on Swift 3 @objc(isRunningAdditionalSuites) internal var isRunningAdditionalSuites = false @@ -64,6 +77,7 @@ final internal class World: NSObject { // MARK: Singleton Constructor private override init() {} + static let sharedWorld = World() // MARK: Public Interface @@ -144,9 +158,9 @@ final internal class World: NSObject { } } -#if _runtime(_ObjC) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) @objc(examplesForSpecClass:) - private func objc_examples(_ specClass: AnyClass) -> [Example] { + internal func objc_examples(_ specClass: AnyClass) -> [Example] { return examples(specClass) } #endif diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m b/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m index 937b818..17beaa7 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/Configuration/QuickConfiguration.m @@ -1,7 +1,12 @@ #import "QuickConfiguration.h" -#import "World.h" #import +#if __has_include("Quick-Swift.h") +#import "Quick-Swift.h" +#else +#import +#endif + typedef void (^QCKClassEnumerationBlock)(Class klass); /** diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m b/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m index 10e8a3d..624832e 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m @@ -1,6 +1,10 @@ #import "QCKDSL.h" -#import "World.h" -#import "World+DSL.h" + +#if __has_include("Quick-Swift.h") +#import "Quick-Swift.h" +#else +#import +#endif void qck_beforeSuite(QCKDSLEmptyBlock closure) { [[World sharedWorld] beforeSuite:closure]; diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/World+DSL.h b/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/World+DSL.h deleted file mode 100644 index a3b8524..0000000 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/DSL/World+DSL.h +++ /dev/null @@ -1,20 +0,0 @@ -#import - -@interface World (SWIFT_EXTENSION(Quick)) -- (void)beforeSuite:(void (^ __nonnull)(void))closure; -- (void)afterSuite:(void (^ __nonnull)(void))closure; -- (void)sharedExamples:(NSString * __nonnull)name closure:(void (^ __nonnull)(NSDictionary * __nonnull (^ __nonnull)(void)))closure; -- (void)describe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)context:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)fdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)xdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)beforeEach:(void (^ __nonnull)(void))closure; -- (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -- (void)afterEach:(void (^ __nonnull)(void))closure; -- (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -- (void)itWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)fitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)xitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)itBehavesLikeSharedExampleNamed:(NSString * __nonnull)name sharedExampleContext:(NSDictionary * __nonnull (^ __nonnull)(void))sharedExampleContext flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSUInteger)line; -- (void)pending:(NSString * __nonnull)description closure:(void (^ __nonnull)(void))closure; -@end diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h b/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h index 105a97e..21bc772 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h @@ -47,4 +47,10 @@ */ - (void)spec; +/** + Returns the currently executing spec. Use in specs that require XCTestCase + methds, e.g. expectationWithDescription. +*/ +@property (class, nonatomic, readonly) QuickSpec *current; + @end diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m b/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m index 4891679..ed70d35 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m @@ -1,7 +1,11 @@ #import "QuickSpec.h" #import "QuickConfiguration.h" -#import "World.h" + +#if __has_include("Quick-Swift.h") +#import "Quick-Swift.h" +#else #import +#endif static QuickSpec *currentSpec = nil; @@ -75,6 +79,10 @@ + (NSArray *)testInvocations { - (void)spec { } ++ (QuickSpec*) current { + return currentSpec; +} + #pragma mark - Internal Methods /** @@ -101,8 +109,8 @@ + (SEL)addInstanceMethodForExample:(Example *)example classSelectorNames:(NSMuta }); const char *types = [[NSString stringWithFormat:@"%s%s%s", @encode(void), @encode(id), @encode(SEL)] UTF8String]; - - NSString *originalName = example.name.qck_c99ExtendedIdentifier; + + NSString *originalName = [QCKObjCStringUtils c99ExtendedIdentifierFrom:example.name]; NSString *selectorName = originalName; NSUInteger i = 2; diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/World.h b/Example/Pods/Quick/Sources/QuickObjectiveC/World.h deleted file mode 100644 index e638cf6..0000000 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/World.h +++ /dev/null @@ -1,18 +0,0 @@ -#import - -@class ExampleGroup; -@class ExampleMetadata; - -SWIFT_CLASS("_TtC5Quick5World") -@interface World - -@property (nonatomic) ExampleGroup * __nullable currentExampleGroup; -@property (nonatomic) ExampleMetadata * __nullable currentExampleMetadata; -@property (nonatomic) BOOL isRunningAdditionalSuites; -+ (World * __nonnull)sharedWorld; -- (void)configure:(void (^ __nonnull)(Configuration * __nonnull))closure; -- (void)finalizeConfiguration; -- (ExampleGroup * __nonnull)rootExampleGroupForSpecClass:(Class __nonnull)cls; -- (NSArray * __nonnull)examplesForSpecClass:(Class __nonnull)specClass; -- (void)performWithCurrentExampleGroup:(ExampleGroup * __nonnull)group closure:(void (^ __nonnull)(void))closure; -@end diff --git a/Example/Pods/Quick/Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m b/Example/Pods/Quick/Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m index e49939e..ae63036 100644 --- a/Example/Pods/Quick/Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m +++ b/Example/Pods/Quick/Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m @@ -1,6 +1,11 @@ #import #import + +#if __has_include("Quick-Swift.h") +#import "Quick-Swift.h" +#else #import +#endif @interface XCTestSuite (QuickTestSuiteBuilder) @end diff --git a/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h b/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h index 69e96cc..8881ca0 100644 --- a/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h +++ b/Example/Pods/Quick/Sources/QuickSpecBase/include/QuickSpecBase.h @@ -1,5 +1,5 @@ -@import Foundation; -@import XCTest; +#import +#import @interface _QuickSelectorWrapper : NSObject - (instancetype)initWithSelector:(SEL)selector; diff --git a/Example/Pods/Target Support Files/MachineLearningKit/Info.plist b/Example/Pods/Target Support Files/MachineLearningKit/Info.plist index d79d927..afb198f 100644 --- a/Example/Pods/Target Support Files/MachineLearningKit/Info.plist +++ b/Example/Pods/Target Support Files/MachineLearningKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.1.7 + 0.1.8 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/MachineLearningKit/MachineLearningKit.xcconfig b/Example/Pods/Target Support Files/MachineLearningKit/MachineLearningKit.xcconfig index c8b98d9..fe47eea 100644 --- a/Example/Pods/Target Support Files/MachineLearningKit/MachineLearningKit.xcconfig +++ b/Example/Pods/Target Support Files/MachineLearningKit/MachineLearningKit.xcconfig @@ -1,11 +1,10 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Upsurge" +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "MapKit" -framework "UIKit" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Example/Pods/Target Support Files/Nimble/Info.plist b/Example/Pods/Target Support Files/Nimble/Info.plist index 5f6d93f..a49902c 100644 --- a/Example/Pods/Target Support Files/Nimble/Info.plist +++ b/Example/Pods/Target Support Files/Nimble/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.0.1 + 7.1.3 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 4b43df9..3a2c2c8 100644 --- a/Example/Pods/Target Support Files/Nimble/Nimble-umbrella.h +++ b/Example/Pods/Target Support Files/Nimble/Nimble-umbrella.h @@ -10,13 +10,14 @@ #endif #endif -#import "CwlCatchException.h" -#import "CwlCatchBadInstruction.h" -#import "mach_excServer.h" #import "Nimble.h" #import "DSL.h" #import "NMBExceptionCapture.h" #import "NMBStringify.h" +#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 12698c0..ee7d52f 100644 --- a/Example/Pods/Target Support Files/Nimble/Nimble.xcconfig +++ b/Example/Pods/Target Support Files/Nimble/Nimble.xcconfig @@ -1,12 +1,12 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Nimble +APPLICATION_EXTENSION_API_ONLY = YES +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Nimble ENABLE_BITCODE = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -OTHER_LDFLAGS = -weak-lswiftXCTest -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) +OTHER_LDFLAGS = $(inherited) -Xlinker -no_application_extension -weak-lswiftXCTest -weak_framework "XCTest" +OTHER_SWIFT_FLAGS = $(inherited) -suppress-warnings $(inherited) "-D" "COCOAPODS" +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/Nimble PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-frameworks.sh index 2fad50d..c6eb500 100755 --- a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-frameworks.sh @@ -1,11 +1,28 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then + # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy + # frameworks to, so exit 0 (signalling the script phase was successful). + exit 0 +fi echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" +COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -23,9 +40,9 @@ install_framework() source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,12 +71,40 @@ install_framework() fi } +# Copies and strips a vendored dSYM +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { - if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then + if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'" if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then code_sign_cmd="$code_sign_cmd &" @@ -72,11 +117,19 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + for arch in $binary_archs; do + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" @@ -85,16 +138,17 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/MachineLearningKit/MachineLearningKit.framework" - install_framework "$BUILT_PRODUCTS_DIR/Upsurge/Upsurge.framework" + install_framework "${BUILT_PRODUCTS_DIR}/MachineLearningKit/MachineLearningKit.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Upsurge/Upsurge.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/MachineLearningKit/MachineLearningKit.framework" - install_framework "$BUILT_PRODUCTS_DIR/Upsurge/Upsurge.framework" + install_framework "${BUILT_PRODUCTS_DIR}/MachineLearningKit/MachineLearningKit.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Upsurge/Upsurge.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-resources.sh b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-resources.sh index 4602c68..345301f 100755 --- a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-resources.sh +++ b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example-resources.sh @@ -1,5 +1,13 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then + # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy + # resources to, so exit 0 (signalling the script phase was successful). + exit 0 +fi mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -8,7 +16,11 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt XCASSET_FILES=() -case "${TARGETED_DEVICE_FAMILY}" in +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +case "${TARGETED_DEVICE_FAMILY:-}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" ;; @@ -21,6 +33,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 3) TARGET_DEVICE_ARGS="--target-device tv" ;; + 4) + TARGET_DEVICE_ARGS="--target-device watch" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; @@ -41,29 +56,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -71,7 +86,7 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" || true echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac @@ -85,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then fi rm -f "$RESOURCES_TO_COPY" -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ] then # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) @@ -95,5 +110,9 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + else + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist" + fi fi diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.debug.xcconfig index cfd5698..b4f4c56 100644 --- a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.debug.xcconfig @@ -1,10 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit" "$PODS_CONFIGURATION_BUILD_DIR/Upsurge" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit" "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Upsurge/Upsurge.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge/Upsurge.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "MachineLearningKit" -framework "Upsurge" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.release.xcconfig b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.release.xcconfig index cfd5698..b4f4c56 100644 --- a/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MLKit_Example/Pods-MLKit_Example.release.xcconfig @@ -1,10 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit" "$PODS_CONFIGURATION_BUILD_DIR/Upsurge" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit" "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Upsurge/Upsurge.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge/Upsurge.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "MachineLearningKit" -framework "Upsurge" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-frameworks.sh b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-frameworks.sh index 667ce7c..fe9c268 100755 --- a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-frameworks.sh @@ -1,11 +1,28 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then + # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy + # frameworks to, so exit 0 (signalling the script phase was successful). + exit 0 +fi echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" +COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -23,9 +40,9 @@ install_framework() source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,12 +71,40 @@ install_framework() fi } +# Copies and strips a vendored dSYM +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { - if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then + if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'" if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then code_sign_cmd="$code_sign_cmd &" @@ -72,11 +117,19 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + for arch in $binary_archs; do + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" @@ -85,16 +138,17 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/Nimble/Nimble.framework" - install_framework "$BUILT_PRODUCTS_DIR/Quick/Quick.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/Nimble/Nimble.framework" - install_framework "$BUILT_PRODUCTS_DIR/Quick/Quick.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-resources.sh b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-resources.sh index 4602c68..345301f 100755 --- a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-resources.sh +++ b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests-resources.sh @@ -1,5 +1,13 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then + # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy + # resources to, so exit 0 (signalling the script phase was successful). + exit 0 +fi mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -8,7 +16,11 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt XCASSET_FILES=() -case "${TARGETED_DEVICE_FAMILY}" in +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + +case "${TARGETED_DEVICE_FAMILY:-}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" ;; @@ -21,6 +33,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 3) TARGET_DEVICE_ARGS="--target-device tv" ;; + 4) + TARGET_DEVICE_ARGS="--target-device watch" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; @@ -41,29 +56,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -71,7 +86,7 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" || true echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac @@ -85,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then fi rm -f "$RESOURCES_TO_COPY" -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ] then # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) @@ -95,5 +110,9 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + else + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist" + fi fi diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.debug.xcconfig index 01156eb..d01dc5e 100644 --- a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.debug.xcconfig @@ -1,10 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "$PODS_CONFIGURATION_BUILD_DIR/Nimble" "$PODS_CONFIGURATION_BUILD_DIR/Quick" "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit" "$PODS_CONFIGURATION_BUILD_DIR/Upsurge" +FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "${PODS_CONFIGURATION_BUILD_DIR}/Nimble" "${PODS_CONFIGURATION_BUILD_DIR}/Quick" "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit" "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Nimble/Nimble.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Quick/Quick.framework/Headers" $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Upsurge/Upsurge.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Nimble/Nimble.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Quick/Quick.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge/Upsurge.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "Nimble" -framework "Quick" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.release.xcconfig b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.release.xcconfig index 01156eb..d01dc5e 100644 --- a/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MLKit_Tests/Pods-MLKit_Tests.release.xcconfig @@ -1,10 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "$PODS_CONFIGURATION_BUILD_DIR/Nimble" "$PODS_CONFIGURATION_BUILD_DIR/Quick" "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit" "$PODS_CONFIGURATION_BUILD_DIR/Upsurge" +FRAMEWORK_SEARCH_PATHS = $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks "${PODS_CONFIGURATION_BUILD_DIR}/Nimble" "${PODS_CONFIGURATION_BUILD_DIR}/Quick" "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit" "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Nimble/Nimble.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Quick/Quick.framework/Headers" $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Upsurge/Upsurge.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Nimble/Nimble.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Quick/Quick.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/MachineLearningKit/MachineLearningKit.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Upsurge/Upsurge.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "Nimble" -framework "Quick" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Quick/Info.plist b/Example/Pods/Target Support Files/Quick/Info.plist index 21a30b4..10f280e 100644 --- a/Example/Pods/Target Support Files/Quick/Info.plist +++ b/Example/Pods/Target Support Files/Quick/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.0 + 1.3.1 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/Quick/Quick.xcconfig b/Example/Pods/Target Support Files/Quick/Quick.xcconfig index 66c8d21..529f2db 100644 --- a/Example/Pods/Target Support Files/Quick/Quick.xcconfig +++ b/Example/Pods/Target Support Files/Quick/Quick.xcconfig @@ -1,12 +1,12 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Quick +APPLICATION_EXTENSION_API_ONLY = YES +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Quick ENABLE_BITCODE = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -OTHER_LDFLAGS = -framework "XCTest" +OTHER_LDFLAGS = $(inherited) -Xlinker -no_application_extension -framework "XCTest" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/Quick PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Example/Pods/Target Support Files/Upsurge/Info.plist b/Example/Pods/Target Support Files/Upsurge/Info.plist index 2cf03a7..5c8750d 100644 --- a/Example/Pods/Target Support Files/Upsurge/Info.plist +++ b/Example/Pods/Target Support Files/Upsurge/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.8.0 + 0.10.2 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/Upsurge/Upsurge.xcconfig b/Example/Pods/Target Support Files/Upsurge/Upsurge.xcconfig index 895b8e8..c39dd6b 100644 --- a/Example/Pods/Target Support Files/Upsurge/Upsurge.xcconfig +++ b/Example/Pods/Target Support Files/Upsurge/Upsurge.xcconfig @@ -1,10 +1,9 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Upsurge +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Upsurge GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "Accelerate" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/Upsurge PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Example/Pods/Upsurge/README.md b/Example/Pods/Upsurge/README.md index 0e3c8bb..848e571 100644 --- a/Example/Pods/Upsurge/README.md +++ b/Example/Pods/Upsurge/README.md @@ -1,7 +1,5 @@ # Upsurge -[![Build Status](https://travis-ci.org/aleph7/Upsurge.svg?branch=master)](https://travis-ci.org/aleph7/Upsurge) - Upsurge is a math utilities library. It provides support for linear operations on vectors and matrices, and slicing of higher-dimensional tensors. It relies on [Accelerate](https://developer.apple.com/library/mac/documentation/Accelerate/Reference/AccelerateFWRef/index.html#//apple_ref/doc/uid/TP40009465), which is a framework that provides high-performance functions for matrix math, digital signal processing, and image manipulation by harnessing [SIMD](http://en.wikipedia.org/wiki/SIMD) instructions available in modern CPUs. Upsurge is a fork of [Surge](https://github.com/mattt/Surge) which was abandoned for a while. Upsurge supports tensors and has better support for matrices and arrays. It provides a custom `ValueArray` class as an alternative to Swift's built-in `Array`. It being a `class` instead of a `struct` means that you can manage when and if it gets copied, making memory management more explicit. This also allows defining the `+=` operator to mean addition instead of concatenation. @@ -17,8 +15,19 @@ Upsurge is a fork of [Surge](https://github.com/mattt/Surge) which was abandoned ## Installation -Upsurge supports both CocoaPods (`pod 'Upsurge'`) and Carthage (`github "aleph7/Upsurge"`). +Upsurge supports both CocoaPods (`pod 'Upsurge'`) and Carthage (`github "aleph7/Upsurge"`). For macOS apps you can use the Swift Package Manager to install Upsurge by adding the proper description to your Package.swift file: +```swift +import PackageDescription + +let package = Package( + name: "YOUR_PROJECT_NAME", + targets: [], + dependencies: [ + .Package(url: "https://github.com/aleph7/Upsurge.git", Version(0,8,.max)), + ] +) +``` ## Usage @@ -86,6 +95,25 @@ let B = inv(A) * C // [2.0, 1.0]′ let r = A*B - C // zero ``` +### Tiling +A block `Matrix` can be formed by repeating a 1-D `ValueArray` or 2-D `Matrix` **mxn** times. + +```swift +import Upsurge + +let a = ValueArray = [1.0, 2.0] +// Tile source array 2 times in each directon, +// returning a 2X4 block matrix +let A = a.tile(2, 2) + +let B = Matrix([ + [1.0, 2.0], + [3.0, 4.0] +)] +// Tile source matrix 2 times in each directon, +// returning a 4x4 block matrix +let r = B.tile(2, 2) +``` ### Tensors diff --git a/Example/Pods/Upsurge/Source/Complex/Complex.swift b/Example/Pods/Upsurge/Source/Complex/Complex.swift deleted file mode 100644 index 3840712..0000000 --- a/Example/Pods/Upsurge/Source/Complex/Complex.swift +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright © 2015 Venture Media Labs. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -import Darwin - -public struct Complex: Value { - public var real: Element = 0.0 - public var imag: Element = 0.0 - - public init() {} - - public init(integerLiteral value: Int) { - real = Element(value) - } - - public init(real: Element, imag: Element) { - self.real = real - self.imag = imag - } - - public var magnitude: Element { - if let real = real as? Double, let imag = imag as? Double { - return hypot(real, imag) as! Element - } else if let real = real as? Float, let imag = imag as? Float { - return hypot(real, imag) as! Element - } - fatalError() - } - - public var phase: Element { - if let real = real as? Double, let imag = imag as? Double { - return atan2(imag, real) as! Element - } else if let real = real as? Float, let imag = imag as? Float { - return atan2(imag, real) as! Element - } - fatalError() - } - - public static func abs(_ x: Complex) -> Complex { - return Complex(real: x.magnitude, imag: 0.0) - } - - public var hashValue: Int { - return real.hashValue ^ imag.hashValue - } - - public var description: String { - return "\(real) + \(imag)i" - } -} - -public func ==(lhs: Complex, rhs: Complex) -> Bool { - return lhs.real == rhs.real && lhs.imag == rhs.imag -} - -public func <(lhs: Complex, rhs: Complex) -> Bool { - return lhs.real < rhs.real || (lhs.real == rhs.real && lhs.imag < rhs.imag) -} - -// MARK: - Double - -public func +(lhs: Complex, rhs: Complex) -> Complex { - return Complex(real: lhs.real + rhs.real, imag: lhs.imag + rhs.imag) -} - -public func -(lhs: Complex, rhs: Complex) -> Complex { - return Complex(real: lhs.real - rhs.real, imag: lhs.imag - rhs.imag) -} - -public func *(lhs: Complex, rhs: Complex) -> Complex { - return Complex(real: lhs.real * rhs.real - lhs.imag * rhs.imag, imag: lhs.real * rhs.imag + lhs.imag * rhs.real) -} - -public func *(x: Complex, a: Double) -> Complex { - return Complex(real: x.real * a, imag: x.imag * a) -} - -public func *(a: Double, x: Complex) -> Complex { - return Complex(real: x.real * a, imag: x.imag * a) -} - -public func /(lhs: Complex, rhs: Complex) -> Complex { - let rhsMagSq = rhs.real*rhs.real + rhs.imag*rhs.imag - return Complex( - real: (lhs.real*rhs.real + lhs.imag*rhs.imag) / rhsMagSq, - imag: (lhs.imag*rhs.real - lhs.real*rhs.imag) / rhsMagSq) -} - -public func /(x: Complex, a: Double) -> Complex { - return Complex(real: x.real / a, imag: x.imag / a) -} - -public func /(a: Double, x: Complex) -> Complex { - let xMagSq = x.real*x.real + x.imag*x.imag - return Complex(real: a*x.real / xMagSq, imag: -a*x.imag / xMagSq) -} - -// MARK: - Float - -public func +(lhs: Complex, rhs: Complex) -> Complex { - return Complex(real: lhs.real + rhs.real, imag: lhs.imag + rhs.imag) -} - -public func -(lhs: Complex, rhs: Complex) -> Complex { - return Complex(real: lhs.real - rhs.real, imag: lhs.imag - rhs.imag) -} - -public func *(lhs: Complex, rhs: Complex) -> Complex { - return Complex(real: lhs.real * rhs.real - lhs.imag * rhs.imag, imag: lhs.real * rhs.imag + lhs.imag * rhs.real) -} - -public func *(x: Complex, a: Float) -> Complex { - return Complex(real: x.real * a, imag: x.imag * a) -} - -public func *(a: Float, x: Complex) -> Complex { - return Complex(real: x.real * a, imag: x.imag * a) -} - -public func /(lhs: Complex, rhs: Complex) -> Complex { - let rhsMagSq = rhs.real*rhs.real + rhs.imag*rhs.imag - return Complex( - real: (lhs.real*rhs.real + lhs.imag*rhs.imag) / rhsMagSq, - imag: (lhs.imag*rhs.real - lhs.real*rhs.imag) / rhsMagSq) -} - -public func /(x: Complex, a: Float) -> Complex { - return Complex(real: x.real / a, imag: x.imag / a) -} - -public func /(a: Float, x: Complex) -> Complex { - let xMagSq = x.real*x.real + x.imag*x.imag - return Complex(real: a*x.real / xMagSq, imag: -a*x.imag / xMagSq) -} diff --git a/Example/Pods/Upsurge/Source/2D/2DTensorSlice.swift b/Example/Pods/Upsurge/Sources/Upsurge/2DTensorSlice.swift similarity index 84% rename from Example/Pods/Upsurge/Source/2D/2DTensorSlice.swift rename to Example/Pods/Upsurge/Sources/Upsurge/2DTensorSlice.swift index fa69c75..e735fdd 100644 --- a/Example/Pods/Upsurge/Source/2D/2DTensorSlice.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/2DTensorSlice.swift @@ -18,10 +18,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -open class TwoDimensionalTensorSlice: MutableQuadraticType, Equatable { +open class TwoDimensionalTensorSlice: MutableQuadraticType, Equatable { public typealias Index = [Int] public typealias Slice = TwoDimensionalTensorSlice - public typealias Element = T open var arrangement: QuadraticArrangement { return .rowMajor @@ -29,10 +28,10 @@ open class TwoDimensionalTensorSlice: MutableQuadraticType, Equatable open let rows: Int open let columns: Int - open var stride: Int + open let stride: Int - var base: Tensor - open var span: Span + let base: Tensor + open let span: Span open func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { return try base.withUnsafeBufferPointer(body) @@ -60,15 +59,12 @@ open class TwoDimensionalTensorSlice: MutableQuadraticType, Equatable self.span = span assert(base.spanIsValid(span)) - assert(span.dimensions.reduce(0) { $0.1 > 1 ? $0.0 + 1 : $0.0 } <= 2) + assert(span.dimensions.reduce(0) { $1 > 1 ? $0 + 1 : $0 } <= 2) assert(span.dimensions.last! >= 1) - var rowIndex: Int - if let index = span.dimensions.index(where: { $0 > 1 }) { - rowIndex = index - } else { - rowIndex = span.dimensions.count - 2 - } + let rowIndex: Int = span.dimensions.index { $0 > 1 } ?? + (span.dimensions.count - 2) + rows = span.dimensions[rowIndex] columns = span.dimensions.last! @@ -137,16 +133,11 @@ open class TwoDimensionalTensorSlice: MutableQuadraticType, Equatable } open var isContiguous: Bool { - let onesCount: Int - if let index = dimensions.index(where: { $0 != 1 }) { - onesCount = index - } else { - onesCount = rank - } + let onesCount: Int = (dimensions.index { $0 != 1 }) ?? rank let diff = (0..: MutableQuadraticType, Equatable open func indexIsValid(_ indices: [Int]) -> Bool { assert(indices.count == rank) - for (i, index) in indices.enumerated() { - if index < span[i].lowerBound || span[i].upperBound < index { - return false - } + return indices.enumerated().all { (i, index) in + self.span[i].contains(index) } - return true } } diff --git a/Example/Pods/Upsurge/Source/Operations/Arithmetic.swift b/Example/Pods/Upsurge/Sources/Upsurge/Arithmetic.swift similarity index 98% rename from Example/Pods/Upsurge/Source/Operations/Arithmetic.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Arithmetic.swift index 0708b89..63999b3 100644 --- a/Example/Pods/Upsurge/Source/Operations/Arithmetic.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Arithmetic.swift @@ -136,8 +136,9 @@ public func sqrt(_ x: M) -> ValueArray where M.Element == public func sqrt(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "sqrt doesn't support step values other than 1") precondition(results.count == x.count, "The number of elements in x and y should match") + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvsqrt(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvsqrt(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -267,8 +268,9 @@ public func sqrt(_ x: M) -> ValueArray where M.Element == public func sqrt(_ x: MI, y: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "sqrt doesn't support step values other than 1") precondition(y.count == x.count, "The number of elements in x and y should match") + let startIndex = y.startIndex withPointers(x, &y) { xp, yp in - vvsqrtf(yp + y.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvsqrtf(yp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } diff --git a/Example/Pods/Upsurge/Source/Operations/Auxiliary.swift b/Example/Pods/Upsurge/Sources/Upsurge/Auxiliary.swift similarity index 86% rename from Example/Pods/Upsurge/Source/Operations/Auxiliary.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Auxiliary.swift index b3f41d8..2917f7d 100644 --- a/Example/Pods/Upsurge/Source/Operations/Auxiliary.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Auxiliary.swift @@ -34,8 +34,10 @@ public func abs(_ x: M) -> ValueArray where M.Element == /// Compute the absolute value for each element in `x`, store the results in `results` public func abs(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.count == results.count) + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_vabsD(xp + x.startIndex, x.step, rp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vabsD(xp + x.startIndex, x.step, rp + startIndex, step, vDSP_Length(x.count)) } } @@ -53,8 +55,9 @@ public func ceil(_ x: M) -> ValueArray where M.Element == public func ceil(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "ceil doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvceil(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvceil(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -71,8 +74,10 @@ public func clip(_ x: M, low: Double, high: Double) -> ValueArray public func clip(_ x: MI, low: Double, high: Double, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.count == results.count) var l = low, h = high + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, yp in - vDSP_vclipD(xp + x.startIndex, x.step, &l, &h, yp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vclipD(xp + x.startIndex, x.step, &l, &h, yp + startIndex, step, vDSP_Length(x.count)) } } @@ -100,8 +105,9 @@ public func floor(_ x: M) -> ValueArray where M.Element = public func floor(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "floor doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvfloor(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvfloor(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -117,8 +123,10 @@ public func neg(_ x: M) -> ValueArray where M.Element == /// Compute the negative of each element in `x`, store the results in `results` public func neg(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.count == results.count) + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_vnegD(xp + x.startIndex, x.step, rp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vnegD(xp + x.startIndex, x.step, rp + startIndex, step, vDSP_Length(x.count)) } } @@ -136,8 +144,9 @@ public func rec(_ x: M) -> ValueArray where M.Element == public func rec(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "rec doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvrec(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvrec(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -155,8 +164,9 @@ public func round(_ x: M) -> ValueArray where M.Element = public func round(_ x: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "round doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvnint(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvnint(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -173,8 +183,10 @@ public func threshold(_ x: M, low: Double) -> ValueArray public func threshold(_ x: MI, low: Double, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.count == results.count) var l = low + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_vthrD(xp + x.startIndex, x.step, &l, rp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vthrD(xp + x.startIndex, x.step, &l, rp + startIndex, step, vDSP_Length(x.count)) } } @@ -192,8 +204,9 @@ public func trunc(_ x: M) -> ValueArray where M.Element = public func trunc(_ x: MI, low: Double, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "trunc doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvint(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvint(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -210,8 +223,9 @@ public func pow(_ x: M, _ y: M) -> ValueArray where M.Ele /// Compute `x^y` for each element of `x` and `y`, store the results in `results` public func pow(_ x: MI, _ y: MI, results: inout MO) where MI.Element == Double, MO.Element == Double { precondition(x.step == 1, "pow doesn't support step values other than 1") + let startIndex = results.startIndex withPointers(x, y, &results) { xp, yp, rp in - vvpow(rp + results.startIndex, xp + x.startIndex, yp + y.startIndex, [Int32(x.count)]) + vvpow(rp + startIndex, xp + x.startIndex, yp + y.startIndex, [Int32(x.count)]) } } @@ -229,8 +243,10 @@ public func abs(_ x: M) -> ValueArray where M.Element == F /// Compute the absolute value for each element in `x`, store the results in `results` public func abs(_ x: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.count == results.count) + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_vabs(xp + x.startIndex, x.step, rp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vabs(xp + x.startIndex, x.step, rp + startIndex, step, vDSP_Length(x.count)) } } @@ -238,8 +254,9 @@ public func abs(_ x: MI, results: inout M public func ceil(_ x: M) -> ValueArray where M.Element == Float { precondition(x.step == 1, "ceil doesn't support step values other than 1") let results = ValueArray(count: x.count) + let startIndex = results.startIndex withPointer(x) { p in - vvceilf(results.mutablePointer + results.startIndex, p + x.startIndex, [Int32(x.count)]) + vvceilf(results.mutablePointer + startIndex, p + x.startIndex, [Int32(x.count)]) } return results } @@ -248,8 +265,9 @@ public func ceil(_ x: M) -> ValueArray where M.Element == public func ceil(_ x: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "ceil doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvceilf(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvceilf(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -266,8 +284,10 @@ public func clip(_ x: M, low: Float, high: Float) -> ValueArray(_ x: MI, low: Float, high: Float, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.count == results.count) var l = low, h = high + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, yp in - vDSP_vclip(xp + x.startIndex, x.step, &l, &h, yp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vclip(xp + x.startIndex, x.step, &l, &h, yp + startIndex, step, vDSP_Length(x.count)) } } @@ -295,8 +315,9 @@ public func floor(_ x: M) -> ValueArray where M.Element == public func floor(_ x: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "floor doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvfloorf(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvfloorf(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -312,8 +333,10 @@ public func neg(_ x: M) -> ValueArray where M.Element == F /// Compute the negative of each element in `x`, store the results in `results` public func neg(_ x: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.count == results.count) + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_vneg(xp + x.startIndex, x.step, rp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vneg(xp + x.startIndex, x.step, rp + startIndex, step, vDSP_Length(x.count)) } } @@ -331,8 +354,9 @@ public func rec(_ x: M) -> ValueArray where M.Element == F public func rec(_ x: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "rec doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvrecf(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvrecf(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -350,8 +374,9 @@ public func round(_ x: M) -> ValueArray where M.Element == public func round(_ x: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "round doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvnintf(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvnintf(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -368,8 +393,10 @@ public func threshold(_ x: M, low: Float) -> ValueArray wh public func threshold(_ x: MI, low: Float, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.count == results.count) var l = low + let startIndex = results.startIndex + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_vthr(xp + x.startIndex, x.step, &l, rp + results.startIndex, results.step, vDSP_Length(x.count)) + vDSP_vthr(xp + x.startIndex, x.step, &l, rp + startIndex, step, vDSP_Length(x.count)) } } @@ -387,8 +414,9 @@ public func trunc(_ x: M) -> ValueArray where M.Element == public func trunc(_ x: MI, low: Float, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "trunc doesn't support step values other than 1") precondition(x.count == results.count) + let startIndex = results.startIndex withPointers(x, &results) { xp, rp in - vvintf(rp + results.startIndex, xp + x.startIndex, [Int32(x.count)]) + vvintf(rp + startIndex, xp + x.startIndex, [Int32(x.count)]) } } @@ -405,7 +433,8 @@ public func pow(_ x: M, _ y: M) -> ValueArray where M.Elem /// Compute `x^y` for each element of `x` and `y`, store the results in `results` public func pow(_ x: MI, _ y: MI, results: inout MO) where MI.Element == Float, MO.Element == Float { precondition(x.step == 1, "pow doesn't support step values other than 1") + let startIndex = results.startIndex withPointers(x, y, &results) { xp, yp, rp in - vvpowf(rp + results.startIndex, xp + x.startIndex, yp + y.startIndex, [Int32(x.count)]) + vvpowf(rp + startIndex, xp + x.startIndex, yp + y.startIndex, [Int32(x.count)]) } } diff --git a/Example/Pods/Upsurge/Sources/Upsurge/Complex.swift b/Example/Pods/Upsurge/Sources/Upsurge/Complex.swift new file mode 100644 index 0000000..a06bda9 --- /dev/null +++ b/Example/Pods/Upsurge/Sources/Upsurge/Complex.swift @@ -0,0 +1,113 @@ +// Copyright © 2015 Venture Media Labs. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +import Darwin + +public struct Complex: Value { + public var real: Element + public var imag: Element + + public init() { + self.init(real: 0, imag: 0) + } + + public init(integerLiteral value: Int) { + self.init(real: Element(value), imag: 0) + } + + public init(real: Element, imag: Element) { + self.real = real + self.imag = imag + } + + public var magnitude: Element { + if let real = real as? Double, let imag = imag as? Double { + return hypot(real, imag) as! Element + } else if let real = real as? Float, let imag = imag as? Float { + return hypot(real, imag) as! Element + } + fatalError() + } + + public var phase: Element { + if let real = real as? Double, let imag = imag as? Double { + return atan2(imag, real) as! Element + } else if let real = real as? Float, let imag = imag as? Float { + return atan2(imag, real) as! Element + } + fatalError() + } + + public static func abs(_ x: Complex) -> Complex { + return Complex(real: x.magnitude, imag: 0.0) + } + + public var hashValue: Int { + return real.hashValue ^ imag.hashValue + } + + public var description: String { + return "\(real) + \(imag)i" + } + + public static func == (lhs: Complex, rhs: Complex) -> Bool { + return lhs.real == rhs.real && lhs.imag == rhs.imag + } + + public static func < (lhs: Complex, rhs: Complex) -> Bool { + return lhs.real < rhs.real || (lhs.real == rhs.real && lhs.imag < rhs.imag) + } + + public static func + (lhs: Complex, rhs: Complex) -> Complex { + return Complex(real: lhs.real + rhs.real, imag: lhs.imag + rhs.imag) + } + + public static func - (lhs: Complex, rhs: Complex) -> Complex { + return Complex(real: lhs.real - rhs.real, imag: lhs.imag - rhs.imag) + } + + public static func * (lhs: Complex, rhs: Complex) -> Complex { + return Complex(real: lhs.real * rhs.real - lhs.imag * rhs.imag, imag: lhs.real * rhs.imag + lhs.imag * rhs.real) + } + + public static func * (x: Complex, a: Element) -> Complex { + return Complex(real: x.real * a, imag: x.imag * a) + } + + public static func * (a: Element, x: Complex) -> Complex { + return Complex(real: x.real * a, imag: x.imag * a) + } + + public static func / (lhs: Complex, rhs: Complex) -> Complex { + let rhsMagSq = rhs.real*rhs.real + rhs.imag*rhs.imag + return Complex( + real: (lhs.real*rhs.real + lhs.imag*rhs.imag) / rhsMagSq, + imag: (lhs.imag*rhs.real - lhs.real*rhs.imag) / rhsMagSq) + } + + public static func / (x: Complex, a: Element) -> Complex { + return Complex(real: x.real / a, imag: x.imag / a) + } + + public static func / (a: Element, x: Complex) -> Complex { + let xMagSq = x.real*x.real + x.imag*x.imag + return Complex(real: a*x.real / xMagSq, imag: -a*x.imag / xMagSq) + } +} diff --git a/Example/Pods/Upsurge/Source/Complex/ComplexArithmetic.swift b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArithmetic.swift similarity index 57% rename from Example/Pods/Upsurge/Source/Complex/ComplexArithmetic.swift rename to Example/Pods/Upsurge/Sources/Upsurge/ComplexArithmetic.swift index cf08a15..42ab58d 100644 --- a/Example/Pods/Upsurge/Source/Complex/ComplexArithmetic.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArithmetic.swift @@ -21,85 +21,85 @@ // MARK: - Double public func sum(_ x: ComplexArray) -> Complex { - return Complex(real: sum(x.reals), imag: sum(x.imags)) + return Complex(real: sum(x.reals), imag: sum(x.imags)) } // MARK: Operators -public func +=(lhs: inout ComplexArray, rhs: ComplexArray) { +public func += (lhs: inout ComplexArray, rhs: ComplexArray) { lhs.reals += rhs.reals lhs.imags += rhs.imags } -public func +(lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { +public func + (lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(lhs) results += rhs return results } -public func -=(lhs: inout ComplexArray, rhs: ComplexArray) { +public func -= (lhs: inout ComplexArray, rhs: ComplexArray) { lhs.reals -= rhs.reals lhs.imags -= rhs.imags } -public func -(lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { +public func - (lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(lhs) results -= rhs return results } -public func +=(lhs: inout ComplexArray, rhs: Complex) { +public func += (lhs: inout ComplexArray, rhs: Complex) { lhs.reals += rhs.real lhs.imags += rhs.imag } -public func +(lhs: ComplexArray, rhs: Complex) -> ComplexArray { +public func + (lhs: ComplexArray, rhs: Complex) -> ComplexArray { var results = ComplexArray(lhs) results += rhs return results } -public func +(lhs: Complex, rhs: ComplexArray) -> ComplexArray { +public func + (lhs: Complex, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(rhs) results += lhs return results } -public func -=(lhs: inout ComplexArray, rhs: Complex) { +public func -= (lhs: inout ComplexArray, rhs: Complex) { lhs.reals -= rhs.real lhs.imags -= rhs.imag } -public func -(lhs: ComplexArray, rhs: Complex) -> ComplexArray { +public func - (lhs: ComplexArray, rhs: Complex) -> ComplexArray { var results = ComplexArray(lhs) results -= rhs return results } -public func -(lhs: Complex, rhs: ComplexArray) -> ComplexArray { +public func - (lhs: Complex, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(rhs) results -= lhs return results } -public func *=(lhs: inout ComplexArray, rhs: Double) { +public func *= (lhs: inout ComplexArray, rhs: Double) { lhs.reals *= rhs lhs.imags *= rhs } -public func *(lhs: ComplexArray, rhs: Double) -> ComplexArray { +public func * (lhs: ComplexArray, rhs: Double) -> ComplexArray { var results = ComplexArray(lhs) results *= rhs return results } -public func /=(lhs: inout ComplexArray, rhs: Double) { +public func /= (lhs: inout ComplexArray, rhs: Double) { lhs.reals /= rhs lhs.imags /= rhs } -public func /(lhs: ComplexArray, rhs: Double) -> ComplexArray { - var results = ComplexArray(lhs) +public func / (lhs: ComplexArray, rhs: Double) -> ComplexArray { + var results = ComplexArray(lhs) results /= rhs return results } @@ -112,80 +112,80 @@ public func sum(_ x: ComplexArray) -> Complex { // MARK: Operators -public func +=(lhs: inout ComplexArray, rhs: ComplexArray) { +public func += (lhs: inout ComplexArray, rhs: ComplexArray) { lhs.reals += rhs.reals lhs.imags += rhs.imags } -public func +(lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { +public func + (lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(lhs) results += rhs return results } -public func -=(lhs: inout ComplexArray, rhs: ComplexArray) { +public func -= (lhs: inout ComplexArray, rhs: ComplexArray) { lhs.reals -= rhs.reals lhs.imags -= rhs.imags } -public func -(lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { +public func - (lhs: ComplexArray, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(lhs) results -= rhs return results } -public func +=(lhs: inout ComplexArray, rhs: Complex) { +public func += (lhs: inout ComplexArray, rhs: Complex) { lhs.reals += rhs.real lhs.imags += rhs.imag } -public func +(lhs: ComplexArray, rhs: Complex) -> ComplexArray { +public func + (lhs: ComplexArray, rhs: Complex) -> ComplexArray { var results = ComplexArray(lhs) results += rhs return results } -public func +(lhs: Complex, rhs: ComplexArray) -> ComplexArray { +public func + (lhs: Complex, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(rhs) results += lhs return results } -public func -=(lhs: inout ComplexArray, rhs: Complex) { +public func -= (lhs: inout ComplexArray, rhs: Complex) { lhs.reals -= rhs.real lhs.imags -= rhs.imag } -public func -(lhs: ComplexArray, rhs: Complex) -> ComplexArray { +public func - (lhs: ComplexArray, rhs: Complex) -> ComplexArray { var results = ComplexArray(lhs) results -= rhs return results } -public func -(lhs: Complex, rhs: ComplexArray) -> ComplexArray { +public func - (lhs: Complex, rhs: ComplexArray) -> ComplexArray { var results = ComplexArray(rhs) results -= lhs return results } -public func *=(lhs: inout ComplexArray, rhs: Float) { +public func *= (lhs: inout ComplexArray, rhs: Float) { lhs.reals *= rhs lhs.imags *= rhs } -public func *(lhs: ComplexArray, rhs: Float) -> ComplexArray { +public func * (lhs: ComplexArray, rhs: Float) -> ComplexArray { var results = ComplexArray(lhs) results *= rhs return results } -public func /=(lhs: inout ComplexArray, rhs: Float) { +public func /= (lhs: inout ComplexArray, rhs: Float) { lhs.reals /= rhs lhs.imags /= rhs } -public func /(lhs: ComplexArray, rhs: Float) -> ComplexArray { - var results = ComplexArray(lhs) +public func / (lhs: ComplexArray, rhs: Float) -> ComplexArray { + var results = ComplexArray(lhs) results /= rhs return results } diff --git a/Example/Pods/Upsurge/Source/Complex/ComplexArray.swift b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArray.swift similarity index 73% rename from Example/Pods/Upsurge/Source/Complex/ComplexArray.swift rename to Example/Pods/Upsurge/Sources/Upsurge/ComplexArray.swift index fa79b31..5c1b38e 100644 --- a/Example/Pods/Upsurge/Source/Complex/ComplexArray.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArray.swift @@ -18,12 +18,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -open class ComplexArray: MutableLinearType, ExpressibleByArrayLiteral { +open class ComplexArray: MutableLinearType, ExpressibleByArrayLiteral, RangeReplaceableCollection { public typealias Index = Int public typealias Element = Complex public typealias Slice = ComplexArraySlice - var elements: ValueArray> + private var elements: ValueArray> open var count: Int { get { @@ -50,14 +50,6 @@ open class ComplexArray: MutableLinearType, ExpressibleByArrayLiteral { return 1 } - open func index(after i: Index) -> Index { - return i + 1 - } - - open func formIndex(after i: inout Index) { - i += 1 - } - open var span: Span { return Span(zeroTo: [endIndex]) } @@ -80,52 +72,66 @@ open class ComplexArray: MutableLinearType, ExpressibleByArrayLiteral { open var reals: ComplexArrayRealSlice { get { - return ComplexArrayRealSlice(base: self, startIndex: startIndex, endIndex: 2*endIndex - 1, step: 2) + return ComplexArrayRealSlice(base: self, startIndex: startIndex, endIndex: 2*endIndex - 1, step: 2) } set { - precondition(newValue.count == reals.count) - for i in 0.. { get { - return ComplexArrayRealSlice(base: self, startIndex: startIndex + 1, endIndex: 2*endIndex, step: 2) + return ComplexArrayRealSlice(base: self, startIndex: startIndex + 1, endIndex: 2*endIndex, step: 2) } set { - precondition(newValue.count == imags.count) - for i in 0..>(capacity: capacity) + elements = ValueArray(capacity: capacity) } /// Construct an uninitialized ComplexArray with the given size public required init(count: Int) { - elements = ValueArray>(count: count) + elements = ValueArray(count: count) } /// Construct a ComplexArray from an array literal public required init(arrayLiteral elements: Element...) { - self.elements = ValueArray>(count: elements.count) - self.elements.mutablePointer.initialize(from: elements) + self.elements = ValueArray(elements) } /// Construct a ComplexArray from contiguous memory public required init(_ values: C) where C.Element == Element { - elements = ValueArray>(values) + elements = ValueArray(values) + } + + /// Construct a ComplexArray from a sequence + public required init(_ elements: S) where ComplexArray.Element == S.Element { + self.elements = ValueArray(elements) } /// Construct a ComplexArray of `count` elements, each initialized to `repeatedValue`. public required init(count: Int, repeatedValue: Element) { - elements = ValueArray>(count: count, repeatedValue: repeatedValue) + elements = ValueArray(count: count, repeatedValue: repeatedValue) + } + + public func assign(_ new: C) where C.Element == Element { + for (i, value) in zip(elements.indices, new) { + elements[i] = value + } } open subscript(index: Index) -> Element { @@ -174,16 +180,16 @@ open class ComplexArray: MutableLinearType, ExpressibleByArrayLiteral { return ComplexArray(elements) } - open func append(_ value: Element) { - elements.append(value) + open func append(_ newElement: Element) { + elements.append(newElement) } - open func appendContentsOf(_ values: C) where C.Iterator.Element == Element { - elements.appendContentsOf(values) + open func append(contentsOf newElements: S) where S.Iterator.Element == Element { + elements.append(contentsOf: newElements) } - open func replaceRange(_ subRange: Range, with newElements: C) where C.Iterator.Element == Element { - elements.replaceRange(subRange, with: newElements) + open func replaceSubrange(_ subRange: Range, with newElements: C) where C.Iterator.Element == Element { + elements.replaceSubrange(subRange, with: newElements) } open func toRowMatrix() -> Matrix { @@ -193,17 +199,8 @@ open class ComplexArray: MutableLinearType, ExpressibleByArrayLiteral { open func toColumnMatrix() -> Matrix { return Matrix(rows: count, columns: 1, elements: self) } -} -public func ==(lhs: ComplexArray, rhs: ComplexArray) -> Bool { - if lhs.count != rhs.count { - return false - } - - for i in 0.. Bool { + return lhs.count == rhs.count && lhs.elementsEqual(rhs) } - return true } diff --git a/Example/Pods/Upsurge/Source/Complex/ComplexArrayRealSlice.swift b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArrayRealSlice.swift similarity index 73% rename from Example/Pods/Upsurge/Source/Complex/ComplexArrayRealSlice.swift rename to Example/Pods/Upsurge/Sources/Upsurge/ComplexArrayRealSlice.swift index 3a1cbfe..03bef6d 100644 --- a/Example/Pods/Upsurge/Source/Complex/ComplexArrayRealSlice.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArrayRealSlice.swift @@ -24,42 +24,47 @@ public struct ComplexArrayRealSlice: MutableLinearType { public typealias Element = T public typealias Slice = ComplexArrayRealSlice - var base: ComplexArray - public var startIndex: Int - public var endIndex: Int - public var step: Int + public let base: ComplexArray + public let baseStartIndex: Index + public let baseEndIndex: Index + public let step: Int + + public var startIndex: Index { + return 0 + } + + public var endIndex: Index { + return (baseEndIndex - baseStartIndex + step - 1) / step + } + public var span: Span { - return Span(ranges: [startIndex ... endIndex - 1]) + return Span(ranges: [startIndex ..< endIndex]) } public func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { - return try base.withUnsafeBufferPointer { pointer in - return try pointer.baseAddress!.withMemoryRebound(to: Element.self, capacity: base.capacity) { pointer in - return try body(UnsafeBufferPointer(start: pointer, count: count)) - } + return try withUnsafePointer { pointer in + return try body(UnsafeBufferPointer(start: pointer, count: count)) } } public func withUnsafePointer(_ body: (UnsafePointer) throws -> R) rethrows -> R { return try base.withUnsafePointer { pointer in return try pointer.withMemoryRebound(to: Element.self, capacity: base.capacity) { pointer in - return try body(pointer) + try body(pointer + baseStartIndex) } } } public func withUnsafeMutableBufferPointer(_ body: (UnsafeMutableBufferPointer) throws -> R) rethrows -> R { - return try base.withUnsafeMutableBufferPointer { pointer in - return try pointer.baseAddress!.withMemoryRebound(to: Element.self, capacity: base.capacity) { pointer in - return try body(UnsafeMutableBufferPointer(start: pointer, count: count)) - } + return try withUnsafeMutablePointer { pointer in + return try body(UnsafeMutableBufferPointer(start: pointer, count: count)) } } public func withUnsafeMutablePointer(_ body: (UnsafeMutablePointer) throws -> R) rethrows -> R { return try base.withUnsafeMutablePointer { pointer in return try pointer.withMemoryRebound(to: Element.self, capacity: base.capacity) { pointer in - return try body(pointer) + try body(pointer + baseStartIndex) } } } @@ -67,21 +72,29 @@ public struct ComplexArrayRealSlice: MutableLinearType { init(base: ComplexArray, startIndex: Int, endIndex: Int, step: Int) { assert(2 * base.startIndex <= startIndex && endIndex <= 2 * base.endIndex) self.base = base - self.startIndex = startIndex - self.endIndex = endIndex + self.baseStartIndex = startIndex + self.baseEndIndex = endIndex self.step = step } + public func assign(_ elements: C) where C.Element == Element { + withUnsafeMutablePointer { pointer in + for (i, value) in zip(stride(from: baseStartIndex, to: baseEndIndex, by: step), elements) { + pointer[i] = value + } + } + } + public subscript(index: Int) -> Element { get { - let baseIndex = startIndex + index * step + let baseIndex = startIndex + index precondition(0 <= baseIndex && baseIndex < 2 * base.count) return withUnsafePointer { pointer in - return pointer[baseIndex] + pointer[baseIndex] } } set { - let baseIndex = startIndex + index * step + let baseIndex = startIndex + index precondition(0 <= baseIndex && baseIndex < base.count) withUnsafeMutablePointer { pointer in pointer[baseIndex] = newValue @@ -119,23 +132,10 @@ public struct ComplexArrayRealSlice: MutableLinearType { } public func index(after i: Index) -> Index { - return i + 1 - } - - public func formIndex(after i: inout Index) { - i += 1 - } -} - -public func ==(lhs: ComplexArrayRealSlice, rhs: ComplexArrayRealSlice) -> Bool { - if lhs.count != rhs.count { - return false + return i + step } - for i in 0.. Bool { + return lhs.count == rhs.count && lhs.elementsEqual(rhs) } - return true } diff --git a/Example/Pods/Upsurge/Source/Complex/ComplexArraySlice.swift b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArraySlice.swift similarity index 53% rename from Example/Pods/Upsurge/Source/Complex/ComplexArraySlice.swift rename to Example/Pods/Upsurge/Sources/Upsurge/ComplexArraySlice.swift index 3aee688..86ad62e 100644 --- a/Example/Pods/Upsurge/Source/Complex/ComplexArraySlice.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/ComplexArraySlice.swift @@ -18,40 +18,55 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -open class ComplexArraySlice: MutableLinearType { +public class ComplexArraySlice: MutableLinearType { public typealias Index = Int public typealias Element = Complex public typealias Slice = ComplexArraySlice - var base: ComplexArray + public let base: ComplexArray + public let baseStartIndex: Index + public let baseEndIndex: Index + public let step: Index - open var startIndex: Index - open var endIndex: Index - open var step: Index + public var startIndex: Index { + return 0 + } - open var span: Span { - return Span(ranges: [startIndex ... endIndex - 1]) + public var endIndex: Index { + return (baseEndIndex - baseStartIndex + step - 1) / step } - open func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { - return try base.withUnsafeBufferPointer(body) + public var span: Span { + return Span(ranges: [startIndex ..< endIndex]) } - open func withUnsafePointer(_ body: (UnsafePointer) throws -> R) rethrows -> R { - return try base.withUnsafePointer(body) + public func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { + return try base.withUnsafeBufferPointer { p in + return try body(UnsafeBufferPointer(rebasing: p[baseStartIndex ..< baseEndIndex])) + } } - open func withUnsafeMutableBufferPointer(_ body: (UnsafeMutableBufferPointer) throws -> R) rethrows -> R { - return try base.withUnsafeMutableBufferPointer(body) + public func withUnsafePointer(_ body: (UnsafePointer) throws -> R) rethrows -> R { + return try base.withUnsafePointer { p in + return try body(p + baseStartIndex) + } } - open func withUnsafeMutablePointer(_ body: (UnsafeMutablePointer) throws -> R) rethrows -> R { - return try base.withUnsafeMutablePointer(body) + public func withUnsafeMutableBufferPointer(_ body: (UnsafeMutableBufferPointer) throws -> R) rethrows -> R { + return try base.withUnsafeMutableBufferPointer { p in + return try body(UnsafeMutableBufferPointer(rebasing: p[baseStartIndex ..< baseEndIndex])) + } } - open var reals: ComplexArrayRealSlice { + public func withUnsafeMutablePointer(_ body: (UnsafeMutablePointer) throws -> R) rethrows -> R { + return try base.withUnsafeMutablePointer { p in + return try body(p + baseStartIndex) + } + } + + public var reals: ComplexArrayRealSlice { get { - return ComplexArrayRealSlice(base: base, startIndex: startIndex, endIndex: 2*endIndex - 1, step: 2) + return ComplexArrayRealSlice(base: base, startIndex: startIndex, endIndex: 2*endIndex - 1, step: 2) } set { precondition(newValue.count == reals.count) @@ -61,9 +76,9 @@ open class ComplexArraySlice: MutableLinearType { } } - open var imags: ComplexArrayRealSlice { + public var imags: ComplexArrayRealSlice { get { - return ComplexArrayRealSlice(base: base, startIndex: startIndex + 1, endIndex: 2*endIndex, step: 2) + return ComplexArrayRealSlice(base: base, startIndex: startIndex + 1, endIndex: 2*endIndex, step: 2) } set { precondition(newValue.count == imags.count) @@ -76,23 +91,29 @@ open class ComplexArraySlice: MutableLinearType { public required init(base: ComplexArray, startIndex: Index, endIndex: Index, step: Int) { assert(base.startIndex <= startIndex && endIndex <= base.endIndex) self.base = base - self.startIndex = startIndex - self.endIndex = endIndex + self.baseStartIndex = startIndex + self.baseEndIndex = endIndex self.step = step } - open subscript(index: Index) -> Element { + public func assign(_ elements: C) where C.Element == Element { + for (i, value) in zip(stride(from: baseStartIndex, to: baseEndIndex, by: step), elements) { + base[i] = value + } + } + + public subscript(index: Index) -> Element { get { precondition(0 <= index && index < count) - return base[index] + return base[baseStartIndex + index * step] } set { precondition(0 <= index && index < count) - base[index] = newValue + base[baseStartIndex + index * step] = newValue } } - open subscript(indices: [Int]) -> Element { + public subscript(indices: [Int]) -> Element { get { assert(indices.count == 1) return self[indices[0]] @@ -103,57 +124,32 @@ open class ComplexArraySlice: MutableLinearType { } } - open subscript(intervals: [IntervalType]) -> Slice { + public subscript(intervals: [IntervalType]) -> Slice { get { + assert(span.contains(intervals)) assert(intervals.count == 1) let start = intervals[0].start ?? startIndex let end = intervals[0].end ?? endIndex return Slice(base: base, startIndex: start, endIndex: end, step: step) } set { + assert(span.contains(intervals)) assert(intervals.count == 1) let start = intervals[0].start ?? startIndex let end = intervals[0].end ?? endIndex - assert(startIndex <= start && end <= endIndex) for i in start.. Index { - return i + 1 - } - - open func formIndex(after i: inout Index) { - i += 1 - } -} - -// MARK: - Equatable + // MARK: - Equatable -public func ==(lhs: ComplexArraySlice, rhs: ComplexArraySlice) -> Bool { - if lhs.count != rhs.count { - return false + public static func == (lhs: ComplexArraySlice, rhs: ComplexArraySlice) -> Bool { + return lhs.count == rhs.count && lhs.elementsEqual(rhs) } - for (i, v) in lhs.enumerated() { - if v != rhs[i] { - return false - } - } - return true -} - -public func ==(lhs: ComplexArraySlice, rhs: ComplexArray) -> Bool { - if lhs.count != rhs.count { - return false - } - - for i in 0..) -> Bool { + return lhs.count == rhs.count && lhs.elementsEqual(rhs) } - return true } diff --git a/Example/Pods/Upsurge/Source/DSP/DSP.swift b/Example/Pods/Upsurge/Sources/Upsurge/DSP.swift similarity index 100% rename from Example/Pods/Upsurge/Source/DSP/DSP.swift rename to Example/Pods/Upsurge/Sources/Upsurge/DSP.swift diff --git a/Example/Pods/Upsurge/Source/Operations/Exponential.swift b/Example/Pods/Upsurge/Sources/Upsurge/Exponential.swift similarity index 100% rename from Example/Pods/Upsurge/Source/Operations/Exponential.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Exponential.swift diff --git a/Example/Pods/Upsurge/Source/DSP/FFT.swift b/Example/Pods/Upsurge/Sources/Upsurge/FFT.swift similarity index 86% rename from Example/Pods/Upsurge/Source/DSP/FFT.swift rename to Example/Pods/Upsurge/Sources/Upsurge/FFT.swift index 001469f..9232d5e 100644 --- a/Example/Pods/Upsurge/Source/DSP/FFT.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/FFT.swift @@ -28,7 +28,8 @@ open class FFTDouble { fileprivate var imag: ValueArray public init(inputLength: Int) { - let maxLengthLog2 = vDSP_Length(ceil(log2(Double(inputLength)))) + assert(inputLength.nonzeroBitCount == 1, "input length must be a power of 2") + let maxLengthLog2 = vDSP_Length(log2(Double(inputLength))) + 1 maxLength = vDSP_Length(exp2(Double(maxLengthLog2))) setup = vDSP_create_fftsetupD(maxLengthLog2, FFTRadix(kFFTRadix2))! @@ -53,7 +54,7 @@ open class FFTDouble { open func forward(_ input: M, results: inout ComplexArray) where M.Element == Double { let lengthLog2 = vDSP_Length(log2(Double(input.count))) let length = vDSP_Length(exp2(Double(lengthLog2))) - precondition(length <= maxLength, "Input should have at most \(maxLength) elements") + precondition(length <= maxLength/2, "Input should have at most \(maxLength/2) elements") real.assignFrom(input) for i in 0..= Int(length) / 2) + let capacity = results.capacity + precondition(capacity >= Int(length) / 2) results.count = Int(length) / 2 withPointer(&results) { pointer in - pointer.withMemoryRebound(to: DSPDoubleComplex.self, capacity: results.capacity) { resultsPointer in + pointer.withMemoryRebound(to: DSPDoubleComplex.self, capacity: capacity) { resultsPointer in vDSP_ztocD(&splitComplex, 1, resultsPointer, 1, length/2) } } @@ -79,7 +81,7 @@ open class FFTDouble { open func forwardMags(_ input: M) -> ValueArray where M.Element == Double { let lengthLog2 = vDSP_Length(log2(Double(input.count))) let length = vDSP_Length(exp2(Double(lengthLog2))) - var results = ValueArray(count: Int(length) / 2) + var results = ValueArray(count: Int(length)) forwardMags(input, results: &results) return results } @@ -88,7 +90,7 @@ open class FFTDouble { open func forwardMags(_ input: M, results: inout ValueArray) where M.Element == Double { let lengthLog2 = vDSP_Length(log2(Double(input.count))) let length = vDSP_Length(exp2(Double(lengthLog2))) - precondition(length <= maxLength, "Input should have at most \(maxLength) elements") + precondition(length <= maxLength/2, "Input should have at most \(maxLength/2) elements") real.assignFrom(input) for i in 0.. public init(inputLength: Int) { - let maxLengthLog2 = vDSP_Length(ceil(log2(Float(inputLength)))) + assert(inputLength.nonzeroBitCount == 1, "input length must be a power of 2") + let maxLengthLog2 = vDSP_Length(log2(Float(inputLength))) + 1 maxLength = vDSP_Length(exp2(Float(maxLengthLog2))) - setup = vDSP_create_fftsetupD(maxLengthLog2, FFTRadix(kFFTRadix2))! + setup = vDSP_create_fftsetup(maxLengthLog2, FFTRadix(kFFTRadix2))! real = ValueArray(count: Int(maxLength)) imag = ValueArray(count: Int(maxLength)) @@ -131,7 +134,7 @@ open class FFTFloat { open func forward(_ input: M) -> ComplexArray where M.Element == Float { let lengthLog2 = vDSP_Length(log2(Float(input.count))) let length = vDSP_Length(exp2(Float(lengthLog2))) - precondition(length <= maxLength, "Input should have at most \(maxLength) elements") + precondition(length <= maxLength/2, "Input should have at most \(maxLength/2) elements") real.assignFrom(input) for i in 0..(count: Int(length)/2) withPointer(&result) { pointer in - pointer.withMemoryRebound(to: DSPComplex.self, capacity: result.count) { pointer in + pointer.withMemoryRebound(to: DSPComplex.self, capacity: Int(length)/2) { pointer in vDSP_ztoc(&splitComplex, 1, pointer, 1, length/2) } } @@ -156,7 +159,7 @@ open class FFTFloat { open func forwardMags(_ input: M) -> ValueArray where M.Element == Float { let lengthLog2 = vDSP_Length(log2(Float(input.count))) let length = vDSP_Length(exp2(Float(lengthLog2))) - precondition(length <= maxLength, "Input should have at most \(maxLength) elements") + precondition(length <= maxLength/2, "Input should have at most \(maxLength/2) elements") real.assignFrom(input) for i in 0..(lhs: inout ML, rhs: MR) where ML.Element == Double, MR.Element == Double { assert(lhs.count >= rhs.count) let count = min(lhs.count, rhs.count) + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vaddD(lhsp + lhs.startIndex, lhs.step, rhsp + rhs.startIndex, rhs.step, lhsp, lhs.step, vDSP_Length(count)) + vDSP_vaddD(lhsp + lhsStart, lhsStep, rhsp + rhs.startIndex, rhs.step, lhsp, lhsStep, vDSP_Length(count)) } } @@ -40,9 +42,12 @@ public func +(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Double) where ML.Element == Double { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in var scalar = rhs - vDSP_vsaddD(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsaddD(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -55,14 +60,16 @@ public func +(lhs: ML, rhs: Double) -> ValueArray where return results } -public func +(lhs: Double, rhs: MR) -> ValueArray where ML.Element == Double, MR.Element == Double { +public func +(lhs: Double, rhs: MR) -> ValueArray where MR.Element == Double { return rhs + lhs } public func -=(lhs: inout ML, rhs: MR) where ML.Element == Double, MR.Element == Double { let count = min(lhs.count, rhs.count) + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vsubD(rhsp + rhs.startIndex, rhs.step, lhsp + lhs.startIndex, lhs.step, lhsp + lhs.startIndex, lhs.step, vDSP_Length(count)) + vDSP_vsubD(rhsp + rhs.startIndex, rhs.step, lhsp + lhsStart, lhsStep, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -77,8 +84,11 @@ public func -(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Double) where ML.Element == Double { var scalar: Double = -rhs + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in - vDSP_vsaddD(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsaddD(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -95,7 +105,7 @@ public func -(lhs: Double, rhs: ML) -> ValueArray where let results = ValueArray(count: rhs.count) withPointer(rhs) { rhsp in var scalarm: Double = -1 - var scalara: Double = 0 + var scalara: Double = lhs vDSP_vsmsaD(rhsp + rhs.startIndex, rhs.step, &scalarm, &scalara, results.mutablePointer + results.startIndex, results.step, vDSP_Length(rhs.count)) } return results @@ -103,8 +113,10 @@ public func -(lhs: Double, rhs: ML) -> ValueArray where public func /=(lhs: inout ML, rhs: MR) where ML.Element == Double, MR.Element == Double { let count = min(lhs.count, rhs.count) + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vdivD(rhsp + rhs.startIndex, rhs.step, lhsp + lhs.startIndex, lhs.step, lhsp + lhs.startIndex, lhs.step, vDSP_Length(count)) + vDSP_vdivD(rhsp + rhs.startIndex, rhs.step, lhsp + lhsStart, lhsStep, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -118,9 +130,12 @@ public func /(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Double) where ML.Element == Double { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in var scalar = rhs - vDSP_vsdivD(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsdivD(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -143,8 +158,11 @@ public func /(lhs: Double, rhs: ML) -> ValueArray where } public func *=(lhs: inout ML, rhs: MR) where ML.Element == Double, MR.Element == Double { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vmulD(lhsp + lhs.startIndex, lhs.step, rhsp + rhs.startIndex, rhs.step, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vmulD(lhsp + lhsStart, lhsStep, rhsp + rhs.startIndex, rhs.step, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -158,8 +176,11 @@ public func *(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Double) where ML.Element == Double { var rhs = rhs + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in - vDSP_vsmulD(lhsp + lhs.startIndex, lhs.step, &rhs, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsmulD(lhsp + lhsStart, lhsStep, &rhs, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -194,8 +215,10 @@ public func •(lhs: ML, rhs: MR) -> Double wher public func +=(lhs: inout ML, rhs: MR) where ML.Element == Float, MR.Element == Float { assert(lhs.count >= rhs.count) let count = min(lhs.count, rhs.count) + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vadd(lhsp + lhs.startIndex, lhs.step, rhsp + rhs.startIndex, rhs.step, lhsp, lhs.step, vDSP_Length(count)) + vDSP_vadd(lhsp + lhsStart, lhsStep, rhsp + rhs.startIndex, rhs.step, lhsp, lhsStep, vDSP_Length(count)) } } @@ -209,9 +232,12 @@ public func +(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Float) where ML.Element == Float { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in var scalar = rhs - vDSP_vsadd(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsadd(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -224,14 +250,16 @@ public func +(lhs: ML, rhs: Float) -> ValueArray where ML return results } -public func +(lhs: Float, rhs: MR) -> ValueArray where ML.Element == Float, MR.Element == Float { +public func +(lhs: Float, rhs: MR) -> ValueArray where MR.Element == Float { return rhs + lhs } public func -=(lhs: inout ML, rhs: MR) where ML.Element == Float, MR.Element == Float { let count = min(lhs.count, rhs.count) + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vsub(rhsp + rhs.startIndex, rhs.step, lhsp + lhs.startIndex, lhs.step, lhsp + lhs.startIndex, lhs.step, vDSP_Length(count)) + vDSP_vsub(rhsp + rhs.startIndex, rhs.step, lhsp + lhsStart, lhsStep, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -245,9 +273,12 @@ public func -(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Float) where ML.Element == Float { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in var scalar: Float = -rhs - vDSP_vsadd(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsadd(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -264,7 +295,7 @@ public func -(lhs: Float, rhs: ML) -> ValueArray where ML let results = ValueArray(count: rhs.count) withPointer(rhs) { rhsp in var scalarm: Float = -1 - var scalara: Float = 0 + var scalara: Float = lhs vDSP_vsmsa(rhsp + rhs.startIndex, rhs.step, &scalarm, &scalara, results.mutablePointer + results.startIndex, results.step, vDSP_Length(rhs.count)) } return results @@ -272,8 +303,10 @@ public func -(lhs: Float, rhs: ML) -> ValueArray where ML public func /=(lhs: inout ML, rhs: MR) where ML.Element == Float, MR.Element == Float { let count = min(lhs.count, rhs.count) + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vdiv(rhsp + rhs.startIndex, rhs.step, lhsp + lhs.startIndex, lhs.step, lhsp + lhs.startIndex, lhs.step, vDSP_Length(count)) + vDSP_vdiv(rhsp + rhs.startIndex, rhs.step, lhsp + lhsStart, lhsStep, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -287,9 +320,12 @@ public func /(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Float) where ML.Element == Float { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in var scalar = rhs - vDSP_vsdiv(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsdiv(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -312,8 +348,11 @@ public func /(lhs: Float, rhs: ML) -> ValueArray where ML } public func *=(lhs: inout ML, rhs: MR) where ML.Element == Float, MR.Element == Float { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointers(rhs, &lhs) { rhsp, lhsp in - vDSP_vmul(lhsp + lhs.startIndex, lhs.step, rhsp + rhs.startIndex, rhs.step, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vmul(lhsp + lhsStart, lhsStep, rhsp + rhs.startIndex, rhs.step, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } @@ -326,9 +365,12 @@ public func *(lhs: ML, rhs: MR) -> ValueArray(lhs: inout ML, rhs: Float) where ML.Element == Float { + let count = lhs.count + let lhsStart = lhs.startIndex + let lhsStep = lhs.step withPointer(&lhs) { lhsp in var scalar = rhs - vDSP_vsmul(lhsp + lhs.startIndex, lhs.step, &scalar, lhsp + lhs.startIndex, lhs.step, vDSP_Length(lhs.count)) + vDSP_vsmul(lhsp + lhsStart, lhsStep, &scalar, lhsp + lhsStart, lhsStep, vDSP_Length(count)) } } diff --git a/Example/Pods/Upsurge/Source/1D/LinearType.swift b/Example/Pods/Upsurge/Sources/Upsurge/LinearType.swift similarity index 79% rename from Example/Pods/Upsurge/Source/1D/LinearType.swift rename to Example/Pods/Upsurge/Sources/Upsurge/LinearType.swift index 99b4085..2b035f8 100644 --- a/Example/Pods/Upsurge/Source/1D/LinearType.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/LinearType.swift @@ -19,8 +19,7 @@ // THE SOFTWARE. /// The `LinearType` protocol should be implemented by any collection that stores its values in a contiguous memory block. This is the building block for one-dimensional operations that are single-instruction, multiple-data (SIMD). -public protocol LinearType: Collection, TensorType { - associatedtype Element +public protocol LinearType: TensorType, CustomStringConvertible, CustomDebugStringConvertible, BidirectionalCollection { /// The index of the first valid element var startIndex: Int { get } @@ -31,30 +30,39 @@ public protocol LinearType: Collection, TensorType { /// The step size between valid elements var step: Int { get } - var span: Span { get } - subscript(position: Int) -> Element { get } } public extension LinearType { - /// The number of valid element in the memory block, taking into account the step size. - public var count: Int { - return (endIndex - startIndex + step - 1) / step - } - public var dimensions: [Int] { return [count] } -} -internal extension LinearType { - func indexIsValid(_ index: Int) -> Bool { - return startIndex <= index && index < endIndex + public func index(after i: Int) -> Int { + return i + 1 + } + + public func index(before i: Int) -> Int { + return i - 1 + } + + public func formIndex(after i: inout Int) { + i += 1 + } + + public var description: String { + return "[\(map { "\($0)" }.joined(separator: ", "))]" + } + + public var debugDescription: String { + return description } } public protocol MutableLinearType: LinearType, MutableTensorType { subscript(position: Int) -> Element { get set } + + mutating func assign(_ elements: C) where C.Element == Element } extension Array: LinearType { @@ -65,18 +73,14 @@ extension Array: LinearType { } public var span: Span { - return Span(ranges: [startIndex ... endIndex - 1]) + return Span(ranges: [startIndex ..< endIndex]) } - public init(other: C) where C.Iterator.Element == Array.Element { - self.init() - - for v in other { - self.append(v) - } + public init(other: C) where C.Iterator.Element == Element { + self = Array(other) } - public subscript(indices: [Int]) -> Element { + public subscript(indices: [Index]) -> Element { get { assert(indices.count == 1) return self[indices[0]] @@ -104,7 +108,7 @@ extension Array: LinearType { public func withUnsafePointer(_ body: (UnsafePointer) throws -> R) rethrows -> R { return try withUnsafeBufferPointer { pointer in - return try body(pointer.baseAddress!) + try body(pointer.baseAddress!) } } } diff --git a/Example/Pods/Upsurge/Source/2D/Matrix.swift b/Example/Pods/Upsurge/Sources/Upsurge/Matrix.swift similarity index 64% rename from Example/Pods/Upsurge/Source/2D/Matrix.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Matrix.swift index 69e281c..da7c613 100644 --- a/Example/Pods/Upsurge/Source/2D/Matrix.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Matrix.swift @@ -20,10 +20,9 @@ import Accelerate -open class Matrix: MutableQuadraticType, Equatable, CustomStringConvertible { +open class Matrix: MutableQuadraticType, Equatable, CustomStringConvertible { public typealias Index = (Int, Int) public typealias Slice = MatrixSlice - public typealias Element = T open var rows: Int open var columns: Int @@ -91,10 +90,8 @@ open class Matrix: MutableQuadraticType, Equatable, CustomStringConver } /// Construct a Matrix of `rows` by `columns` with elements initialized to repeatedValue - public init(rows: Int, columns: Int, repeatedValue: Element) { - self.rows = rows - self.columns = columns - self.elements = ValueArray(count: rows * columns, repeatedValue: repeatedValue) + public convenience init(rows: Int, columns: Int, repeatedValue: Element) { + self.init(rows: rows, columns: columns) { repeatedValue } } /// Construct a Matrix from an array of rows @@ -102,11 +99,33 @@ open class Matrix: MutableQuadraticType, Equatable, CustomStringConver let rows = contents.count let cols = contents[0].count + for element in contents { + precondition(element.count == cols) + } + + self.init(rows: rows, columns: cols) + + for (i, row) in contents.enumerated() { + elements.replaceSubrange(i*cols..(_ contents: [M]) where M.Element == Element { + + let rows = contents.count + let cols = Int(contents[0].count) + + for element in contents { + precondition(element.count == cols) + } + self.init(rows: rows, columns: cols) for (i, row) in contents.enumerated() { - elements.replaceRange(i*cols..: MutableQuadraticType, Equatable, CustomStringConver } } - open subscript(intervals: IntervalType...) -> Slice { + public subscript(intervals: IntervalType...) -> Slice { get { return self[intervals] } @@ -147,7 +166,7 @@ open class Matrix: MutableQuadraticType, Equatable, CustomStringConver } } - open subscript(intervals: [IntervalType]) -> Slice { + public subscript(intervals: [IntervalType]) -> Slice { get { let span = Span(dimensions: dimensions, intervals: intervals) return self[span] @@ -158,6 +177,26 @@ open class Matrix: MutableQuadraticType, Equatable, CustomStringConver } } + public subscript(ranges: CountableRange...) -> Slice { + get { + return self[ranges] + } + set { + self[ranges] = newValue + } + } + + public subscript(ranges: [CountableRange]) -> Slice { + get { + let span = Span(dimensions: dimensions, intervals: ranges) + return self[span] + } + set { + let span = Span(dimensions: dimensions, intervals: ranges) + self[span] = newValue + } + } + subscript(span: Span) -> Slice { get { return MatrixSlice(base: self, span: span) @@ -171,11 +210,11 @@ open class Matrix: MutableQuadraticType, Equatable, CustomStringConver } open func row(_ index: Int) -> ValueArraySlice { - return ValueArraySlice(base: elements, startIndex: index * columns, endIndex: (index + 1) * columns, step: 1) + return ValueArraySlice(base: elements, startIndex: index * columns, endIndex: (index + 1) * columns, step: 1) } open func column(_ index: Int) -> ValueArraySlice { - return ValueArraySlice(base: elements, startIndex: index, endIndex: rows * columns - columns + index + 1, step: columns) + return ValueArraySlice(base: elements, startIndex: index, endIndex: rows * columns, step: columns) } open func copy() -> Matrix { @@ -184,7 +223,7 @@ open class Matrix: MutableQuadraticType, Equatable, CustomStringConver } open func indexIsValidForRow(_ row: Int, column: Int) -> Bool { - return row >= 0 && row < rows && column >= 0 && column < columns + return (0..: MutableQuadraticType, Equatable, CustomStringConver return description } -} -// MARK: - Equatable + open func tile(_ m: Int, _ n: Int) -> Matrix { + // Construct a block matrix of size m by n, with a copy of source matrix as each element. + // m: Specifies the number of times to copy along the vertical axis. + // n: Specifies the number of times to copy along the horizontal axis. + precondition(m > 0 && n > 0, "Minimum of 1 repeat in each direction is required") + let results = Matrix(rows: m*rows, columns: n*columns) + let typeMemorySize = MemoryLayout.size + let bytesInOneSourceRow = columns*typeMemorySize + let bytesInOneResultsRow = results.columns*typeMemorySize + for i in 0..(lhs: Matrix, rhs: Matrix) -> Bool { - return lhs.elements == rhs.elements -} + // MARK: - Equatable -public func ==(lhs: Matrix, rhs: MatrixSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: Matrix, rhs: Matrix) -> Bool { + return lhs.elements == rhs.elements } - return true -} -public func ==(lhs: Matrix, rhs: Tensor) -> Bool { - return lhs.elements == rhs.elements -} + public static func == (lhs: Matrix, rhs: Slice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } + } -public func ==(lhs: Matrix, rhs: TensorSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: Matrix, rhs: Tensor) -> Bool { + return lhs.elements == rhs.elements } - return true -} -public func ==(lhs: Matrix, rhs: TwoDimensionalTensorSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: Matrix, rhs: TensorSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } + } + + public static func == (lhs: Matrix, rhs: TwoDimensionalTensorSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true } // MARK: - diff --git a/Example/Pods/Upsurge/Source/2D/MatrixArithmetic.swift b/Example/Pods/Upsurge/Sources/Upsurge/MatrixArithmetic.swift similarity index 88% rename from Example/Pods/Upsurge/Source/2D/MatrixArithmetic.swift rename to Example/Pods/Upsurge/Sources/Upsurge/MatrixArithmetic.swift index 5d797cd..631fd26 100644 --- a/Example/Pods/Upsurge/Source/2D/MatrixArithmetic.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/MatrixArithmetic.swift @@ -39,8 +39,9 @@ public func gemm< let atrans = a.arrangement == c.arrangement ? CblasNoTrans : CblasTrans let btrans = b.arrangement == c.arrangement ? CblasNoTrans : CblasTrans + let cStride = Int32(c.stride) withPointers(a, b, &c) { pa, pb, pc in - cblas_dgemm(order, atrans, btrans, Int32(a.rows), Int32(b.columns), Int32(a.columns), α, pa, Int32(a.stride), pb, Int32(b.stride), β, pc, Int32(c.stride)) + cblas_dgemm(order, atrans, btrans, Int32(a.rows), Int32(b.columns), Int32(a.columns), α, pa, Int32(a.stride), pb, Int32(b.stride), β, pc, cStride) } } @@ -56,9 +57,11 @@ public func inv(_ x: M) -> Matrix where M.Element == D var error: __CLPK_integer = 0 var nc = __CLPK_integer(x.columns) - withPointer(&results) { pointer in - dgetrf_(&nc, &nc, pointer, &nc, &ipiv, &error) - dgetri_(&nc, pointer, &nc, &ipiv, &work, &lwork, &error) + withUnsafeMutablePointersTo(&nc, &lwork, &error) { nc, lwork, error in + withPointer(&results) { pointer in + dgetrf_(nc, nc, pointer, nc, &ipiv, error) + dgetri_(nc, pointer, nc, &ipiv, &work, lwork, error) + } } assert(error == 0, "Matrix not invertible") @@ -69,28 +72,31 @@ public func inv(_ x: M) -> Matrix where M.Element == D public func normalize(_ x: M) -> Matrix where M.Element == Double { let inputMatrix = Matrix(x) + var individualVectors: [[Double]] = [] - for i in (0..(inputMatrix.column(i)/Double(two_norm)) + let normalizedVector = [Double](inputMatrix.column(i)/Double(two_norm)) individualVectors.append(normalizedVector) } // Create a new matrix that will hold the normalized individual columns - let results = Matrix(individualVectors) - return results + return Matrix(individualVectors) } public func transpose(_ x: M) -> Matrix where M.Element == Double { - var results = Matrix(rows: x.columns, columns: x.rows, repeatedValue: 0.0) + let rows = x.columns + let columns = x.rows + var results = Matrix(rows: rows, columns: columns, repeatedValue: 0.0) + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_mtransD(xp, x.step, rp, results.step, vDSP_Length(results.rows), vDSP_Length(results.columns)) + vDSP_mtransD(xp, x.step, rp, step, vDSP_Length(rows), vDSP_Length(columns)) } return results } @@ -180,8 +186,9 @@ public func gemm< let order = c.arrangement == .rowMajor ? CblasRowMajor : CblasColMajor let atrans = a.arrangement == c.arrangement ? CblasNoTrans : CblasTrans let btrans = b.arrangement == c.arrangement ? CblasNoTrans : CblasTrans + let cStride = Int32(c.stride) withPointers(a, b, &c) { pa, pb, pc in - cblas_sgemm(order, atrans, btrans, Int32(a.rows), Int32(b.columns), Int32(a.columns), α, pa, Int32(a.stride), pb, Int32(b.stride), β, pc, Int32(c.stride)) + cblas_sgemm(order, atrans, btrans, Int32(a.rows), Int32(b.columns), Int32(a.columns), α, pa, Int32(a.stride), pb, Int32(b.stride), β, pc, cStride) } } @@ -197,9 +204,11 @@ public func inv(_ x: M) -> Matrix where M.Element == Fl var error: __CLPK_integer = 0 var nc = __CLPK_integer(x.columns) - withPointer(&results) { pointer in - sgetrf_(&nc, &nc, pointer, &nc, &ipiv, &error) - sgetri_(&nc, pointer, &nc, &ipiv, &work, &lwork, &error) + withUnsafeMutablePointersTo(&nc, &lwork, &error) { nc, lwork, error in + withPointer(&results) { pointer in + sgetrf_(nc, nc, pointer, nc, &ipiv, error) + sgetri_(nc, pointer, nc, &ipiv, &work, lwork, error) + } } assert(error == 0, "Matrix not invertible") @@ -210,15 +219,16 @@ public func inv(_ x: M) -> Matrix where M.Element == Fl public func normalize(_ x: M) -> Matrix where M.Element == Float { let inputMatrix = Matrix(x) + var individualVectors: [[Float]] = [] - for i in (0..(inputMatrix.column(i)/two_norm) + let normalizedVector = [Float](inputMatrix.column(i)/two_norm) individualVectors.append(normalizedVector) } @@ -230,8 +240,9 @@ public func normalize(_ x: M) -> Matrix where M.Element public func transpose(_ x: M) -> Matrix where M.Element == Float { var results = Matrix(rows: x.columns, columns: x.rows, repeatedValue: 0.0) + let step = results.step withPointers(x, &results) { xp, rp in - vDSP_mtrans(xp, x.step, rp, results.step, vDSP_Length(results.rows), vDSP_Length(results.columns)) + vDSP_mtrans(xp, x.step, rp, step, vDSP_Length(x.columns), vDSP_Length(x.rows)) } return results } diff --git a/Example/Pods/Upsurge/Source/2D/MatrixSlice.swift b/Example/Pods/Upsurge/Sources/Upsurge/MatrixSlice.swift similarity index 68% rename from Example/Pods/Upsurge/Source/2D/MatrixSlice.swift rename to Example/Pods/Upsurge/Sources/Upsurge/MatrixSlice.swift index 4f8609f..08cba77 100644 --- a/Example/Pods/Upsurge/Source/2D/MatrixSlice.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/MatrixSlice.swift @@ -20,16 +20,15 @@ import Foundation -open class MatrixSlice: MutableQuadraticType, CustomStringConvertible, Equatable { +open class MatrixSlice: MutableQuadraticType, CustomStringConvertible, Equatable { public typealias Index = (Int, Int) public typealias Slice = MatrixSlice - public typealias Element = T - open var rows: Int - open var columns: Int + open let rows: Int + open let columns: Int - open var base: Matrix - open var span: Span + open let base: Matrix + open let span: Span open func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { let index = linearIndex(span.startIndex) @@ -42,7 +41,7 @@ open class MatrixSlice: MutableQuadraticType, CustomStringConvertible, open func withUnsafePointer(_ body: (UnsafePointer) throws -> R) rethrows -> R { let index = linearIndex(span.startIndex) return try base.withUnsafePointer { pointer in - return try body(pointer + index) + try body(pointer + index) } } @@ -57,7 +56,7 @@ open class MatrixSlice: MutableQuadraticType, CustomStringConvertible, open func withUnsafeMutablePointer(_ body: (UnsafeMutablePointer) throws -> R) rethrows -> R { let index = linearIndex(span.startIndex) return try base.withUnsafeMutablePointer { pointer in - return try body(pointer + index) + try body(pointer + index) } } @@ -104,12 +103,12 @@ open class MatrixSlice: MutableQuadraticType, CustomStringConvertible, fileprivate subscript(span: Span) -> Slice { get { - assert(self.span.contains(span)) + assert(span.contains(span)) return MatrixSlice(base: base, span: span) } set { - assert(self.span.contains(span)) - assert(self.span ≅ newValue.span) + assert(span.contains(span)) + assert(span ≅ newValue.span) for (lhsIndex, rhsIndex) in zip(span, newValue.span) { self[lhsIndex] = newValue[rhsIndex] } @@ -138,21 +137,21 @@ open class MatrixSlice: MutableQuadraticType, CustomStringConvertible, open func indexIsValid(_ indices: [Int]) -> Bool { assert(indices.count == dimensions.count) - for (i, index) in indices.enumerated() { - if index < span[i].lowerBound || span[i].upperBound < index { - return false - } + return indices.enumerated().all { (i, index) in + self.span[i].contains(index) } - return true } open var description: String { var description = "" - for i in 0..: MutableQuadraticType, CustomStringConvertible, return description } } +extension MatrixSlice { + // MARK: - Equatable -// MARK: - Equatable - -public func ==(lhs: MatrixSlice, rhs: Matrix) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: MatrixSlice, rhs: Matrix) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true -} -public func ==(lhs: MatrixSlice, rhs: MatrixSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: MatrixSlice, rhs: MatrixSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true -} -public func ==(lhs: MatrixSlice, rhs: Tensor) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: MatrixSlice, rhs: Tensor) -> Bool { + assert(lhs.span ≅ rhs.span) + + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true -} -public func ==(lhs: MatrixSlice, rhs: TensorSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: MatrixSlice, rhs: TensorSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true -} -public func ==(lhs: MatrixSlice, rhs: TwoDimensionalTensorSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: MatrixSlice, rhs: TwoDimensionalTensorSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true } diff --git a/Example/Pods/Upsurge/Source/Operations/PointerUtilities.swift b/Example/Pods/Upsurge/Sources/Upsurge/PointerUtilities.swift similarity index 52% rename from Example/Pods/Upsurge/Source/Operations/PointerUtilities.swift rename to Example/Pods/Upsurge/Sources/Upsurge/PointerUtilities.swift index b61241b..893270f 100644 --- a/Example/Pods/Upsurge/Source/Operations/PointerUtilities.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/PointerUtilities.swift @@ -34,11 +34,34 @@ public func withPointer(_ t: inout T, body: (UnsafeMuta // MARK: Two parameters +/// Invokes the given closure with pointers to the given arguments (2 parameter version). +/// +/// - See: `withUnsafePointer(to:body:)` +@discardableResult +public func withUnsafePointersTo(_ a: inout A, _ b: inout B, body: (UnsafePointer, UnsafePointer) throws -> Result) rethrows -> Result { + return try withUnsafePointer(to: &a) { (a: UnsafePointer) throws -> Result in + return try withUnsafePointer(to: &b) { (b: UnsafePointer) throws -> Result in + return try body(a, b) + } + } +} + +/// Invokes the given closure with mutable pointers to the given arguments (2 parameter version). +/// +/// - See: `withUnsafeMutablePointer(to:body:)` +@discardableResult +public func withUnsafeMutablePointersTo(_ a: inout A, _ b: inout B, body: (UnsafeMutablePointer, UnsafeMutablePointer) throws -> Result) rethrows -> Result { + return try withUnsafeMutablePointer(to: &a) { (a: UnsafeMutablePointer) throws -> Result in + return try withUnsafeMutablePointer(to: &b) { (b: UnsafeMutablePointer) throws -> Result in + return try body(a, b) + } + } +} /// Call `body(p1, p2)` with the pointers for the two types public func withPointers(_ t1: T1, _ t2: T2, body: (UnsafePointer, UnsafePointer) throws -> R) rethrows -> R where T1.Element == T2.Element { return try t1.withUnsafeBufferPointer { p1 in - return try t2.withUnsafeBufferPointer { p2 in - return try body(p1.baseAddress!, p2.baseAddress!) + try t2.withUnsafeBufferPointer { p2 in + try body(p1.baseAddress!, p2.baseAddress!) } } } @@ -46,8 +69,8 @@ public func withPointers(_ t1: T1, _ t2: T2, /// Call `body(p1, p2)` with the pointers for the two types public func withPointers(_ t1: T1, _ t2: inout T2, body: (UnsafePointer, UnsafeMutablePointer) throws -> R) rethrows -> R where T1.Element == T2.Element { return try t1.withUnsafeBufferPointer { p1 in - return try t2.withUnsafeMutableBufferPointer { p2 in - return try body(p1.baseAddress!, p2.baseAddress!) + try t2.withUnsafeMutableBufferPointer { p2 in + try body(p1.baseAddress!, p2.baseAddress!) } } } @@ -55,8 +78,8 @@ public func withPointers(_ t1: T1, _ t /// Call `body(p1, p2)` with the pointers for the two types public func withPointers(_ t1: inout T1, _ t2: T2, body: (UnsafeMutablePointer, UnsafePointer) throws -> R) rethrows -> R where T1.Element == T2.Element { return try t1.withUnsafeMutableBufferPointer { p1 in - return try t2.withUnsafeBufferPointer { p2 in - return try body(p1.baseAddress!, p2.baseAddress!) + try t2.withUnsafeBufferPointer { p2 in + try body(p1.baseAddress!, p2.baseAddress!) } } } @@ -64,8 +87,8 @@ public func withPointers(_ t1: inout T /// Call `body(p1, p2)` with the pointers for the two types public func withPointers(_ t1: inout T1, _ t2: inout T2, body: (UnsafeMutablePointer, UnsafeMutablePointer) throws -> R) rethrows -> R where T1.Element == T2.Element { return try t1.withUnsafeMutableBufferPointer { p1 in - return try t2.withUnsafeMutableBufferPointer { p2 in - return try body(p1.baseAddress!, p2.baseAddress!) + try t2.withUnsafeMutableBufferPointer { p2 in + try body(p1.baseAddress!, p2.baseAddress!) } } } @@ -75,9 +98,37 @@ public func withPointers(_ t1: /// Call `body(p1, p2, p3)` with the pointers for the three types public func withPointers(_ t1: T1, _ t2: T2, _ t3: inout T3, body: (UnsafePointer, UnsafePointer, UnsafeMutablePointer) throws -> R) rethrows -> R where T1.Element == T2.Element, T2.Element == T3.Element { return try t1.withUnsafeBufferPointer { p1 in - return try t2.withUnsafeBufferPointer { p2 in - return try t3.withUnsafeMutableBufferPointer { p3 in - return try body(p1.baseAddress!, p2.baseAddress!, p3.baseAddress!) + try t2.withUnsafeBufferPointer { p2 in + try t3.withUnsafeMutableBufferPointer { p3 in + try body(p1.baseAddress!, p2.baseAddress!, p3.baseAddress!) + } + } + } +} + +/// Invokes the given closure with pointers to the given arguments (3 parameter version). +/// +/// - See: `withUnsafePointer(to:body:)` +@discardableResult +public func withUnsafePointersTo(_ a: inout A, _ b: inout B, _ c: inout C, body: (UnsafePointer, UnsafePointer, UnsafePointer) throws -> Result) rethrows -> Result { + return try withUnsafePointer(to: &a) { (a: UnsafePointer) throws -> Result in + return try withUnsafePointer(to: &b) { (b: UnsafePointer) throws -> Result in + return try withUnsafePointer(to: &c) { (c: UnsafePointer) throws -> Result in + return try body(a, b, c) + } + } + } +} + +/// Invokes the given closure with mutable pointers to the given arguments (3 parameter version). +/// +/// - See: `withUnsafeMutablePointer(to:body:)` +@discardableResult +public func withUnsafeMutablePointersTo(_ a: inout A, _ b: inout B, _ c: inout C, body: (UnsafeMutablePointer, UnsafeMutablePointer, UnsafeMutablePointer) throws -> Result) rethrows -> Result { + return try withUnsafeMutablePointer(to: &a) { (a: UnsafeMutablePointer) throws -> Result in + return try withUnsafeMutablePointer(to: &b) { (b: UnsafeMutablePointer) throws -> Result in + return try withUnsafeMutablePointer(to: &c) { (c: UnsafeMutablePointer) throws -> Result in + return try body(a, b, c) } } } diff --git a/Example/Pods/Upsurge/Source/2D/QuadraticType.swift b/Example/Pods/Upsurge/Sources/Upsurge/QuadraticType.swift similarity index 98% rename from Example/Pods/Upsurge/Source/2D/QuadraticType.swift rename to Example/Pods/Upsurge/Sources/Upsurge/QuadraticType.swift index 6940c91..3768f43 100644 --- a/Example/Pods/Upsurge/Source/2D/QuadraticType.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/QuadraticType.swift @@ -27,7 +27,6 @@ public enum QuadraticArrangement { } public protocol QuadraticType: TensorType { - associatedtype Element /// The arrangement of rows and columns var arrangement: QuadraticArrangement { get } diff --git a/Example/Pods/Upsurge/Source/Types/Real.swift b/Example/Pods/Upsurge/Sources/Upsurge/Real.swift similarity index 93% rename from Example/Pods/Upsurge/Source/Types/Real.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Real.swift index b0cfcc5..5e20f9c 100644 --- a/Example/Pods/Upsurge/Source/Types/Real.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Real.swift @@ -19,7 +19,7 @@ // THE SOFTWARE. /// A real number -public protocol Real: FloatingPoint, ExpressibleByFloatLiteral, ExpressibleByIntegerLiteral, Comparable, CustomStringConvertible, Equatable, Hashable {} +public protocol Real: FloatingPoint, ExpressibleByFloatLiteral, CustomStringConvertible {} extension Double: Real {} extension Float: Real {} diff --git a/Example/Pods/Upsurge/Sources/Upsurge/Sequence.swift b/Example/Pods/Upsurge/Sources/Upsurge/Sequence.swift new file mode 100644 index 0000000..06146bf --- /dev/null +++ b/Example/Pods/Upsurge/Sources/Upsurge/Sequence.swift @@ -0,0 +1,36 @@ +// Copyright © 2015 Venture Media Labs. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +import Foundation + +extension Sequence { + func all(predicate: (Iterator.Element) -> Bool) -> Bool { + for e in self where !predicate(e) { + return false + } + return true + } +} + +internal extension Collection { + func indexIsValid(_ index: Index) -> Bool { + return (startIndex.. + public typealias ElementType = CountableRange - var ranges: [Element] + private var ranges: [ElementType] - var startIndex: [Int] { + public var startIndex: [Int] { return ranges.map { $0.lowerBound } } - var endIndex: [Int] { - return ranges.map { $0.upperBound + 1 } + public var endIndex: [Int] { + return ranges.map { $0.upperBound } } - var count: Int { + public var count: Int { return dimensions.reduce(1, *) } - var rank: Int { + public var rank: Int { return ranges.count } - var dimensions: [Int] { + public var dimensions: [Int] { return ranges.map { $0.count } } - init(ranges: [Element]) { + public init(ranges: [ElementType]) { self.ranges = ranges } - public init(arrayLiteral elements: Element...) { + public init(ranges: [CountableClosedRange]) { + self.ranges = ranges.map({ CountableRange($0) }) + } + + public init(arrayLiteral elements: ElementType...) { self.init(ranges: elements) } - init(base: Span, intervals: [IntervalType]) { + public init(base: Span, intervals: [IntervalType]) { assert(base.contains(intervals)) - var ranges = [Element]() - for i in 0.. Element { - return self.ranges[index] + public subscript(index: Int) -> ElementType { + return ranges[index] } - subscript(range: ClosedRange) -> ArraySlice { - return self.ranges[range] + public subscript(range: ClosedRange) -> ArraySlice { + return ranges[range] } - subscript(range: Range) -> ArraySlice { - return self.ranges[range] + public subscript(range: Range) -> ArraySlice { + return ranges[range] } - func contains(_ other: Span) -> Bool { - for i in 0.. Bool { + return (0.. Bool { + public func contains(_ intervals: [IntervalType]) -> Bool { assert(dimensions.count == intervals.count) for i in 0.. [Int]? { - return incrementIndex(presentIndex.count - 1) + public func next() -> [Int]? { + if presentIndex.isEmpty { + return nil + } + if first { + first = false + return presentIndex + } + if !incrementIndex(presentIndex.count - 1) { + return nil + } + return presentIndex } - func incrementIndex(_ position: Int) -> [Int]? { - if position < 0 || span.count <= position || kill { - return nil - } else if presentIndex[position] < span[position].upperBound { - let result = presentIndex + private func incrementIndex(_ position: Int) -> Bool { + if position < 0 || span.count <= position { + return false + } + + if presentIndex[position] < span[position].upperBound - 1 { presentIndex[position] += 1 - return result } else { - guard let result = incrementIndex(position - 1) else { - kill = true - return presentIndex + if !incrementIndex(position - 1) { + return false } presentIndex[position] = span[position].lowerBound - return result } + + return true } } diff --git a/Example/Pods/Upsurge/Source/ND/Tensor.swift b/Example/Pods/Upsurge/Sources/Upsurge/Tensor.swift similarity index 87% rename from Example/Pods/Upsurge/Source/ND/Tensor.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Tensor.swift index 06179c0..7573b7a 100644 --- a/Example/Pods/Upsurge/Source/ND/Tensor.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Tensor.swift @@ -45,6 +45,10 @@ open class Tensor: MutableTensorType, Equatable { open var span: Span + open var count: Int { + return span.count + } + public init(dimensions: [Int], elements: M) where M.Element == Element { assert(dimensions.reduce(1, *) == elements.count) self.span = Span(zeroTo: dimensions) @@ -164,7 +168,7 @@ open class Tensor: MutableTensorType, Equatable { extension Tensor { /** Extract a matrix from the tensor. - + - Precondition: All but the last two intervals must be a specific index, not a range. The last interval must either span the full dimension, or the second-last interval count must be 1. */ func asMatrix(_ span: Span) -> TwoDimensionalTensorSlice { @@ -188,40 +192,27 @@ public func swap(_ lhs: Tensor, rhs: Tensor) { // MARK: - Equatable -public func ==(lhs: Tensor, rhs: Tensor) -> Bool { - return lhs.elements == rhs.elements -} +extension Tensor { + public static func == (lhs: Tensor, rhs: Tensor) -> Bool { + return lhs.elements == rhs.elements + } -public func ==(lhs: Tensor, rhs: TensorSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: Tensor, rhs: TensorSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true -} -public func ==(lhs: Tensor, rhs: Matrix) -> Bool { - return lhs.elements == rhs.elements -} + public static func == (lhs: Tensor, rhs: Matrix) -> Bool { + return lhs.elements == rhs.elements + } -public func ==(lhs: Tensor, rhs: MatrixSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: Tensor, rhs: MatrixSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true -} -public func ==(lhs: Tensor, rhs: TwoDimensionalTensorSlice) -> Bool { - assert(lhs.span ≅ rhs.span) - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } + public static func == (lhs: Tensor, rhs: TwoDimensionalTensorSlice) -> Bool { + assert(lhs.span ≅ rhs.span) + return zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } - return true } diff --git a/Example/Pods/Upsurge/Source/ND/TensorSlice.swift b/Example/Pods/Upsurge/Sources/Upsurge/TensorSlice.swift similarity index 83% rename from Example/Pods/Upsurge/Source/ND/TensorSlice.swift rename to Example/Pods/Upsurge/Sources/Upsurge/TensorSlice.swift index f63eef6..e41035c 100644 --- a/Example/Pods/Upsurge/Source/ND/TensorSlice.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/TensorSlice.swift @@ -22,9 +22,13 @@ open class TensorSlice: MutableTensorType, Equatable { public typealias Index = [Int] public typealias Slice = TensorSlice - var base: Tensor + open let base: Tensor - open var span: Span + open let span: Span + + open var count: Int { + return span.count + } open func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { return try base.withUnsafeBufferPointer(body) @@ -99,11 +103,11 @@ open class TensorSlice: MutableTensorType, Equatable { subscript(span: Span) -> Slice { get { - assert(self.span.contains(span)) + assert(span.contains(span)) return TensorSlice(base: base, span: span) } set { - assert(self.span.contains(span)) + assert(span.contains(span)) assert(span ≅ newValue.span) for (lhsIndex, rhsIndex) in zip(span, newValue.span) { base[lhsIndex] = newValue[rhsIndex] @@ -112,16 +116,10 @@ open class TensorSlice: MutableTensorType, Equatable { } open var isContiguous: Bool { - let onesCount: Int - if let index = dimensions.index(where: { $0 != 1 }) { - onesCount = index - } else { - onesCount = rank - } - - let diff = (0..: MutableTensorType, Equatable { open func indexIsValid(_ indices: [Int]) -> Bool { assert(indices.count == dimensions.count) - for (i, index) in indices.enumerated() { - if index < span[i].lowerBound || span[i].upperBound < index { - return false - } - } - return true + return indices.enumerated().all { (i, index) in self.span[i].contains(index) } } } // MARK: - Equatable public func ==(lhs: L, rhs: R) -> Bool where L.Element == R.Element, L.Element: Equatable { - if !(lhs.span ≅ rhs.span) { - return false - } - - for (lhsIndex, rhsIndex) in zip(lhs.span, rhs.span) { - if lhs[lhsIndex] != rhs[rhsIndex] { - return false - } - } - return true + return lhs.span ≅ rhs.span && zip(lhs.span, rhs.span).all { lhs[$0] == rhs[$1] } } diff --git a/Example/Pods/Upsurge/Source/ND/TensorType.swift b/Example/Pods/Upsurge/Sources/Upsurge/TensorType.swift similarity index 89% rename from Example/Pods/Upsurge/Source/ND/TensorType.swift rename to Example/Pods/Upsurge/Sources/Upsurge/TensorType.swift index 82b6856..ed29fcb 100644 --- a/Example/Pods/Upsurge/Source/ND/TensorType.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/TensorType.swift @@ -24,6 +24,7 @@ public protocol TensorType { /// A description of the dimensions over which the TensorType spans var span: Span { get } + var count: Int { get } subscript(intervals: [IntervalType]) -> Slice { get } subscript(intervals: [Int]) -> Element { get } @@ -41,11 +42,6 @@ public extension TensorType { return span.dimensions } - /// The number of valid element in the memory block, taking into account the step size. - public var count: Int { - return span.count - } - /// The number of dimensions public var rank: Int { return span.rank @@ -63,16 +59,9 @@ public extension TensorType { /// Check that an index falls within the span public func indexIsValid(_ indices: [Int]) -> Bool { - if indices.count != rank { - return false - } - - for (i, index) in indices.enumerated() { - if index < span[i].lowerBound || span[i].upperBound < index { - return false - } + return indices.count == rank && indices.enumerated().all { (i, index) in + self.span[i].contains(index) } - return true } } @@ -92,6 +81,7 @@ public extension MutableTensorType { /// /// - precondition: The available space on `self` is greater than or equal to the number of elements on `lhs` mutating func assignFrom(_ rhs: T) where T.Element == Element { + let count = self.count precondition(rhs.count <= count) withPointers(&self, rhs) { lhsp, rhsp in lhsp.assign(from: UnsafeMutablePointer(mutating: rhsp), count: count) diff --git a/Example/Pods/Upsurge/Source/Operations/Trigonometric.swift b/Example/Pods/Upsurge/Sources/Upsurge/Trigonometric.swift similarity index 97% rename from Example/Pods/Upsurge/Source/Operations/Trigonometric.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Trigonometric.swift index 6fe611b..7566fc9 100644 --- a/Example/Pods/Upsurge/Source/Operations/Trigonometric.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Trigonometric.swift @@ -114,7 +114,7 @@ func rad2deg(_ x: M) -> ValueArray where M.Element == Dou precondition(x.step == 1, "rad2deg doesn't support step values other than 1") let results = ValueArray(count: x.count) - let divisor = ValueArray(count: x.count, repeatedValue: M_PI / 180.0) + let divisor = ValueArray(count: x.count, repeatedValue: Double.pi / 180.0) withPointer(x) { xp in vvdiv(results.mutablePointer + results.startIndex, xp + x.startIndex, divisor.pointer, [Int32(x.count)]) } @@ -127,7 +127,7 @@ func deg2rad(_ x: M) -> ValueArray where M.Element == Dou precondition(x.step == 1, "deg2rad doesn't support step values other than 1") let results = ValueArray(count: x.count) - let divisor = ValueArray(count: x.count, repeatedValue: 180.0 / M_PI) + let divisor = ValueArray(count: x.count, repeatedValue: 180.0 / Double.pi) withPointer(x) { xp in vvdiv(results.mutablePointer + results.startIndex, xp + x.startIndex, divisor.pointer, [Int32(x.count)]) } @@ -229,7 +229,7 @@ func rad2deg(_ x: M) -> ValueArray where M.Element == Floa precondition(x.step == 1, "rad2deg doesn't support step values other than 1") let results = ValueArray(count: x.count) - let divisor = ValueArray(count: x.count, repeatedValue: Float(M_PI / 180.0)) + let divisor = ValueArray(count: x.count, repeatedValue: Float.pi / 180.0) withPointer(x) { xp in vvdivf(results.mutablePointer + results.startIndex, xp + x.startIndex, divisor.pointer, [Int32(x.count)]) } @@ -242,7 +242,7 @@ func deg2rad(_ x: M) -> ValueArray where M.Element == Floa precondition(x.step == 1, "deg2rad doesn't support step values other than 1") let results = ValueArray(count: x.count) - let divisor = ValueArray(count: x.count, repeatedValue: Float(180.0 / M_PI)) + let divisor = ValueArray(count: x.count, repeatedValue: 180.0 / Float.pi) withPointer(x) { xp in vvdivf(results.mutablePointer + results.startIndex, xp + x.startIndex, divisor.pointer, [Int32(x.count)]) } diff --git a/Example/Pods/Upsurge/Source/Types/Value.swift b/Example/Pods/Upsurge/Sources/Upsurge/Value.swift similarity index 93% rename from Example/Pods/Upsurge/Source/Types/Value.swift rename to Example/Pods/Upsurge/Sources/Upsurge/Value.swift index 6912bf6..2cdf258 100644 --- a/Example/Pods/Upsurge/Source/Types/Value.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/Value.swift @@ -20,7 +20,7 @@ import Foundation -public protocol Value: Comparable, CustomStringConvertible, Equatable, Hashable {} +public protocol Value: Comparable, CustomStringConvertible, Hashable {} extension Double: Value {} extension Float: Value {} diff --git a/Example/Pods/Upsurge/Source/1D/ValueArray.swift b/Example/Pods/Upsurge/Sources/Upsurge/ValueArray.swift similarity index 61% rename from Example/Pods/Upsurge/Source/1D/ValueArray.swift rename to Example/Pods/Upsurge/Sources/Upsurge/ValueArray.swift index f7e0831..74d8a21 100644 --- a/Example/Pods/Upsurge/Source/1D/ValueArray.swift +++ b/Example/Pods/Upsurge/Sources/Upsurge/ValueArray.swift @@ -18,14 +18,21 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +import Accelerate + /// A `ValueArray` is similar to an `Array` but it's a `class` instead of a `struct` and it has a fixed size. As opposed to an `Array`, assigning a `ValueArray` to a new variable will not create a copy, it only creates a new reference. If any reference is modified all other references will reflect the change. To copy a `ValueArray` you have to explicitly call `copy()`. open class ValueArray: MutableLinearType, ExpressibleByArrayLiteral, CustomStringConvertible, Equatable { public typealias Index = Int + public typealias IndexDistance = Int public typealias Slice = ValueArraySlice - var mutablePointer: UnsafeMutablePointer - open internal(set) var capacity: Int - open var count: Int + convenience required public init() { + self.init(count: 0) + } + + internal(set) var mutablePointer: UnsafeMutablePointer + open internal(set) var capacity: IndexDistance + open internal(set) var count: IndexDistance open var startIndex: Index { return 0 @@ -35,7 +42,7 @@ open class ValueArray: MutableLinearType, ExpressibleByArrayLite return count } - open var step: Index { + open var step: IndexDistance { return 1 } @@ -60,34 +67,34 @@ open class ValueArray: MutableLinearType, ExpressibleByArrayLite } open var pointer: UnsafePointer { - return UnsafePointer(mutablePointer) + return UnsafePointer(mutablePointer) } /// Construct an uninitialized ValueArray with the given capacity - public required init(capacity: Int) { - mutablePointer = UnsafeMutablePointer.allocate(capacity: capacity) + public required init(capacity: IndexDistance) { + mutablePointer = UnsafeMutablePointer.allocate(capacity: capacity) self.capacity = capacity self.count = 0 } /// Construct an uninitialized ValueArray with the given size - public required init(count: Int) { - mutablePointer = UnsafeMutablePointer.allocate(capacity: count) + public required init(count: IndexDistance) { + mutablePointer = UnsafeMutablePointer.allocate(capacity: count) self.capacity = count self.count = count } /// Construct a ValueArray from an array literal public required init(arrayLiteral elements: Element...) { - mutablePointer = UnsafeMutablePointer.allocate(capacity: elements.count) + mutablePointer = UnsafeMutablePointer.allocate(capacity: elements.count) self.capacity = elements.count self.count = elements.count - mutablePointer.initialize(from: elements) + _ = UnsafeMutableBufferPointer(start: mutablePointer, count: count).initialize(from: elements) } /// Construct a ValueArray from contiguous memory public required init(_ values: C) where C.Element == Element { - mutablePointer = UnsafeMutablePointer.allocate(capacity: values.count) + mutablePointer = UnsafeMutablePointer.allocate(capacity: values.count) capacity = values.count count = values.count values.withUnsafeBufferPointer { pointer in @@ -97,19 +104,25 @@ open class ValueArray: MutableLinearType, ExpressibleByArrayLite } } - /// Construct a ValueArray of `count` elements, each initialized to `repeatedValue`. - public required init(count: Int, repeatedValue: Element) { - mutablePointer = UnsafeMutablePointer.allocate(capacity: count) - capacity = count - self.count = count - for i in 0..(_ values: S) where ValueArray.Element == S.Element { + let array = Array(values) + mutablePointer = UnsafeMutablePointer.allocate(capacity: array.count) + capacity = array.count + count = array.count + for (i, value) in zip(array.indices, array) { + mutablePointer[i] = value } } + /// Construct a ValueArray of `count` elements, each initialized to `repeatedValue`. + public required convenience init(count: IndexDistance, repeatedValue: Element) { + self.init(count: count) { repeatedValue } + } + /// Construct a ValueArray of `count` elements, each initialized with `initializer`. - public required init(count: Int, initializer: () -> Element) { - mutablePointer = UnsafeMutablePointer.allocate(capacity: count) + public required init(count: IndexDistance, initializer: () -> Element) { + mutablePointer = UnsafeMutablePointer.allocate(capacity: count) capacity = count self.count = count for i in 0..: MutableLinearType, ExpressibleByArrayLite } deinit { - mutablePointer.deallocate(capacity: capacity) + mutablePointer.deallocate() + } + + public func assign(_ elements: C) where C.Element == Element { + for (i, value) in zip(indices, elements) { + mutablePointer[i] = value + } } open subscript(index: Index) -> Element { get { assert(indexIsValid(index)) - return pointer[index * step] + return pointer[index] } set { assert(indexIsValid(index)) - mutablePointer[index * step] = newValue + mutablePointer[index] = newValue } } @@ -170,36 +189,29 @@ open class ValueArray: MutableLinearType, ExpressibleByArrayLite } } - open func index(after i: Int) -> Int { - return i + 1 - } - - open func formIndex(after i: inout Int) { - i += 1 - } - open func copy() -> ValueArray { let copy = ValueArray(count: capacity) copy.mutablePointer.initialize(from: mutablePointer, count: count) return copy } - open func append(_ value: Element) { + open func append(_ newElement: Element) { precondition(count + 1 <= capacity) - mutablePointer[count] = value + mutablePointer[count] = newElement count += 1 } - open func appendContentsOf(_ values: C) where C.Iterator.Element == Element { - precondition(count + Int(values.count.toIntMax()) <= capacity) + open func append(contentsOf newElements: S) where S.Iterator.Element == Element { + let a = Array(newElements) + precondition(count + a.count <= capacity) let endPointer = mutablePointer + count - endPointer.initialize(from: values) - count += Int(values.count.toIntMax()) + _ = UnsafeMutableBufferPointer(start: endPointer, count: capacity - count).initialize(from: a) + count += a.count } - open func replaceRange(_ subRange: Range, with newElements: C) where C.Iterator.Element == Element { - assert(subRange.lowerBound >= startIndex && subRange.upperBound <= endIndex) - (mutablePointer + subRange.lowerBound).initialize(from: newElements) + open func replaceSubrange(_ subrange: Range, with newElements: C) where C.Iterator.Element == Element { + assert(subrange.lowerBound >= startIndex && subrange.upperBound <= endIndex) + _ = UnsafeMutableBufferPointer(start: mutablePointer + subrange.lowerBound, count: capacity - subrange.lowerBound).initialize(from: newElements) } open func toRowMatrix() -> Matrix { @@ -210,22 +222,33 @@ open class ValueArray: MutableLinearType, ExpressibleByArrayLite return Matrix(rows: count, columns: 1, elements: self) } - open var description: String { - var string = "[" - for v in self { - string += "\(v.description), " - } - if string.distance(from: string.startIndex, to: string.endIndex) > 1 { - let range = string.index(string.endIndex, offsetBy: -2).. Matrix { + precondition(rows*columns == count, "Element count must equal rows*columns") + return Matrix(rows: rows, columns: columns, elements: self) + } + + open func tile(_ m: Int, _ n: Int) -> Matrix { + // Construct a block matrix of size m by n, with a copy of source as each element. + // m: Specifies the number of times to copy along the vertical axis. + // n: Specifies the number of times to copy along the horizontal axis. + precondition(m > 0 && n > 0, "Minimum of 1 repeat in each direction is required") + let results = ValueArray(count: m*n*count) + let typeMemorySize = MemoryLayout.size + let bytesInSource = count*typeMemorySize + for i in 0.. Bool { + return lhs.count == rhs.count && lhs.elementsEqual(rhs) } - open var debugDescription: String { - return description + public static func == (lhs: ValueArray, rhs: Slice) -> Bool { + return lhs.count == rhs.count && lhs.elementsEqual(rhs) } } @@ -236,31 +259,3 @@ public func swap(_ lhs: inout ValueArray, rhs: inout ValueArray) { swap(&lhs.capacity, &rhs.capacity) swap(&lhs.count, &rhs.count) } - -// MARK: - Equatable - -public func ==(lhs: ValueArray, rhs: ValueArray) -> Bool { - if lhs.count != rhs.count { - return false - } - - for i in 0..(lhs: ValueArray, rhs: ValueArraySlice) -> Bool { - if lhs.count != rhs.count { - return false - } - - for (lhsIndex, rhsIndex) in zip(0..: MutableLinearType, CustomStringConvertible, Equatable { public typealias Index = Int + public typealias IndexDistance = Int public typealias Slice = ValueArraySlice + public typealias Base = ValueArray - var base: ValueArray - public var startIndex: Int - public var endIndex: Int - public var step: Int + public let base: Base + public let baseStartIndex: Index + public let baseEndIndex: Index + public let step: IndexDistance + + public var startIndex: Index { + return 0 + } + + public var endIndex: Index { + return (baseEndIndex - baseStartIndex + step - 1) / step + } public var span: Span { - return Span(ranges: [startIndex ... endIndex - 1]) + return Span(ranges: [startIndex ..< endIndex]) } public func withUnsafeBufferPointer(_ body: (UnsafeBufferPointer) throws -> R) rethrows -> R { - return try base.withUnsafeBufferPointer(body) + return try base.withUnsafeBufferPointer { p in + return try body(UnsafeBufferPointer(rebasing: p[baseStartIndex ..< baseEndIndex])) + } } public func withUnsafePointer(_ body: (UnsafePointer) throws -> R) rethrows -> R { - return try base.withUnsafePointer(body) + return try base.withUnsafePointer { p in + return try body(p + baseStartIndex) + } } public func withUnsafeMutableBufferPointer(_ body: (UnsafeMutableBufferPointer) throws -> R) rethrows -> R { - return try base.withUnsafeMutableBufferPointer(body) + return try base.withUnsafeMutableBufferPointer { p in + return try body(UnsafeMutableBufferPointer(rebasing: p[baseStartIndex ..< baseEndIndex])) + } } public func withUnsafeMutablePointer(_ body: (UnsafeMutablePointer) throws -> R) rethrows -> R { - return try base.withUnsafeMutablePointer(body) + return try base.withUnsafeMutablePointer { p in + return try body(p + baseStartIndex) + } } - public init(base: ValueArray, startIndex: Int, endIndex: Int, step: Int) { + public init(base: Base, startIndex: Index, endIndex: Index, step: IndexDistance) { assert(base.startIndex <= startIndex && endIndex <= base.endIndex) self.base = base - self.startIndex = startIndex - self.endIndex = endIndex + self.baseStartIndex = startIndex + self.baseEndIndex = endIndex self.step = step } + public func assign(_ elements: C) where C.Element == Element { + for (i, value) in zip(stride(from: baseStartIndex, to: baseEndIndex, by: step), elements) { + base[i] = value + } + } + public subscript(index: Index) -> Element { get { - assert(indexIsValid(index)) - return base[index * step] + assert(index >= startIndex && index < endIndex) + return base[baseStartIndex + index * step] } set { - assert(indexIsValid(index)) - base[index * step] = newValue + assert(index >= startIndex && index < endIndex) + base[baseStartIndex + index * step] = newValue } } public subscript(intervals: [IntervalType]) -> Slice { get { - assert(self.span.contains(intervals)) + assert(span.contains(intervals)) assert(intervals.count == 1) let start = intervals[0].start ?? startIndex let end = intervals[0].end ?? endIndex return Slice(base: base, startIndex: start, endIndex: end, step: step) } set { - assert(self.span.contains(intervals)) + assert(span.contains(intervals)) assert(intervals.count == 1) let start = intervals[0].start ?? startIndex let end = intervals[0].end ?? endIndex @@ -97,53 +121,15 @@ public struct ValueArraySlice: MutableLinearType, CustomStringCo } } - public func index(after i: Index) -> Index { - return i + 1 - } - - public func formIndex(after i: inout Index) { - i += 1 - } - public var description: String { - var string = "[" - for i in stride(from: startIndex, to: endIndex, by: step) { - string += "\(base[i]), " - } - if string.distance(from: string.startIndex, to: string.endIndex) > 1 { - let range = string.index(string.endIndex, offsetBy: -2)..(lhs: ValueArraySlice, rhs: ValueArray) -> Bool { - if lhs.count != rhs.count { - return false - } - - for (lhsIndex, rhsIndex) in zip(lhs.startIndex..(lhs: ValueArraySlice, rhs: ValueArraySlice) -> Bool { - if lhs.count != rhs.count { - return false - } + // MARK: - Equatable - for (lhsIndex, rhsIndex) in zip(lhs.startIndex.. Bool { + return lhs.count == rhs.count && zip(lhs.indices, rhs.indices).all { + lhs[$0] == rhs[$1] } } - return true } diff --git a/MLKit-PlayGround.playground/Contents.swift b/MLKit-PlayGround.playground/Contents.swift deleted file mode 100644 index ff8403c..0000000 --- a/MLKit-PlayGround.playground/Contents.swift +++ /dev/null @@ -1,357 +0,0 @@ -//: Playground - noun: a place where people can play - -import UIKit -import Upsurge -import MachineLearningKit -/* Already implemented in MachineLearningKit -extension Collection { - /// Return a copy of `self` with its elements shuffled - func shuffle() -> [Iterator.Element] { - var list = Array(self) - list.shuffle() - return list - } -} - -extension MutableCollection where Indices.Iterator.Element == Index { - /// Shuffles the contents of this collection. - mutating func shuffle() { - let c = count - guard c > 1 else { return } - - for (firstUnshuffled, unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) { - let d: IndexDistance = numericCast(arc4random_uniform(numericCast(unshuffledCount))) - guard d != 0 else { continue } - let i = index(firstUnshuffled, offsetBy: d) - swap(&self[firstUnshuffled], &self[i]) - } - } -} - - -struct InputDataType { - - var data: [(input: [Float], target:[Float])] - - var lengthOfTrainingData: Int { - get { - return data.count - } - } -} - - -class Layer { - - - var layerSize: (rows: Int, columns: Int)? - - public var bias: Matrix? - - public var weights: Matrix? - - public var input: Matrix? - - public var zValues: Matrix? - - public var activationValues: Matrix? - - public var Δw: Matrix? - - public var Δb: Matrix? - - public var activationFnc: Bool = false - - - init(size: (rows: Int, columns: Int)){ - - self.layerSize = size - - self.bias = generateRandomBiases() - - self.weights = generateRandomWeights() - - self.Δb = Matrix([Array(repeating: 0.0, count: (self.bias?.elements.count)!)]) - - self.Δw = Matrix([Array(repeating: 0.0, count: (self.weights?.elements.count)!)]) - } - - public func fncStep(val: Float) -> Float { - return val >= 0 ? 1.0 : 0.0 - } - - - func forward(activation:Matrix) -> Matrix { - - var a = activation - - self.input = activation - - a = (self.weights! * a) - - a = Matrix(rows: a.rows, columns: a.columns, elements: a.elements + self.bias!.elements) - - self.zValues = a - - if activationFnc == true { - a = Matrix(rows: a.rows, columns: a.columns, elements: a.elements.map(fncStep)) - }else{ - a = Matrix(rows: a.rows, columns: a.columns, elements: a.elements.map(fncSigLog)) - } - - - self.activationValues = a - - - return a - } - - - func produceOuputError(cost: Matrix) -> Matrix { - - var z = self.zValues - - z = Matrix(rows: (z?.rows)!, columns: (z?.columns)!, elements:ValueArray(z!.elements.map(derivativeOfSigLog))) - - var sigmaPrime = z - - var Δ = cost * sigmaPrime! - - return Δ - } - - - func propagateError(previousLayerDelta: Matrix, nextLayer: Layer) -> Matrix { - - // Compute the current layers δ value. - var nextLayerWeightTranspose = transpose(nextLayer.weights!) - - var deltaMultipliedBywT = nextLayerWeightTranspose * previousLayerDelta - - var sigmaPrime = Matrix(rows: (self.zValues?.rows)!, columns: (self.zValues?.columns)!, elements: ValueArray(self.zValues!.elements.map(derivativeOfSigLog))) - - var currentLayerDelta = Matrix(rows: deltaMultipliedBywT.rows, columns: deltaMultipliedBywT.columns, elements: ValueArray(deltaMultipliedBywT.elements * sigmaPrime.elements)) - - // Update the current layers weights - var inputTranspose = transpose(self.input!) - - var updatedWeights = currentLayerDelta * inputTranspose - - self.Δw = updatedWeights - - // Update the current layers bias - self.Δb = currentLayerDelta - - return currentLayerDelta - } - - - func updateWeights(miniBatchSize: Int, eta: Float){ - - var learningRate = eta/Float(miniBatchSize) - - var changeInWeights = learningRate * self.Δw! - - var changedBiases = learningRate * self.Δb! - - self.weights = self.weights! - changeInWeights - - self.bias = self.bias! - changedBiases - } - - // TODO: Make private method - func generateRandomBiases() -> Matrix { - - var biasValues: [Float] = [] - - for i in 0..(rows: (layerSize?.columns)!, columns: 1, elements: ValueArray(biasValues)) - } - - func generateRandomWeights() -> Matrix{ - var weightValues: [Float] = [] - - for i in 0..<(layerSize!.rows * layerSize!.columns) { - var weightValue = generateRandomNumber() - - weightValues.append(weightValue) - } - - - return Matrix(rows: layerSize!.columns, columns: layerSize!.rows, elements: ValueArray(weightValues)) - } - - /** - The generateRandomNumber generates a random number (normal distribution using Box-Muller tranform). - - - returns: A random number (normal distribution). - */ - func generateRandomNumber() -> Float{ - let u = Float(arc4random()) / Float(UINT32_MAX) - let v = Float(arc4random()) / Float(UINT32_MAX) - let randomNum = sqrt( -2 * log(u) ) * cos( Float(2) * Float(M_PI) * v ) - - return randomNum - } - - public func fncSigLog(val: Float) -> Float { - return 1.0 / (1.0 + exp(-val)) - } - - public func derivativeOfSigLog(val: Float) -> Float { - return fncSigLog(val: val) * (1.0 - fncSigLog(val: val)) - } - -} - - - - - - - - -// Feed Forward Implementation -class NeuralNetwork { - - public var layers: [Layer] = [] - public var numberOfLayers: Int? - public var networkSize: (inputLayerSize:Int, outputLayerSize:Int)? - - init(size:(Int, Int)){ - - self.networkSize = size - - } - - func addLayer(layer: Layer){ - - self.layers.append(layer) - } - - public func feedforward(input:Matrix) -> Matrix { - - var a = input - - for l in layers { - a = l.forward(activation: a) - } - - return a - } - - - public func SGD(trainingData: InputDataType, epochs: Int, miniBatchSize: Int, eta: Float, testData: InputDataType? = nil){ - - for i in 0..(rows: batch.input.count, columns: 1, elements: batch.input) - var outputMatrix = Matrix(rows: batch.target.count, columns: 1, elements: batch.target) - - self.backpropagate(input: inputMatrix, target: outputMatrix) - } - - for layer in layers { - - layer.updateWeights(miniBatchSize: miniBatch.lengthOfTrainingData, eta: eta) - - } - - } - - public func backpropagate(input: Matrix, target: Matrix){ - - // Feedforward - let feedForwardOutput = feedforward(input: input) - - // Output Error - let outputError = Matrix(rows: feedForwardOutput.rows, columns: feedForwardOutput.columns, elements: feedForwardOutput.elements - target.elements) - - // Output Layer Delta - var delta = layers.last?.produceOuputError(cost: outputError) - - // Set the change in weights and bias for the last layer - self.layers.last?.Δb = delta - - var activationValuesforTheSecondToLastLayer = layers[layers.count-2].activationValues - - self.layers.last?.Δw = delta! * transpose(activationValuesforTheSecondToLastLayer!) - - // Propogate error through each layer (except last) - for i in (0..(rows: 2, columns: 1, elements: [2.0,10.0]) -var trainingData = InputDataType( data: [ ([0.0,0.0], [0.0]), ([1.0,1.0],[1.0]) ] ) -print(nn.weights?[0]) -print("\n") -print(Layer(size: (2,3)).generateRandomWeights()) -*/ - - - -/* -var bias = nn.bias -var weights = nn.weights -var a = Matrix(rows: 2, columns: 1, elements: [1.0,1.0]) - -var b = weights![0] * a -var c = (b + bias![0]) -c.elements.map(nn.fncSigLog) - -//print(c) - - var d = weights![1] * c - var e = (d + bias![1]) - e.elements.map(nn.fncSigLog) - - print(e) - -*/ - -/* -var nn = NeuralNetwork(size: (2,1)) -nn.addLayer(layer: Layer(size: (2,3))) -nn.addLayer(layer: Layer(size: (3,1))) -var trainingData = InputDataType(data: [ ([0.0, 0.0], [0.0]), ([1.0, 1.0], [1.0]), ([1.0, 0.0], [0.0]), ([0.0, 1.0], [0.0])]) -var input1 = Matrix(rows: 2, columns: 1, elements: [0.0,0.0]) -var input2 = Matrix(rows: 2, columns: 1, elements: [0.0,1.0]) -var input3 = Matrix(rows: 2, columns: 1, elements: [1.0,0.0]) -var input4 = Matrix(rows: 2, columns: 1, elements: [1.0,1.0]) -nn.layers[0].activationFnc = false -nn.layers[1].activationFnc = true -nn.SGD(trainingData: trainingData, epochs: 200, miniBatchSize: 3, eta: 0.5) -print(nn.feedforward(input: input1)) -print(nn.feedforward(input: input2)) -print(nn.feedforward(input: input3)) -print(nn.feedforward(input: input4)) -*/ - -*/ diff --git a/MLKit-PlayGround.playground/contents.xcplayground b/MLKit-PlayGround.playground/contents.xcplayground deleted file mode 100644 index 5da2641..0000000 --- a/MLKit-PlayGround.playground/contents.xcplayground +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/MLKit-PlayGround.playground/playground.xcworkspace/contents.xcworkspacedata b/MLKit-PlayGround.playground/playground.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/MLKit-PlayGround.playground/playground.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/MLKit-PlayGround.playground/timeline.xctimeline b/MLKit-PlayGround.playground/timeline.xctimeline deleted file mode 100644 index cb15561..0000000 --- a/MLKit-PlayGround.playground/timeline.xctimeline +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/MLKit/Classes/ANN/Layer.swift b/MLKit/Classes/ANN/Layer.swift index df9ddd8..46a2517 100644 --- a/MLKit/Classes/ANN/Layer.swift +++ b/MLKit/Classes/ANN/Layer.swift @@ -130,9 +130,9 @@ open class Layer { z = Matrix(rows: (z?.rows)!, columns: (z?.columns)!, elements:ValueArray(z!.elements.map((activationType?.derivative())!))) - var sigmaPrime = z + let sigmaPrime = z - var Δ = cost * sigmaPrime! + let Δ = cost * sigmaPrime! return Δ } @@ -147,18 +147,18 @@ open class Layer { public func propagateError(previousLayerDelta: Matrix, nextLayer: Layer) -> Matrix { // Compute the current layers δ value. - var nextLayerWeightTranspose = transpose(nextLayer.weights!) + let nextLayerWeightTranspose = transpose(nextLayer.weights!) - var deltaMultipliedBywT = nextLayerWeightTranspose * previousLayerDelta + let deltaMultipliedBywT = nextLayerWeightTranspose * previousLayerDelta - var sigmaPrime = Matrix(rows: (self.zValues?.rows)!, columns: (self.zValues?.columns)!, elements: ValueArray(self.zValues!.elements.map((activationType?.derivative())!))) + let sigmaPrime = Matrix(rows: (self.zValues?.rows)!, columns: (self.zValues?.columns)!, elements: ValueArray(self.zValues!.elements.map((activationType?.derivative())!))) - var currentLayerDelta = Matrix(rows: deltaMultipliedBywT.rows, columns: deltaMultipliedBywT.columns, elements: ValueArray(deltaMultipliedBywT.elements * sigmaPrime.elements)) + let currentLayerDelta = Matrix(rows: deltaMultipliedBywT.rows, columns: deltaMultipliedBywT.columns, elements: ValueArray(deltaMultipliedBywT.elements * sigmaPrime.elements)) // Update the current layers weights - var inputTranspose = transpose(self.input!) + let inputTranspose = transpose(self.input!) - var updatedWeights = currentLayerDelta * inputTranspose + let updatedWeights = currentLayerDelta * inputTranspose self.Δw = updatedWeights @@ -177,11 +177,11 @@ open class Layer { */ public func updateWeights(miniBatchSize: Int, eta: Float) { - var learningRate = eta/Float(miniBatchSize) + let learningRate = eta/Float(miniBatchSize) - var changeInWeights = learningRate * self.Δw! + let changeInWeights = learningRate * self.Δw! - var changedBiases = learningRate * self.Δb! + let changedBiases = learningRate * self.Δb! self.weights = self.weights! - changeInWeights @@ -193,8 +193,8 @@ open class Layer { var biasValues: [Float] = [] - for i in 0.. Matrix { var weightValues: [Float] = [] - for i in 0..<(layerSize!.numberOfNeurons * layerSize!.outgoingSynapsesForEachNeuron) { - var weightValue = generateRandomNumber() + for _ in 0..<(layerSize!.numberOfNeurons * layerSize!.outgoingSynapsesForEachNeuron) { + let weightValue = generateRandomNumber() weightValues.append(weightValue) } @@ -223,7 +223,7 @@ open class Layer { private func generateRandomNumber() -> Float { let u = Float(arc4random()) / Float(UINT32_MAX) let v = Float(arc4random()) / Float(UINT32_MAX) - let randomNum = sqrt( -2 * log(u) ) * cos( Float(2) * Float(M_PI) * v ) + let randomNum = sqrt( -2 * log(u) ) * cos( Float(2) * Float.pi * v ) return randomNum } diff --git a/MLKit/Classes/ANN/NeuralNetwork.swift b/MLKit/Classes/ANN/NeuralNetwork.swift index 17fa7fb..b2ace2b 100644 --- a/MLKit/Classes/ANN/NeuralNetwork.swift +++ b/MLKit/Classes/ANN/NeuralNetwork.swift @@ -72,14 +72,14 @@ open class NeuralNetwork { */ public func SGD(trainingData: InputDataType, epochs: Int, miniBatchSize: Int, eta: Float, testData: InputDataType? = nil) { - for i in 0..(rows: batch.input.count, columns: 1, elements: batch.input) - var outputMatrix = Matrix(rows: batch.target.count, columns: 1, elements: batch.target) + let inputMatrix = Matrix(rows: batch.input.count, columns: 1, elements: batch.input) + let outputMatrix = Matrix(rows: batch.target.count, columns: 1, elements: batch.target) self.backpropagate(input: inputMatrix, target: outputMatrix) } @@ -132,7 +132,7 @@ open class NeuralNetwork { // Set the change in weights and bias for the last layer self.layers.last?.Δb = delta - var activationValuesforTheSecondToLastLayer = layers[layers.count-2].activationValues + let activationValuesforTheSecondToLastLayer = layers[layers.count-2].activationValues self.layers.last?.Δw = delta! * transpose(activationValuesforTheSecondToLastLayer!) diff --git a/MLKit/Classes/Genetic Algorithms/BiologicalProcessManager.swift b/MLKit/Classes/Genetic Algorithms/BiologicalProcessManager.swift index 12f29cf..5c85b60 100644 --- a/MLKit/Classes/Genetic Algorithms/BiologicalProcessManager.swift +++ b/MLKit/Classes/Genetic Algorithms/BiologicalProcessManager.swift @@ -24,19 +24,19 @@ open class BiologicalProcessManager { */ open static func onePointCrossover(crossoverRate: Float, parentOneGenotype: [Float], parentTwoGenotype: [Float]) -> ([Float], [Float]) { - var randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) + let randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) if randomProbability < crossoverRate { - var pivot: Int = Int(arc4random_uniform(UInt32(parentOneGenotype.count))) + let pivot: Int = Int(arc4random_uniform(UInt32(parentOneGenotype.count))) - var newGenotypeForChild1 = parentOneGenotype[0..(newGenotypeForChild1) + let child1Genotype = Array(newGenotypeForChild1) - var child2Genotype = Array(newGenotypeForChild2) + let child2Genotype = Array(newGenotypeForChild2) return (child1Genotype, child2Genotype) @@ -57,7 +57,7 @@ open class BiologicalProcessManager { */ private static func generateRandomIndexes(genotypeCount: Int) -> (Int, Int) { - var randomIndexOne = Int(arc4random_uniform(UInt32(genotypeCount))) + let randomIndexOne = Int(arc4random_uniform(UInt32(genotypeCount))) var randomIndexTwo = Int(arc4random_uniform(UInt32(genotypeCount))) if randomIndexOne == randomIndexTwo { @@ -87,7 +87,7 @@ open class BiologicalProcessManager { */ open static func bitFlipMutation(mutationRate: Float, genotype:inout [Float]) { - var randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) + let randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) if randomProbability < mutationRate { @@ -111,13 +111,13 @@ open class BiologicalProcessManager { */ open static func swapMutation(mutationRate: Float, genotype:inout [Float]) { - var randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) + let randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) if randomProbability < mutationRate { - var randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) + let randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) - var temp = genotype[randomIdx.0] + let temp = genotype[randomIdx.0] genotype[randomIdx.0] = genotype[randomIdx.1] @@ -135,13 +135,13 @@ open class BiologicalProcessManager { */ open static func insertMutation(mutationRate: Float, genotype:inout [Float]) { - var randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) + let randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) if randomProbability < mutationRate { - var randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) + let randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) - var temp = genotype[randomIdx.1] + let temp = genotype[randomIdx.1] genotype.remove(at: randomIdx.1) @@ -159,18 +159,18 @@ open class BiologicalProcessManager { */ open static func scrambleMutation(mutationRate: Float, genotype:inout [Float]) { - var randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) + let randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) if randomProbability < mutationRate { - var randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) + let randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) if randomIdx.0 > randomIdx.1 { - var subset = genotype[randomIdx.1...randomIdx.0].shuffle() + _ = genotype[randomIdx.1...randomIdx.0].shuffle() } else { - var subset = genotype[randomIdx.0...randomIdx.1].shuffle() + _ = genotype[randomIdx.0...randomIdx.1].shuffle() } } } @@ -184,11 +184,11 @@ open class BiologicalProcessManager { */ open static func inverseMutation(mutationRate: Float, genotype:inout [Float]) { - var randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) + let randomProbability: Float = Float(arc4random()) / Float(UINT32_MAX) if randomProbability < mutationRate { - var randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) + let randomIdx = generateRandomIndexes(genotypeCount: genotype.count - 1) if randomIdx.0 > randomIdx.1 { diff --git a/MLKit/Classes/Genetic Algorithms/Population.swift b/MLKit/Classes/Genetic Algorithms/Population.swift index 331f224..32aec6c 100644 --- a/MLKit/Classes/Genetic Algorithms/Population.swift +++ b/MLKit/Classes/Genetic Algorithms/Population.swift @@ -26,7 +26,7 @@ open class PopulationManager { // Create a "tournament" (an array of randomly selected genomes). for _ in 0.. maxFitness { - maxFitness = genome.fitness as! Float + maxFitness = genome.fitness firstBestGenome = genome indexOfBestGenome = i } diff --git a/MLKit/Classes/Helper Classes & Extensions/Extensions.swift b/MLKit/Classes/Helper Classes & Extensions/Extensions.swift index 1bed855..1741d93 100644 --- a/MLKit/Classes/Helper Classes & Extensions/Extensions.swift +++ b/MLKit/Classes/Helper Classes & Extensions/Extensions.swift @@ -27,10 +27,10 @@ extension MutableCollection where Indices.Iterator.Element == Index { guard c > 1 else { return } for (firstUnshuffled, unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) { - let d: IndexDistance = numericCast(arc4random_uniform(numericCast(unshuffledCount))) + let d: Int = numericCast(arc4random_uniform(numericCast(unshuffledCount))) guard d != 0 else { continue } let i = index(firstUnshuffled, offsetBy: d) - swap(&self[firstUnshuffled], &self[i]) + self.swapAt(firstUnshuffled, i) } } } diff --git a/MLKit/Classes/K Means Clustering/KMeans.swift b/MLKit/Classes/K Means Clustering/KMeans.swift index 5cf5d4a..975be5f 100644 --- a/MLKit/Classes/K Means Clustering/KMeans.swift +++ b/MLKit/Classes/K Means Clustering/KMeans.swift @@ -76,16 +76,16 @@ open class KMeans { // Obtain the previous clusters comparison = trainingCentroids - for var i in 0.. distance) ? finalDifference:distance diff --git a/MLKit/Classes/Regression/LassoRegression.swift b/MLKit/Classes/Regression/LassoRegression.swift index 8cbd1be..e799bb5 100644 --- a/MLKit/Classes/Regression/LassoRegression.swift +++ b/MLKit/Classes/Regression/LassoRegression.swift @@ -138,10 +138,10 @@ open class LassoRegression { - returns: The cost of your model (a.k.a The Residual Sum of Squares). */ open func RSS(_ features: [Array], observation: Array) throws -> Float { - // Check if the users model has fit to their data - if self.finalWeights == nil { - throw MachineLearningError.modelHasNotBeenFit - } + // KBR: Check if the users model has fit to their data + //if self.finalWeights == nil { + // throw MachineLearningError.modelHasNotBeenFit + //} // First get the predictions let yActual = observation diff --git a/MLKit/Classes/Regression/PolynomialRegression.swift b/MLKit/Classes/Regression/PolynomialRegression.swift index a270fde..8976ee3 100644 --- a/MLKit/Classes/Regression/PolynomialRegression.swift +++ b/MLKit/Classes/Regression/PolynomialRegression.swift @@ -123,11 +123,11 @@ open class PolynomialLinearRegression { - returns: The cost of your model (a.k.a The Residual Sum of Squares). */ open func RSS(_ features: [Array], observation: Array) throws -> Float { - // Check if the users model has fit to their data - if self.finalWeights == nil { - print("You need to have fit a model first before computing the RSS/Cost Function.") - throw MachineLearningError.modelHasNotBeenFit - } + // KBR: Check if the users model has fit to their data + //if self.finalWeights == nil { + // print("You need to have fit a model first before computing the RSS/Cost Function.") + // throw MachineLearningError.modelHasNotBeenFit + //} // First get the predictions let yActual = observation diff --git a/MLKit/Classes/Regression/RidgeRegression.swift b/MLKit/Classes/Regression/RidgeRegression.swift index 69fd085..49f02da 100644 --- a/MLKit/Classes/Regression/RidgeRegression.swift +++ b/MLKit/Classes/Regression/RidgeRegression.swift @@ -125,11 +125,11 @@ open class RidgeRegression { - returns: The cost of your model (a.k.a The Residual Sum of Squares). */ open func RSS(_ features: [Array], observation: Array) throws -> Float { - // Check if the users model has fit to their data - if self.finalWeights == nil { - print("You need to have fit a model first before computing the RSS/Cost Function.") - throw MachineLearningError.modelHasNotBeenFit - } + // KBR: Check if the users model has fit to their data + //if self.finalWeights == nil { + // print("You need to have fit a model first before computing the RSS/Cost Function.") + // throw MachineLearningError.modelHasNotBeenFit + //} // First get the predictions let yActual = observation