From db9a027f5bc5472c53dbd9bdaa495d959998a7f0 Mon Sep 17 00:00:00 2001 From: Anton Davydov Date: Wed, 27 May 2020 00:31:00 +0300 Subject: [PATCH] Added support of Swift Package Manager --- .gitignore | 3 + Bender.xcodeproj/project.pbxproj | 330 +++++++++--------- .../contents.xcworkspacedata | 2 +- .../xcschemes/Bender iOS.xcscheme | 28 +- .../xcschemes/Bender macOS.xcscheme | 24 +- BenderTests-macOS/Info.plist | 22 -- Package.resolved | 25 ++ Package.swift | 50 +++ {Bender => Sources}/ArrayRule.swift | 0 {Bender => Sources}/Bender-iOS.plist | 0 {Bender => Sources}/Bender-macOS.plist | 0 {Bender => Sources}/Bender.swift | 0 {Bender => Sources}/EnumRule.swift | 0 {Bender => Sources}/JSONPath.swift | 0 {Bender => Sources}/ObjectRule.swift | 0 {Bender => Sources}/RuleError.swift | 0 {Bender => Sources}/StringifiedJSONRule.swift | 0 {Bender => Sources}/TypeRule.swift | 0 {BenderTests => Tests}/BenderInputTests.swift | 0 .../BenderOutputTests.swift | 0 .../BenderPerformanceTests.swift | 0 {BenderTests => Tests}/BenderTests-iOS.plist | 0 .../BenderTests-macOS.plist | 0 {BenderTests => Tests}/Info.plist | 0 {BenderTests => Tests}/array_skip_test.json | 0 {BenderTests => Tests}/array_test.json | 0 {BenderTests => Tests}/basic_test.json | 0 {BenderTests => Tests}/defaults_test.json | 0 {BenderTests => Tests}/enum_test.json | 0 {BenderTests => Tests}/five_megs.json | 0 .../natural_array_test.json | 0 {BenderTests => Tests}/path_test.json | 0 .../paths_through_arrays.json | 0 {BenderTests => Tests}/recursive_test.json | 0 .../stringified_negative_test.json | 0 {BenderTests => Tests}/stringified_test.json | 0 36 files changed, 269 insertions(+), 215 deletions(-) delete mode 100644 BenderTests-macOS/Info.plist create mode 100644 Package.resolved create mode 100644 Package.swift rename {Bender => Sources}/ArrayRule.swift (100%) rename {Bender => Sources}/Bender-iOS.plist (100%) rename {Bender => Sources}/Bender-macOS.plist (100%) rename {Bender => Sources}/Bender.swift (100%) rename {Bender => Sources}/EnumRule.swift (100%) rename {Bender => Sources}/JSONPath.swift (100%) rename {Bender => Sources}/ObjectRule.swift (100%) rename {Bender => Sources}/RuleError.swift (100%) rename {Bender => Sources}/StringifiedJSONRule.swift (100%) rename {Bender => Sources}/TypeRule.swift (100%) rename {BenderTests => Tests}/BenderInputTests.swift (100%) rename {BenderTests => Tests}/BenderOutputTests.swift (100%) rename {BenderTests => Tests}/BenderPerformanceTests.swift (100%) rename {BenderTests => Tests}/BenderTests-iOS.plist (100%) rename {BenderTests => Tests}/BenderTests-macOS.plist (100%) rename {BenderTests => Tests}/Info.plist (100%) rename {BenderTests => Tests}/array_skip_test.json (100%) rename {BenderTests => Tests}/array_test.json (100%) rename {BenderTests => Tests}/basic_test.json (100%) rename {BenderTests => Tests}/defaults_test.json (100%) rename {BenderTests => Tests}/enum_test.json (100%) rename {BenderTests => Tests}/five_megs.json (100%) rename {BenderTests => Tests}/natural_array_test.json (100%) rename {BenderTests => Tests}/path_test.json (100%) rename {BenderTests => Tests}/paths_through_arrays.json (100%) rename {BenderTests => Tests}/recursive_test.json (100%) rename {BenderTests => Tests}/stringified_negative_test.json (100%) rename {BenderTests => Tests}/stringified_test.json (100%) diff --git a/.gitignore b/.gitignore index 49f1db7..285f7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ Bender.xcodeproj/project.xcworkspace/xcuserdata Bender.xcworkspace/xcuserdata Pods Carthage +.build +.swiftpm +.swift-version \ No newline at end of file diff --git a/Bender.xcodeproj/project.pbxproj b/Bender.xcodeproj/project.pbxproj index c3770e0..041d661 100644 --- a/Bender.xcodeproj/project.pbxproj +++ b/Bender.xcodeproj/project.pbxproj @@ -7,58 +7,58 @@ objects = { /* Begin PBXBuildFile section */ - 5B05ABA91C54F71100339915 /* BenderOutputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B05ABA81C54F71100339915 /* BenderOutputTests.swift */; }; - 5B3C4B3E1C7A6A070032BA13 /* defaults_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B3C4B3D1C7A6A070032BA13 /* defaults_test.json */; }; - 5B54EF101C3A90AE0072B2A8 /* BenderInputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B54EF0F1C3A90AE0072B2A8 /* BenderInputTests.swift */; }; - 5B54EF1B1C3A90FD0072B2A8 /* Bender.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B54EF1A1C3A90FD0072B2A8 /* Bender.swift */; }; - 5B54EF1D1C3D38A60072B2A8 /* basic_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF1C1C3D38A60072B2A8 /* basic_test.json */; }; - 5B54EF1F1C3D39DB0072B2A8 /* array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF1E1C3D39DB0072B2A8 /* array_test.json */; }; - 5B54EF211C3D46ED0072B2A8 /* natural_array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF201C3D46ED0072B2A8 /* natural_array_test.json */; }; - 5B54EF231C3D4AD50072B2A8 /* enum_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF221C3D4AD50072B2A8 /* enum_test.json */; }; - 5BAEB50E1C47BE1F0044C0A7 /* stringified_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEB50D1C47BE1F0044C0A7 /* stringified_test.json */; }; - 5BAEB5101C47C5000044C0A7 /* stringified_negative_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEB50F1C47C5000044C0A7 /* stringified_negative_test.json */; }; - 5BAEB5121C47D0480044C0A7 /* recursive_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEB5111C47D0480044C0A7 /* recursive_test.json */; }; - 5BCE65501C7F9BF6000603ED /* array_skip_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BCE654F1C7F9BF6000603ED /* array_skip_test.json */; }; - 5BCE65551C8326EB000603ED /* path_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BCE65541C8326EB000603ED /* path_test.json */; }; - 764766151D7076EC00C60F0B /* paths_through_arrays.json in Resources */ = {isa = PBXBuildFile; fileRef = 764766141D7076EC00C60F0B /* paths_through_arrays.json */; }; + BEC1053B247D804B0096687C /* JSONPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10531247D804B0096687C /* JSONPath.swift */; }; + BEC1053C247D804B0096687C /* JSONPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10531247D804B0096687C /* JSONPath.swift */; }; + BEC1053D247D804B0096687C /* StringifiedJSONRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10532247D804B0096687C /* StringifiedJSONRule.swift */; }; + BEC1053E247D804B0096687C /* StringifiedJSONRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10532247D804B0096687C /* StringifiedJSONRule.swift */; }; + BEC1053F247D804B0096687C /* RuleError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10533247D804B0096687C /* RuleError.swift */; }; + BEC10540247D804B0096687C /* RuleError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10533247D804B0096687C /* RuleError.swift */; }; + BEC10541247D804B0096687C /* ObjectRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10534247D804B0096687C /* ObjectRule.swift */; }; + BEC10542247D804B0096687C /* ObjectRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10534247D804B0096687C /* ObjectRule.swift */; }; + BEC10543247D804B0096687C /* EnumRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10535247D804B0096687C /* EnumRule.swift */; }; + BEC10544247D804B0096687C /* EnumRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10535247D804B0096687C /* EnumRule.swift */; }; + BEC10547247D804B0096687C /* Bender.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10537247D804B0096687C /* Bender.swift */; }; + BEC10548247D804B0096687C /* Bender.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10537247D804B0096687C /* Bender.swift */; }; + BEC1054B247D804B0096687C /* ArrayRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10539247D804B0096687C /* ArrayRule.swift */; }; + BEC1054C247D804C0096687C /* ArrayRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10539247D804B0096687C /* ArrayRule.swift */; }; + BEC1054D247D804C0096687C /* TypeRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC1053A247D804B0096687C /* TypeRule.swift */; }; + BEC1054E247D804C0096687C /* TypeRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC1053A247D804B0096687C /* TypeRule.swift */; }; + BEC10562247D805C0096687C /* BenderOutputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10550247D805C0096687C /* BenderOutputTests.swift */; }; + BEC10563247D805C0096687C /* BenderOutputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC10550247D805C0096687C /* BenderOutputTests.swift */; }; + BEC10564247D805C0096687C /* five_megs.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10551247D805C0096687C /* five_megs.json */; }; + BEC10565247D805C0096687C /* five_megs.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10551247D805C0096687C /* five_megs.json */; }; + BEC10566247D805C0096687C /* enum_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10552247D805C0096687C /* enum_test.json */; }; + BEC10567247D805C0096687C /* enum_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10552247D805C0096687C /* enum_test.json */; }; + BEC10568247D805C0096687C /* paths_through_arrays.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10553247D805C0096687C /* paths_through_arrays.json */; }; + BEC10569247D805C0096687C /* paths_through_arrays.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10553247D805C0096687C /* paths_through_arrays.json */; }; + BEC1056A247D805C0096687C /* recursive_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10554247D805C0096687C /* recursive_test.json */; }; + BEC1056B247D805C0096687C /* recursive_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10554247D805C0096687C /* recursive_test.json */; }; + BEC10570247D805C0096687C /* path_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10557247D805C0096687C /* path_test.json */; }; + BEC10571247D805C0096687C /* path_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10557247D805C0096687C /* path_test.json */; }; + BEC10572247D805C0096687C /* stringified_negative_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10558247D805C0096687C /* stringified_negative_test.json */; }; + BEC10573247D805C0096687C /* stringified_negative_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10558247D805C0096687C /* stringified_negative_test.json */; }; + BEC10574247D805C0096687C /* defaults_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10559247D805C0096687C /* defaults_test.json */; }; + BEC10575247D805C0096687C /* defaults_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10559247D805C0096687C /* defaults_test.json */; }; + BEC10576247D805C0096687C /* array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055A247D805C0096687C /* array_test.json */; }; + BEC10577247D805C0096687C /* array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055A247D805C0096687C /* array_test.json */; }; + BEC10578247D805C0096687C /* BenderInputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC1055B247D805C0096687C /* BenderInputTests.swift */; }; + BEC10579247D805C0096687C /* BenderInputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC1055B247D805C0096687C /* BenderInputTests.swift */; }; + BEC1057A247D805C0096687C /* natural_array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055C247D805C0096687C /* natural_array_test.json */; }; + BEC1057B247D805C0096687C /* natural_array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055C247D805C0096687C /* natural_array_test.json */; }; + BEC1057C247D805C0096687C /* BenderPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC1055D247D805C0096687C /* BenderPerformanceTests.swift */; }; + BEC1057D247D805C0096687C /* BenderPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC1055D247D805C0096687C /* BenderPerformanceTests.swift */; }; + BEC1057E247D805C0096687C /* basic_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055E247D805C0096687C /* basic_test.json */; }; + BEC1057F247D805C0096687C /* basic_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055E247D805C0096687C /* basic_test.json */; }; + BEC10580247D805C0096687C /* array_skip_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055F247D805C0096687C /* array_skip_test.json */; }; + BEC10581247D805C0096687C /* array_skip_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC1055F247D805C0096687C /* array_skip_test.json */; }; + BEC10582247D805C0096687C /* stringified_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10560247D805C0096687C /* stringified_test.json */; }; + BEC10583247D805C0096687C /* stringified_test.json in Resources */ = {isa = PBXBuildFile; fileRef = BEC10560247D805C0096687C /* stringified_test.json */; }; C141AD7F1DF17F90005698F2 /* Bender.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B54EF001C3A90AE0072B2A8 /* Bender.framework */; }; - C147F5371DF8329300899BF7 /* ArrayRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5361DF8329300899BF7 /* ArrayRule.swift */; }; - C147F53A1DF834C900899BF7 /* EnumRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5391DF834C900899BF7 /* EnumRule.swift */; }; - C147F53D1DF837F200899BF7 /* JSONPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F53C1DF837F200899BF7 /* JSONPath.swift */; }; - C147F5401DF8393800899BF7 /* ObjectRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F53F1DF8393800899BF7 /* ObjectRule.swift */; }; - C147F5431DF83A6F00899BF7 /* RuleError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5421DF83A6F00899BF7 /* RuleError.swift */; }; - C147F5461DF83B8A00899BF7 /* StringifiedJSONRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5451DF83B8A00899BF7 /* StringifiedJSONRule.swift */; }; - C147F5491DF83C1A00899BF7 /* TypeRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5481DF83C1A00899BF7 /* TypeRule.swift */; }; C1492A9B1FE51A52008ECAF8 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 275234521DD0A3620096F1D0 /* Quick.framework */; }; C1492A9C1FE51A52008ECAF8 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 275234511DD0A3620096F1D0 /* Nimble.framework */; }; C1492AAE1FE53ABB008ECAF8 /* Bender.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1F6A6331FE5168000FE716B /* Bender.framework */; }; - C1492AB41FE53B58008ECAF8 /* BenderInputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B54EF0F1C3A90AE0072B2A8 /* BenderInputTests.swift */; }; - C1492AB51FE53B58008ECAF8 /* BenderOutputTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B05ABA81C54F71100339915 /* BenderOutputTests.swift */; }; - C1492AB61FE53B58008ECAF8 /* BenderPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1650E991DFFEFD800081BFB /* BenderPerformanceTests.swift */; }; C1492AB71FE53B9A008ECAF8 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1F6A65E1FE519A200FE716B /* Quick.framework */; }; C1492AB81FE53B9A008ECAF8 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1F6A65F1FE519A200FE716B /* Nimble.framework */; }; - C1492AB91FE53BCA008ECAF8 /* paths_through_arrays.json in Resources */ = {isa = PBXBuildFile; fileRef = 764766141D7076EC00C60F0B /* paths_through_arrays.json */; }; - C1492ABA1FE53BCA008ECAF8 /* basic_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF1C1C3D38A60072B2A8 /* basic_test.json */; }; - C1492ABB1FE53BCA008ECAF8 /* array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF1E1C3D39DB0072B2A8 /* array_test.json */; }; - C1492ABC1FE53BCA008ECAF8 /* array_skip_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BCE654F1C7F9BF6000603ED /* array_skip_test.json */; }; - C1492ABD1FE53BCA008ECAF8 /* natural_array_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF201C3D46ED0072B2A8 /* natural_array_test.json */; }; - C1492ABE1FE53BCA008ECAF8 /* enum_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B54EF221C3D4AD50072B2A8 /* enum_test.json */; }; - C1492ABF1FE53BCA008ECAF8 /* stringified_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEB50D1C47BE1F0044C0A7 /* stringified_test.json */; }; - C1492AC01FE53BCA008ECAF8 /* stringified_negative_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEB50F1C47C5000044C0A7 /* stringified_negative_test.json */; }; - C1492AC11FE53BCA008ECAF8 /* recursive_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEB5111C47D0480044C0A7 /* recursive_test.json */; }; - C1492AC21FE53BCA008ECAF8 /* defaults_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5B3C4B3D1C7A6A070032BA13 /* defaults_test.json */; }; - C1492AC31FE53BCA008ECAF8 /* path_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BCE65541C8326EB000603ED /* path_test.json */; }; - C1492AC41FE53BCA008ECAF8 /* five_megs.json in Resources */ = {isa = PBXBuildFile; fileRef = C1650E971DFFEED400081BFB /* five_megs.json */; }; - C1650E981DFFEED400081BFB /* five_megs.json in Resources */ = {isa = PBXBuildFile; fileRef = C1650E971DFFEED400081BFB /* five_megs.json */; }; - C1650E9A1DFFEFD800081BFB /* BenderPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1650E991DFFEFD800081BFB /* BenderPerformanceTests.swift */; }; - C1F6A6251FE5168000FE716B /* JSONPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F53C1DF837F200899BF7 /* JSONPath.swift */; }; - C1F6A6261FE5168000FE716B /* EnumRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5391DF834C900899BF7 /* EnumRule.swift */; }; - C1F6A6271FE5168000FE716B /* StringifiedJSONRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5451DF83B8A00899BF7 /* StringifiedJSONRule.swift */; }; - C1F6A6281FE5168000FE716B /* TypeRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5481DF83C1A00899BF7 /* TypeRule.swift */; }; - C1F6A6291FE5168000FE716B /* RuleError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5421DF83A6F00899BF7 /* RuleError.swift */; }; - C1F6A62A1FE5168000FE716B /* ObjectRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F53F1DF8393800899BF7 /* ObjectRule.swift */; }; - C1F6A62B1FE5168000FE716B /* Bender.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B54EF1A1C3A90FD0072B2A8 /* Bender.swift */; }; - C1F6A62C1FE5168000FE716B /* ArrayRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C147F5361DF8329300899BF7 /* ArrayRule.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -81,36 +81,38 @@ /* Begin PBXFileReference section */ 275234511DD0A3620096F1D0 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = ""; }; 275234521DD0A3620096F1D0 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = ""; }; - 5B05ABA81C54F71100339915 /* BenderOutputTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BenderOutputTests.swift; sourceTree = ""; }; - 5B3C4B3D1C7A6A070032BA13 /* defaults_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = defaults_test.json; sourceTree = ""; }; 5B54EF001C3A90AE0072B2A8 /* Bender.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bender.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 5B54EF051C3A90AE0072B2A8 /* Bender-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Bender-iOS.plist"; sourceTree = ""; }; 5B54EF0A1C3A90AE0072B2A8 /* BenderTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "BenderTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5B54EF0F1C3A90AE0072B2A8 /* BenderInputTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BenderInputTests.swift; sourceTree = ""; }; - 5B54EF111C3A90AE0072B2A8 /* BenderTests-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "BenderTests-iOS.plist"; sourceTree = ""; }; - 5B54EF1A1C3A90FD0072B2A8 /* Bender.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bender.swift; sourceTree = ""; }; - 5B54EF1C1C3D38A60072B2A8 /* basic_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = basic_test.json; sourceTree = ""; }; - 5B54EF1E1C3D39DB0072B2A8 /* array_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = array_test.json; sourceTree = ""; }; - 5B54EF201C3D46ED0072B2A8 /* natural_array_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = natural_array_test.json; sourceTree = ""; }; - 5B54EF221C3D4AD50072B2A8 /* enum_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = enum_test.json; sourceTree = ""; }; - 5BAEB50D1C47BE1F0044C0A7 /* stringified_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = stringified_test.json; sourceTree = ""; }; - 5BAEB50F1C47C5000044C0A7 /* stringified_negative_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = stringified_negative_test.json; sourceTree = ""; }; - 5BAEB5111C47D0480044C0A7 /* recursive_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recursive_test.json; sourceTree = ""; }; - 5BCE654F1C7F9BF6000603ED /* array_skip_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = array_skip_test.json; sourceTree = ""; }; - 5BCE65541C8326EB000603ED /* path_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = path_test.json; sourceTree = ""; }; - 764766141D7076EC00C60F0B /* paths_through_arrays.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = paths_through_arrays.json; sourceTree = ""; }; - C147F5361DF8329300899BF7 /* ArrayRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayRule.swift; sourceTree = ""; }; - C147F5391DF834C900899BF7 /* EnumRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumRule.swift; sourceTree = ""; }; - C147F53C1DF837F200899BF7 /* JSONPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONPath.swift; sourceTree = ""; }; - C147F53F1DF8393800899BF7 /* ObjectRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectRule.swift; sourceTree = ""; }; - C147F5421DF83A6F00899BF7 /* RuleError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuleError.swift; sourceTree = ""; }; - C147F5451DF83B8A00899BF7 /* StringifiedJSONRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringifiedJSONRule.swift; sourceTree = ""; }; - C147F5481DF83C1A00899BF7 /* TypeRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeRule.swift; sourceTree = ""; }; + BEC10531247D804B0096687C /* JSONPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONPath.swift; sourceTree = ""; }; + BEC10532247D804B0096687C /* StringifiedJSONRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringifiedJSONRule.swift; sourceTree = ""; }; + BEC10533247D804B0096687C /* RuleError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuleError.swift; sourceTree = ""; }; + BEC10534247D804B0096687C /* ObjectRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectRule.swift; sourceTree = ""; }; + BEC10535247D804B0096687C /* EnumRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumRule.swift; sourceTree = ""; }; + BEC10536247D804B0096687C /* Bender-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Bender-macOS.plist"; sourceTree = ""; }; + BEC10537247D804B0096687C /* Bender.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bender.swift; sourceTree = ""; }; + BEC10538247D804B0096687C /* Bender-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Bender-iOS.plist"; sourceTree = ""; }; + BEC10539247D804B0096687C /* ArrayRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayRule.swift; sourceTree = ""; }; + BEC1053A247D804B0096687C /* TypeRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeRule.swift; sourceTree = ""; }; + BEC10550247D805C0096687C /* BenderOutputTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BenderOutputTests.swift; sourceTree = ""; }; + BEC10551247D805C0096687C /* five_megs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = five_megs.json; sourceTree = ""; }; + BEC10552247D805C0096687C /* enum_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = enum_test.json; sourceTree = ""; }; + BEC10553247D805C0096687C /* paths_through_arrays.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = paths_through_arrays.json; sourceTree = ""; }; + BEC10554247D805C0096687C /* recursive_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recursive_test.json; sourceTree = ""; }; + BEC10555247D805C0096687C /* BenderTests-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "BenderTests-iOS.plist"; sourceTree = ""; }; + BEC10556247D805C0096687C /* BenderTests-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "BenderTests-macOS.plist"; sourceTree = ""; }; + BEC10557247D805C0096687C /* path_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = path_test.json; sourceTree = ""; }; + BEC10558247D805C0096687C /* stringified_negative_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = stringified_negative_test.json; sourceTree = ""; }; + BEC10559247D805C0096687C /* defaults_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = defaults_test.json; sourceTree = ""; }; + BEC1055A247D805C0096687C /* array_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = array_test.json; sourceTree = ""; }; + BEC1055B247D805C0096687C /* BenderInputTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BenderInputTests.swift; sourceTree = ""; }; + BEC1055C247D805C0096687C /* natural_array_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = natural_array_test.json; sourceTree = ""; }; + BEC1055D247D805C0096687C /* BenderPerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BenderPerformanceTests.swift; sourceTree = ""; }; + BEC1055E247D805C0096687C /* basic_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = basic_test.json; sourceTree = ""; }; + BEC1055F247D805C0096687C /* array_skip_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = array_skip_test.json; sourceTree = ""; }; + BEC10560247D805C0096687C /* stringified_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = stringified_test.json; sourceTree = ""; }; + BEC10561247D805C0096687C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C1492AA91FE53ABB008ECAF8 /* BenderTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "BenderTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - C1650E971DFFEED400081BFB /* five_megs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = five_megs.json; sourceTree = ""; }; - C1650E991DFFEFD800081BFB /* BenderPerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BenderPerformanceTests.swift; sourceTree = ""; }; C1F6A6331FE5168000FE716B /* Bender.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bender.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - C1F6A6341FE5168000FE716B /* Bender-macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Bender-macOS.plist"; path = "/Users/ptiz/Documents/Projects/Bender/Bender/Bender-macOS.plist"; sourceTree = ""; }; C1F6A65E1FE519A200FE716B /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/Mac/Quick.framework; sourceTree = ""; }; C1F6A65F1FE519A200FE716B /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/Mac/Nimble.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -167,8 +169,8 @@ 5B54EEF61C3A90AE0072B2A8 = { isa = PBXGroup; children = ( - 5B54EF021C3A90AE0072B2A8 /* Bender */, - 5B54EF0E1C3A90AE0072B2A8 /* BenderTests */, + BEC10530247D804B0096687C /* Sources */, + BEC1054F247D805C0096687C /* Tests */, 5B54EF011C3A90AE0072B2A8 /* Products */, 275234481DD0A2480096F1D0 /* Frameworks */, ); @@ -185,44 +187,46 @@ name = Products; sourceTree = ""; }; - 5B54EF021C3A90AE0072B2A8 /* Bender */ = { + BEC10530247D804B0096687C /* Sources */ = { isa = PBXGroup; children = ( - 5B54EF051C3A90AE0072B2A8 /* Bender-iOS.plist */, - C1F6A6341FE5168000FE716B /* Bender-macOS.plist */, - 5B54EF1A1C3A90FD0072B2A8 /* Bender.swift */, - C147F5361DF8329300899BF7 /* ArrayRule.swift */, - C147F5391DF834C900899BF7 /* EnumRule.swift */, - C147F53C1DF837F200899BF7 /* JSONPath.swift */, - C147F53F1DF8393800899BF7 /* ObjectRule.swift */, - C147F5421DF83A6F00899BF7 /* RuleError.swift */, - C147F5451DF83B8A00899BF7 /* StringifiedJSONRule.swift */, - C147F5481DF83C1A00899BF7 /* TypeRule.swift */, - ); - path = Bender; + BEC10531247D804B0096687C /* JSONPath.swift */, + BEC10532247D804B0096687C /* StringifiedJSONRule.swift */, + BEC10533247D804B0096687C /* RuleError.swift */, + BEC10534247D804B0096687C /* ObjectRule.swift */, + BEC10535247D804B0096687C /* EnumRule.swift */, + BEC10537247D804B0096687C /* Bender.swift */, + BEC10539247D804B0096687C /* ArrayRule.swift */, + BEC1053A247D804B0096687C /* TypeRule.swift */, + BEC10538247D804B0096687C /* Bender-iOS.plist */, + BEC10536247D804B0096687C /* Bender-macOS.plist */, + ); + path = Sources; sourceTree = ""; }; - 5B54EF0E1C3A90AE0072B2A8 /* BenderTests */ = { + BEC1054F247D805C0096687C /* Tests */ = { isa = PBXGroup; children = ( - 5B54EF0F1C3A90AE0072B2A8 /* BenderInputTests.swift */, - 5B05ABA81C54F71100339915 /* BenderOutputTests.swift */, - C1650E991DFFEFD800081BFB /* BenderPerformanceTests.swift */, - 5B54EF111C3A90AE0072B2A8 /* BenderTests-iOS.plist */, - 764766141D7076EC00C60F0B /* paths_through_arrays.json */, - 5B54EF1C1C3D38A60072B2A8 /* basic_test.json */, - 5B54EF1E1C3D39DB0072B2A8 /* array_test.json */, - 5BCE654F1C7F9BF6000603ED /* array_skip_test.json */, - 5B54EF201C3D46ED0072B2A8 /* natural_array_test.json */, - 5B54EF221C3D4AD50072B2A8 /* enum_test.json */, - 5BAEB50D1C47BE1F0044C0A7 /* stringified_test.json */, - 5BAEB50F1C47C5000044C0A7 /* stringified_negative_test.json */, - 5BAEB5111C47D0480044C0A7 /* recursive_test.json */, - 5B3C4B3D1C7A6A070032BA13 /* defaults_test.json */, - 5BCE65541C8326EB000603ED /* path_test.json */, - C1650E971DFFEED400081BFB /* five_megs.json */, - ); - path = BenderTests; + BEC10551247D805C0096687C /* five_megs.json */, + BEC10552247D805C0096687C /* enum_test.json */, + BEC10553247D805C0096687C /* paths_through_arrays.json */, + BEC10554247D805C0096687C /* recursive_test.json */, + BEC10557247D805C0096687C /* path_test.json */, + BEC10558247D805C0096687C /* stringified_negative_test.json */, + BEC10559247D805C0096687C /* defaults_test.json */, + BEC1055A247D805C0096687C /* array_test.json */, + BEC1055C247D805C0096687C /* natural_array_test.json */, + BEC1055E247D805C0096687C /* basic_test.json */, + BEC1055F247D805C0096687C /* array_skip_test.json */, + BEC10560247D805C0096687C /* stringified_test.json */, + BEC1055B247D805C0096687C /* BenderInputTests.swift */, + BEC10550247D805C0096687C /* BenderOutputTests.swift */, + BEC1055D247D805C0096687C /* BenderPerformanceTests.swift */, + BEC10561247D805C0096687C /* Info.plist */, + BEC10556247D805C0096687C /* BenderTests-macOS.plist */, + BEC10555247D805C0096687C /* BenderTests-iOS.plist */, + ); + path = Tests; sourceTree = ""; }; /* End PBXGroup section */ @@ -326,7 +330,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1150; ORGANIZATIONNAME = "Evgenii Kamyshanov"; TargetAttributes = { 5B54EEFF1C3A90AE0072B2A8 = { @@ -380,18 +384,18 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5BAEB50E1C47BE1F0044C0A7 /* stringified_test.json in Resources */, - 5B3C4B3E1C7A6A070032BA13 /* defaults_test.json in Resources */, - 5B54EF1D1C3D38A60072B2A8 /* basic_test.json in Resources */, - 764766151D7076EC00C60F0B /* paths_through_arrays.json in Resources */, - 5BCE65501C7F9BF6000603ED /* array_skip_test.json in Resources */, - 5B54EF1F1C3D39DB0072B2A8 /* array_test.json in Resources */, - 5BAEB5121C47D0480044C0A7 /* recursive_test.json in Resources */, - 5B54EF231C3D4AD50072B2A8 /* enum_test.json in Resources */, - 5B54EF211C3D46ED0072B2A8 /* natural_array_test.json in Resources */, - 5BCE65551C8326EB000603ED /* path_test.json in Resources */, - 5BAEB5101C47C5000044C0A7 /* stringified_negative_test.json in Resources */, - C1650E981DFFEED400081BFB /* five_megs.json in Resources */, + BEC10568247D805C0096687C /* paths_through_arrays.json in Resources */, + BEC1056A247D805C0096687C /* recursive_test.json in Resources */, + BEC10580247D805C0096687C /* array_skip_test.json in Resources */, + BEC10566247D805C0096687C /* enum_test.json in Resources */, + BEC10570247D805C0096687C /* path_test.json in Resources */, + BEC1057E247D805C0096687C /* basic_test.json in Resources */, + BEC10574247D805C0096687C /* defaults_test.json in Resources */, + BEC10564247D805C0096687C /* five_megs.json in Resources */, + BEC1057A247D805C0096687C /* natural_array_test.json in Resources */, + BEC10582247D805C0096687C /* stringified_test.json in Resources */, + BEC10576247D805C0096687C /* array_test.json in Resources */, + BEC10572247D805C0096687C /* stringified_negative_test.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -399,18 +403,18 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C1492AB91FE53BCA008ECAF8 /* paths_through_arrays.json in Resources */, - C1492ABA1FE53BCA008ECAF8 /* basic_test.json in Resources */, - C1492ABB1FE53BCA008ECAF8 /* array_test.json in Resources */, - C1492ABC1FE53BCA008ECAF8 /* array_skip_test.json in Resources */, - C1492ABD1FE53BCA008ECAF8 /* natural_array_test.json in Resources */, - C1492ABE1FE53BCA008ECAF8 /* enum_test.json in Resources */, - C1492ABF1FE53BCA008ECAF8 /* stringified_test.json in Resources */, - C1492AC01FE53BCA008ECAF8 /* stringified_negative_test.json in Resources */, - C1492AC11FE53BCA008ECAF8 /* recursive_test.json in Resources */, - C1492AC21FE53BCA008ECAF8 /* defaults_test.json in Resources */, - C1492AC31FE53BCA008ECAF8 /* path_test.json in Resources */, - C1492AC41FE53BCA008ECAF8 /* five_megs.json in Resources */, + BEC10569247D805C0096687C /* paths_through_arrays.json in Resources */, + BEC1056B247D805C0096687C /* recursive_test.json in Resources */, + BEC10581247D805C0096687C /* array_skip_test.json in Resources */, + BEC10567247D805C0096687C /* enum_test.json in Resources */, + BEC10571247D805C0096687C /* path_test.json in Resources */, + BEC1057F247D805C0096687C /* basic_test.json in Resources */, + BEC10575247D805C0096687C /* defaults_test.json in Resources */, + BEC10565247D805C0096687C /* five_megs.json in Resources */, + BEC1057B247D805C0096687C /* natural_array_test.json in Resources */, + BEC10583247D805C0096687C /* stringified_test.json in Resources */, + BEC10577247D805C0096687C /* array_test.json in Resources */, + BEC10573247D805C0096687C /* stringified_negative_test.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -453,7 +457,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "carthage copy-frameworks"; + shellScript = "carthage copy-frameworks\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -462,14 +466,14 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C147F53D1DF837F200899BF7 /* JSONPath.swift in Sources */, - C147F53A1DF834C900899BF7 /* EnumRule.swift in Sources */, - C147F5461DF83B8A00899BF7 /* StringifiedJSONRule.swift in Sources */, - C147F5491DF83C1A00899BF7 /* TypeRule.swift in Sources */, - C147F5431DF83A6F00899BF7 /* RuleError.swift in Sources */, - C147F5401DF8393800899BF7 /* ObjectRule.swift in Sources */, - 5B54EF1B1C3A90FD0072B2A8 /* Bender.swift in Sources */, - C147F5371DF8329300899BF7 /* ArrayRule.swift in Sources */, + BEC10543247D804B0096687C /* EnumRule.swift in Sources */, + BEC1053D247D804B0096687C /* StringifiedJSONRule.swift in Sources */, + BEC1053F247D804B0096687C /* RuleError.swift in Sources */, + BEC1054D247D804C0096687C /* TypeRule.swift in Sources */, + BEC10547247D804B0096687C /* Bender.swift in Sources */, + BEC10541247D804B0096687C /* ObjectRule.swift in Sources */, + BEC1054B247D804B0096687C /* ArrayRule.swift in Sources */, + BEC1053B247D804B0096687C /* JSONPath.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -477,9 +481,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5B05ABA91C54F71100339915 /* BenderOutputTests.swift in Sources */, - C1650E9A1DFFEFD800081BFB /* BenderPerformanceTests.swift in Sources */, - 5B54EF101C3A90AE0072B2A8 /* BenderInputTests.swift in Sources */, + BEC10578247D805C0096687C /* BenderInputTests.swift in Sources */, + BEC10562247D805C0096687C /* BenderOutputTests.swift in Sources */, + BEC1057C247D805C0096687C /* BenderPerformanceTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -487,9 +491,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C1492AB41FE53B58008ECAF8 /* BenderInputTests.swift in Sources */, - C1492AB51FE53B58008ECAF8 /* BenderOutputTests.swift in Sources */, - C1492AB61FE53B58008ECAF8 /* BenderPerformanceTests.swift in Sources */, + BEC10579247D805C0096687C /* BenderInputTests.swift in Sources */, + BEC10563247D805C0096687C /* BenderOutputTests.swift in Sources */, + BEC1057D247D805C0096687C /* BenderPerformanceTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -497,14 +501,14 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C1F6A6251FE5168000FE716B /* JSONPath.swift in Sources */, - C1F6A6261FE5168000FE716B /* EnumRule.swift in Sources */, - C1F6A6271FE5168000FE716B /* StringifiedJSONRule.swift in Sources */, - C1F6A6281FE5168000FE716B /* TypeRule.swift in Sources */, - C1F6A6291FE5168000FE716B /* RuleError.swift in Sources */, - C1F6A62A1FE5168000FE716B /* ObjectRule.swift in Sources */, - C1F6A62B1FE5168000FE716B /* Bender.swift in Sources */, - C1F6A62C1FE5168000FE716B /* ArrayRule.swift in Sources */, + BEC10544247D804B0096687C /* EnumRule.swift in Sources */, + BEC1053E247D804B0096687C /* StringifiedJSONRule.swift in Sources */, + BEC10540247D804B0096687C /* RuleError.swift in Sources */, + BEC1054E247D804C0096687C /* TypeRule.swift in Sources */, + BEC10548247D804B0096687C /* Bender.swift in Sources */, + BEC10542247D804B0096687C /* ObjectRule.swift in Sources */, + BEC1054C247D804C0096687C /* ArrayRule.swift in Sources */, + BEC1053C247D804B0096687C /* JSONPath.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -528,6 +532,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -590,6 +595,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -655,7 +661,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "Bender/Bender-iOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Bender-iOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -683,7 +689,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "Bender/Bender-iOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Bender-iOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -705,7 +711,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "BenderTests/BenderTests-iOS.plist"; + INFOPLIST_FILE = "Tests/BenderTests-iOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.kamyshanov.BenderTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -722,7 +728,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "BenderTests/BenderTests-iOS.plist"; + INFOPLIST_FILE = "Tests/BenderTests-iOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.kamyshanov.BenderTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -754,7 +760,7 @@ "$(PROJECT_DIR)/Carthage/Build/Mac", ); GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = "BenderTests/BenderTests-macOS.plist"; + INFOPLIST_FILE = "Tests/BenderTests-macOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = com.kamyshanov.BenderTests; @@ -789,7 +795,7 @@ "$(PROJECT_DIR)/Carthage/Build/Mac", ); GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = "BenderTests/BenderTests-macOS.plist"; + INFOPLIST_FILE = "Tests/BenderTests-macOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = com.kamyshanov.BenderTests; @@ -813,7 +819,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "Bender/Bender-macOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Bender-macOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -843,7 +849,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "Bender/Bender-macOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Bender-macOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/Bender.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Bender.xcodeproj/project.xcworkspace/contents.xcworkspacedata index ca4ce2d..9e2fae3 100644 --- a/Bender.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Bender.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:../Sources"> diff --git a/Bender.xcodeproj/xcshareddata/xcschemes/Bender iOS.xcscheme b/Bender.xcodeproj/xcshareddata/xcschemes/Bender iOS.xcscheme index 7c1efe3..8ec3303 100644 --- a/Bender.xcodeproj/xcshareddata/xcschemes/Bender iOS.xcscheme +++ b/Bender.xcodeproj/xcshareddata/xcschemes/Bender iOS.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + @@ -40,17 +49,6 @@ - - - - - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..7a8f548 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "Nimble", + "repositoryURL": "http://github.com/Quick/Nimble.git", + "state": { + "branch": null, + "revision": "72f5a90d573f7f7d70aa6b8ad84b3e1e02eabb4d", + "version": "8.0.9" + } + }, + { + "package": "Quick", + "repositoryURL": "http://github.com/Quick/Quick.git", + "state": { + "branch": null, + "revision": "33682c2f6230c60614861dfc61df267e11a1602f", + "version": "2.2.0" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..7eabeb3 --- /dev/null +++ b/Package.swift @@ -0,0 +1,50 @@ +// swift-tools-version:5.2 +// +// Package.swift +// Bender +// +// Created by Anton Davydov on 25.05.20. +// Original work Copyright © 2020 Evgenii Kamyshanov +// +// The MIT License (MIT) +// +// 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 PackageDescription + +let package = Package(name: "Bender", + platforms: [ + .macOS(.v10_15), + .iOS(.v10) + ], + products: [ + .library(name: "Bender", targets: ["Bender"]) + ], + dependencies: [ + .package(url: "http://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.5")), + .package(url: "http://github.com/Quick/Quick.git", .upToNextMajor(from: "2.2.0")) + ], + targets: [ + .target(name: "Bender", path: "Sources"), + .testTarget(name: "BenderTests", + dependencies: ["Bender", "Nimble", "Quick"], + path: "Tests"), + ], + swiftLanguageVersions: [.v5]) diff --git a/Bender/ArrayRule.swift b/Sources/ArrayRule.swift similarity index 100% rename from Bender/ArrayRule.swift rename to Sources/ArrayRule.swift diff --git a/Bender/Bender-iOS.plist b/Sources/Bender-iOS.plist similarity index 100% rename from Bender/Bender-iOS.plist rename to Sources/Bender-iOS.plist diff --git a/Bender/Bender-macOS.plist b/Sources/Bender-macOS.plist similarity index 100% rename from Bender/Bender-macOS.plist rename to Sources/Bender-macOS.plist diff --git a/Bender/Bender.swift b/Sources/Bender.swift similarity index 100% rename from Bender/Bender.swift rename to Sources/Bender.swift diff --git a/Bender/EnumRule.swift b/Sources/EnumRule.swift similarity index 100% rename from Bender/EnumRule.swift rename to Sources/EnumRule.swift diff --git a/Bender/JSONPath.swift b/Sources/JSONPath.swift similarity index 100% rename from Bender/JSONPath.swift rename to Sources/JSONPath.swift diff --git a/Bender/ObjectRule.swift b/Sources/ObjectRule.swift similarity index 100% rename from Bender/ObjectRule.swift rename to Sources/ObjectRule.swift diff --git a/Bender/RuleError.swift b/Sources/RuleError.swift similarity index 100% rename from Bender/RuleError.swift rename to Sources/RuleError.swift diff --git a/Bender/StringifiedJSONRule.swift b/Sources/StringifiedJSONRule.swift similarity index 100% rename from Bender/StringifiedJSONRule.swift rename to Sources/StringifiedJSONRule.swift diff --git a/Bender/TypeRule.swift b/Sources/TypeRule.swift similarity index 100% rename from Bender/TypeRule.swift rename to Sources/TypeRule.swift diff --git a/BenderTests/BenderInputTests.swift b/Tests/BenderInputTests.swift similarity index 100% rename from BenderTests/BenderInputTests.swift rename to Tests/BenderInputTests.swift diff --git a/BenderTests/BenderOutputTests.swift b/Tests/BenderOutputTests.swift similarity index 100% rename from BenderTests/BenderOutputTests.swift rename to Tests/BenderOutputTests.swift diff --git a/BenderTests/BenderPerformanceTests.swift b/Tests/BenderPerformanceTests.swift similarity index 100% rename from BenderTests/BenderPerformanceTests.swift rename to Tests/BenderPerformanceTests.swift diff --git a/BenderTests/BenderTests-iOS.plist b/Tests/BenderTests-iOS.plist similarity index 100% rename from BenderTests/BenderTests-iOS.plist rename to Tests/BenderTests-iOS.plist diff --git a/BenderTests/BenderTests-macOS.plist b/Tests/BenderTests-macOS.plist similarity index 100% rename from BenderTests/BenderTests-macOS.plist rename to Tests/BenderTests-macOS.plist diff --git a/BenderTests/Info.plist b/Tests/Info.plist similarity index 100% rename from BenderTests/Info.plist rename to Tests/Info.plist diff --git a/BenderTests/array_skip_test.json b/Tests/array_skip_test.json similarity index 100% rename from BenderTests/array_skip_test.json rename to Tests/array_skip_test.json diff --git a/BenderTests/array_test.json b/Tests/array_test.json similarity index 100% rename from BenderTests/array_test.json rename to Tests/array_test.json diff --git a/BenderTests/basic_test.json b/Tests/basic_test.json similarity index 100% rename from BenderTests/basic_test.json rename to Tests/basic_test.json diff --git a/BenderTests/defaults_test.json b/Tests/defaults_test.json similarity index 100% rename from BenderTests/defaults_test.json rename to Tests/defaults_test.json diff --git a/BenderTests/enum_test.json b/Tests/enum_test.json similarity index 100% rename from BenderTests/enum_test.json rename to Tests/enum_test.json diff --git a/BenderTests/five_megs.json b/Tests/five_megs.json similarity index 100% rename from BenderTests/five_megs.json rename to Tests/five_megs.json diff --git a/BenderTests/natural_array_test.json b/Tests/natural_array_test.json similarity index 100% rename from BenderTests/natural_array_test.json rename to Tests/natural_array_test.json diff --git a/BenderTests/path_test.json b/Tests/path_test.json similarity index 100% rename from BenderTests/path_test.json rename to Tests/path_test.json diff --git a/BenderTests/paths_through_arrays.json b/Tests/paths_through_arrays.json similarity index 100% rename from BenderTests/paths_through_arrays.json rename to Tests/paths_through_arrays.json diff --git a/BenderTests/recursive_test.json b/Tests/recursive_test.json similarity index 100% rename from BenderTests/recursive_test.json rename to Tests/recursive_test.json diff --git a/BenderTests/stringified_negative_test.json b/Tests/stringified_negative_test.json similarity index 100% rename from BenderTests/stringified_negative_test.json rename to Tests/stringified_negative_test.json diff --git a/BenderTests/stringified_test.json b/Tests/stringified_test.json similarity index 100% rename from BenderTests/stringified_test.json rename to Tests/stringified_test.json