From 4da5440425d3f019b2fce8b076de8d7bbe50e7a0 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Sun, 17 May 2020 18:09:55 +0200 Subject: [PATCH] Update Kanna to 5.2.2 --- Package.resolved | 4 +- Package.swift | 2 +- Podfile.lock | 10 +- Pods/.project_cache/installation_cache.yaml | 28 +- Pods/Kanna.xcodeproj/project.pbxproj | 74 ++--- Pods/Kanna/Modules/libxml2-kanna.h | 3 - Pods/Kanna/Modules/module.modulemap | 6 - Pods/Kanna/README.md | 146 ++-------- Pods/Kanna/Sources/Kanna/CSS.swift | 48 ++-- Pods/Kanna/Sources/Kanna/Deprecated.swift | 16 +- Pods/Kanna/Sources/Kanna/Kanna.swift | 110 ++++---- .../Sources/Kanna/libxmlHTMLDocument.swift | 267 +++++++++--------- Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift | 149 +++++----- .../Sources/Kanna/libxmlParserOption.swift | 29 +- Pods/Manifest.lock | 10 +- Pods/Pods.xcodeproj/project.pbxproj | 116 ++++---- .../Kanna/Kanna-Info.plist | 2 +- .../Kanna/Kanna.debug.xcconfig | 2 +- .../Kanna/Kanna.release.xcconfig | 2 +- ...GenKit UnitTests-acknowledgements.markdown | 2 +- ...iftGenKit UnitTests-acknowledgements.plist | 2 +- ...enKit-SwiftGenKit UnitTests.debug.xcconfig | 3 +- ...Kit-SwiftGenKit UnitTests.release.xcconfig | 3 +- ...Pods-SwiftGenKit-acknowledgements.markdown | 2 +- .../Pods-SwiftGenKit-acknowledgements.plist | 2 +- .../Pods-SwiftGenKit.debug.xcconfig | 3 +- .../Pods-SwiftGenKit.release.xcconfig | 3 +- ...iftGen UnitTests-acknowledgements.markdown | 6 +- ...-SwiftGen UnitTests-acknowledgements.plist | 6 +- ...swiftgen-SwiftGen UnitTests.debug.xcconfig | 3 +- ...iftgen-SwiftGen UnitTests.release.xcconfig | 3 +- ...plates UnitTests-acknowledgements.markdown | 6 +- ...Templates UnitTests-acknowledgements.plist | 6 +- ...wiftgen-Templates UnitTests.debug.xcconfig | 3 +- ...ftgen-Templates UnitTests.release.xcconfig | 3 +- .../Pods-swiftgen-acknowledgements.markdown | 6 +- .../Pods-swiftgen-acknowledgements.plist | 6 +- .../Pods-swiftgen.debug.xcconfig | 3 +- .../Pods-swiftgen.release.xcconfig | 3 +- SwiftGenKit.podspec | 6 +- 40 files changed, 478 insertions(+), 626 deletions(-) delete mode 100644 Pods/Kanna/Modules/libxml2-kanna.h delete mode 100644 Pods/Kanna/Modules/module.modulemap diff --git a/Package.resolved b/Package.resolved index 4682fc21..41c3bf8e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/tid-kijyun/Kanna.git", "state": { "branch": null, - "revision": "9b8f73f8c8e145dc496565bbf878a709793e7ba3", - "version": "5.0.0" + "revision": "609367a2cd84827a33383cf7923cb4fe8f69ee0a", + "version": "5.2.2" } }, { diff --git a/Package.swift b/Package.swift index d237fbc2..95ed3eff 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( .package(url: "https://github.com/kylef/Stencil.git", from: "0.13.0"), .package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0"), .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.0"), - .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "5.0.0") + .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "5.2.2") ], targets: [ .target(name: "SwiftGen", dependencies: [ diff --git a/Podfile.lock b/Podfile.lock index 7277917c..b003f37c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,6 +1,6 @@ PODS: - Commander (0.9.1) - - Kanna (5.0.0) + - Kanna (5.2.2) - PathKit (0.9.2) - Stencil (0.13.1): - PathKit (~> 0.9.0) @@ -11,11 +11,11 @@ PODS: DEPENDENCIES: - Commander (~> 0.9) - - Kanna (~> 5.0.0) - - PathKit (~> 0.9.0) + - Kanna (~> 5.2) + - PathKit (~> 0.9) - StencilSwiftKit (~> 2.7) - SwiftLint (~> 0.39) - - Yams (~> 2.0.0) + - Yams (~> 2.0) SPEC REPOS: trunk: @@ -29,7 +29,7 @@ SPEC REPOS: SPEC CHECKSUMS: Commander: 723330cf3697b604c00afb9db9576be81a03c501 - Kanna: a32875df62975f8f4b871e933b4ea1a5c3b8be0f + Kanna: 2c4eddaaa4bfb9a1ed19e53c0b3d42ef02838046 PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06 Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff diff --git a/Pods/.project_cache/installation_cache.yaml b/Pods/.project_cache/installation_cache.yaml index 3c65c5c4..c21afdf9 100644 --- a/Pods/.project_cache/installation_cache.yaml +++ b/Pods/.project_cache/installation_cache.yaml @@ -14,12 +14,12 @@ CACHE_KEYS: Kanna: BUILD_SETTINGS_CHECKSUM: Kanna: - :debug: e65cb871c651a6642746f284ab601012 - :release: e65cb871c651a6642746f284ab601012 - CHECKSUM: a32875df62975f8f4b871e933b4ea1a5c3b8be0f + :debug: 68b0de929c065ffbfd74417d290893b9 + :release: 68b0de929c065ffbfd74417d290893b9 + CHECKSUM: 2c4eddaaa4bfb9a1ed19e53c0b3d42ef02838046 PROJECT_NAME: Kanna SPECS: - - Kanna (5.0.0) + - Kanna (5.2.2) PathKit: BUILD_SETTINGS_CHECKSUM: PathKit: @@ -31,24 +31,24 @@ CACHE_KEYS: - PathKit (0.9.2) Pods-swiftgen: BUILD_SETTINGS_CHECKSUM: - Debug: 3b0551cb9140067512234b58bf357b65 - Release: 3b0551cb9140067512234b58bf357b65 + Debug: 1334813e2cfc38405156106405b0e912 + Release: 1334813e2cfc38405156106405b0e912 Pods-swiftgen-SwiftGen UnitTests: BUILD_SETTINGS_CHECKSUM: - Debug: 6f03ada9a9aa120afb6771fab8b7d2e1 - Release: 6f03ada9a9aa120afb6771fab8b7d2e1 + Debug: 2729ae914b23a3c1d9a23829e0c475ba + Release: 2729ae914b23a3c1d9a23829e0c475ba Pods-swiftgen-Templates UnitTests: BUILD_SETTINGS_CHECKSUM: - Debug: 6f03ada9a9aa120afb6771fab8b7d2e1 - Release: 6f03ada9a9aa120afb6771fab8b7d2e1 + Debug: 2729ae914b23a3c1d9a23829e0c475ba + Release: 2729ae914b23a3c1d9a23829e0c475ba Pods-SwiftGenKit: BUILD_SETTINGS_CHECKSUM: - Debug: 8b2b08bee50fe0936f17727dd006b036 - Release: 8b2b08bee50fe0936f17727dd006b036 + Debug: 8712259b2e3f81bacd37aa97043e827a + Release: 8712259b2e3f81bacd37aa97043e827a Pods-SwiftGenKit-SwiftGenKit UnitTests: BUILD_SETTINGS_CHECKSUM: - Debug: ce76144e59547d4597887427a44458ae - Release: ce76144e59547d4597887427a44458ae + Debug: fb0c248e9d7dc030a03cf7dab1d59fb5 + Release: fb0c248e9d7dc030a03cf7dab1d59fb5 Stencil: BUILD_SETTINGS_CHECKSUM: Stencil: diff --git a/Pods/Kanna.xcodeproj/project.pbxproj b/Pods/Kanna.xcodeproj/project.pbxproj index 45c7933f..2dab719b 100644 --- a/Pods/Kanna.xcodeproj/project.pbxproj +++ b/Pods/Kanna.xcodeproj/project.pbxproj @@ -202,6 +202,39 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + 1F5F4ADA9B3E0B85F7B1ABE538276437 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8470EB146FA408C7FF1F353A3CA879D4 /* Kanna.release.xcconfig */; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + GCC_PREFIX_HEADER = "Target Support Files/Kanna/Kanna-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Kanna/Kanna-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + MODULEMAP_FILE = "Target Support Files/Kanna/Kanna.modulemap"; + PRODUCT_MODULE_NAME = Kanna; + PRODUCT_NAME = Kanna; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.2; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 274C69432AEEB1FE9F7B9AB1EADF323A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -262,39 +295,6 @@ }; name = Release; }; - B192CB6A4FA36712EC1B3FDDB61267DF /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8470EB146FA408C7FF1F353A3CA879D4 /* Kanna.release.xcconfig */; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - GCC_PREFIX_HEADER = "Target Support Files/Kanna/Kanna-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Kanna/Kanna-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/Kanna/Kanna.modulemap"; - PRODUCT_MODULE_NAME = Kanna; - PRODUCT_NAME = Kanna; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; B52EA23605C9458C3035E8EBC153CFCB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -359,7 +359,7 @@ }; name = Debug; }; - E2FA068AFBA8B6A4BA5CFA94B607810A /* Debug */ = { + F24D26CE782AB80D504FA24C7CC54F4F /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 065FE853C2E482FA43D379EDDD975749 /* Kanna.debug.xcconfig */; buildSettings = { @@ -386,7 +386,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -407,8 +407,8 @@ 941A8DEBA831BBDAB93ADC6B0399A614 /* Build configuration list for PBXNativeTarget "Kanna" */ = { isa = XCConfigurationList; buildConfigurations = ( - E2FA068AFBA8B6A4BA5CFA94B607810A /* Debug */, - B192CB6A4FA36712EC1B3FDDB61267DF /* Release */, + F24D26CE782AB80D504FA24C7CC54F4F /* Debug */, + 1F5F4ADA9B3E0B85F7B1ABE538276437 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Kanna/Modules/libxml2-kanna.h b/Pods/Kanna/Modules/libxml2-kanna.h deleted file mode 100644 index 15dae3f8..00000000 --- a/Pods/Kanna/Modules/libxml2-kanna.h +++ /dev/null @@ -1,3 +0,0 @@ -#import -#import -#import diff --git a/Pods/Kanna/Modules/module.modulemap b/Pods/Kanna/Modules/module.modulemap deleted file mode 100644 index b18b4543..00000000 --- a/Pods/Kanna/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -module libxmlKanna [system] { - link "xml2" - umbrella header "libxml2-kanna.h" - export * - module * { export * } -} diff --git a/Pods/Kanna/README.md b/Pods/Kanna/README.md index 04fd6d18..605c358e 100644 --- a/Pods/Kanna/README.md +++ b/Pods/Kanna/README.md @@ -1,6 +1,4 @@ -Kanna(鉋) -================= - +# Kanna(鉋) Kanna(鉋) is an XML/HTML parser for cross-platform(macOS, iOS, tvOS, watchOS and Linux!). It was inspired by [Nokogiri](https://github.com/sparklemotion/nokogiri)(鋸). @@ -15,78 +13,52 @@ It was inspired by [Nokogiri](https://github.com/sparklemotion/nokogiri)(鋸). :information_source: [Documentation](http://tid-kijyun.github.io/Kanna/) -Features: -================= +## Features - [x] XPath 1.0 support for document searching - [x] CSS3 selector support for document searching - [x] Support for namespaces - [x] Comprehensive test suite -Installation: -================= - -### Swift 5 -##### CocoaPods -Adding it to your `Podfile`: +## Installation for Swift 5 +#### CocoaPods +Add the following to your `Podfile`: ```ruby use_frameworks! -pod 'Kanna', '~> 5.0.0' +pod 'Kanna', '~> 5.2.2' ``` -##### Carthage -Adding it to your `Cartfile`: +#### Carthage +Add the following to your `Cartfile`: ```ogdl -github "tid-kijyun/Kanna" ~> 5.0.0 +github "tid-kijyun/Kanna" ~> 5.2.2 ``` +For xcode 11.3 and earlier, the following settings are required. 1. In the project settings add `$(SDKROOT)/usr/include/libxml2` to the "header search paths" field -##### Others(Swift PM and manual Installation) -Please refer to the case of Swift 4. - -### Swift 4 -##### CocoaPods -**:warning: CocoaPods (`1.1.0 or later`) is required.** - -Adding it to your `Podfile`: -```ruby -use_frameworks! -pod 'Kanna', '~> 4.0.0' -``` - -##### Carthage -Adding it to your `Cartfile`: - -```ogdl -github "tid-kijyun/Kanna" ~> 4.0.0 -``` - -1. In the project settings add `$(SDKROOT)/usr/include/libxml2` to the "header search paths" field - -##### Swift Package Manager - -Installing libxml2 to your computer: +#### Swift Package Manager +1. Installing libxml2 to your computer: ```bash -// macOS +// macOS: For xcode 11.3 and earlier, the following settings are required. $ brew install libxml2 $ brew link --force libxml2 -// Linux(Ubuntu) +// Linux(Ubuntu): $ sudo apt-get install libxml2-dev ``` -Adding it to your `Package.swift`: +2. Add the following to your `Package.swift`: ```swift -// swift-tools-version:4.0 +// swift-tools-version:5.0 import PackageDescription let package = Package( name: "YourProject", dependencies: [ - .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "4.0.0") + .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "5.2.2"), ], targets: [ .target( @@ -102,79 +74,11 @@ $ swift build *Note: When a build error occurs, please try run the following command:* ```bash -$ sudo apt-get install pkg-config -``` - -##### Manual Installation -1. Add these files to your project: - [Kanna.swift](Source/Kanna.swift) - [CSS.swift](Source/CSS.swift) - [libxmlHTMLDocument.swift](Source/libxml/libxmlHTMLDocument.swift) - [libxmlHTMLNode.swift](Source/libxml/libxmlHTMLNode.swift) - [libxmlParserOption.swift](Source/libxml/libxmlParserOption.swift) - [Modules](Modules) -1. In the target settings add `$(SDKROOT)/usr/include/libxml2` to the `Search Paths > Header Search Paths` field -1. In the target settings add `$(SRCROOT)/Modules` to the `Swift Compiler - Search Paths > Import Paths` field - - -### Swift 3.0 -For now, please use the `feature/v3.0.0` branch. - -##### CocoaPods -**:warning: CocoaPods (`1.1.0 or later`) is required.** - -Adding it to your `Podfile`: -```ruby -use_frameworks! -pod 'Kanna', :git => 'https://github.com/tid-kijyun/Kanna', :branch => 'feature/v3.0.0' -``` - -##### Carthage -Adding it to your `Cartfile`: - -```ogdl -github "tid-kijyun/Kanna" "feature/v3.0.0" -``` - -1. In the project settings add `$(SDKROOT)/usr/include/libxml2` to the "header search paths" field - -##### Swift Package Manager - -Installing libxml2 to your computer: - -```bash -// macOS -$ brew install libxml2 -$ brew link --force libxml2 - // Linux(Ubuntu) -$ sudo apt-get install libxml2-dev -``` - -Adding it to your `Package.swift`: - -```swift -import PackageDescription - -let package = Package( - name: "YourProject", - - dependencies: [ - .Package(url: "https://github.com/tid-kijyun/Kanna.git", majorVersion: 2) - ] -) -``` - -```bash -$ swift build -``` - -*Note: When a build error occurs, please try run the following command:* -```bash $ sudo apt-get install pkg-config ``` -##### Manual Installation +#### Manual Installation 1. Add these files to your project: [Kanna.swift](Source/Kanna.swift) [CSS.swift](Source/CSS.swift) @@ -185,9 +89,11 @@ $ sudo apt-get install pkg-config 1. In the target settings add `$(SDKROOT)/usr/include/libxml2` to the `Search Paths > Header Search Paths` field 1. In the target settings add `$(SRCROOT)/Modules` to the `Swift Compiler - Search Paths > Import Paths` field -Synopsis: -================= +#### [Installation for swift 4](https://github.com/tid-kijyun/Kanna/blob/master/Documentation/InstallationForSwift4.md) +#### [Installation for swift 3](https://github.com/tid-kijyun/Kanna/blob/master/Documentation/InstallationForSwift3.md) + +## Synopsis ```swift import Kanna @@ -223,6 +129,10 @@ if let doc = try? Kanna.XML(xml: xml, encoding: .utf8) { } ``` -License: -================= +## Donation +If you like Kanna, please donate via GitHub sponsors or PayPal. +It is used to improve and maintain the library. + +## License The MIT License. See the LICENSE file for more information. + diff --git a/Pods/Kanna/Sources/Kanna/CSS.swift b/Pods/Kanna/Sources/Kanna/CSS.swift index abefa99f..7fc5c811 100755 --- a/Pods/Kanna/Sources/Kanna/CSS.swift +++ b/Pods/Kanna/Sources/Kanna/CSS.swift @@ -23,8 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ import Foundation - -import libxmlKanna +import libxml2 typealias AKRegularExpression = NSRegularExpression #if os(Linux) && swift(>=4) @@ -50,10 +49,11 @@ public enum CSS { @return XPath */ - public static func toXPath(_ css: String) throws -> String { + public static func toXPath(_ css: String, isRoot: Bool = true) throws -> String { let selectorGroups = css.components(separatedBy: ",") + let prefix = isRoot ? "" : "." return try selectorGroups - .map { try toXPath(selector: $0) } + .map { prefix.appending(try toXPath(selector: $0)) } .joined(separator: " | ") } @@ -106,13 +106,11 @@ public enum CSS { private func firstMatch(_ pattern: String) -> (String) -> AKTextCheckingResult? { return { str in let length = str.utf16.count - do { - let regex = try AKRegularExpression(pattern: pattern, options: .caseInsensitive) - if let result = regex.firstMatch(in: str, options: .reportProgress, range: NSRange(location: 0, length: length)) { - return result - } - } catch _ { - + guard let regex = try? AKRegularExpression(pattern: pattern, options: .caseInsensitive) else { + return nil + } + if let result = regex.firstMatch(in: str, options: .reportProgress, range: NSRange(location: 0, length: length)) { + return result } return nil } @@ -134,11 +132,11 @@ private func nth(prefix: String, a: Int, b: Int) -> String { // a(n) + b | a(n) - b private func nth_child(a: Int, b: Int) -> String { - return nth(prefix: "preceding", a: a, b: b) + nth(prefix: "preceding", a: a, b: b) } private func nth_last_child(a: Int, b: Int) -> String { - return nth(prefix: "following", a: a, b: b) + nth(prefix: "following", a: a, b: b) } private let escapePattern = "(?:\\\\([!\"#\\$%&\'\\(\\)\\*\\+,\\./:;<=>\\?@\\[\\\\\\]\\^`\\{\\|\\}~]))" @@ -172,23 +170,23 @@ private func substringWithRangeAtIndex(_ result: AKTextCheckingResult, str: Stri } private func escapeCSS(_ text: String) -> String { - return text.replacingOccurrences(of: escapePattern, with: "$1", options: .regularExpression, range: nil) + text.replacingOccurrences(of: escapePattern, with: "$1", options: .regularExpression, range: nil) } private func getElement(_ str: inout String, skip: Bool = true) -> String { if let result = matchElement(str) { let (text, text2) = (escapeCSS(substringWithRangeAtIndex(result, str: str, at: 1)), escapeCSS(substringWithRangeAtIndex(result, str: str, at: 5))) - + if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length).. String? { if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length).. String? { if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length).. String? { if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length).. String? { if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length).. String? { if let sub = matchSubNthChild(one) { let (nth, arg1) = (substringWithRangeAtIndex(sub, str: one, at: 1), substringWithRangeAtIndex(sub, str: one, at: 2)) - + let nthFunc = (nth == "nth-child") ? nth_child : nth_last_child if arg1 == "odd" { return nthFunc(2, 1) @@ -292,7 +290,7 @@ private func getAttribute(_ str: inout String, skip: Bool = true) -> String? { let (nth, arg1, arg2) = (substringWithRangeAtIndex(sub, str: one, at: 1), substringWithRangeAtIndex(sub, str: one, at: 2), substringWithRangeAtIndex(sub, str: one, at: 3)) - + let nthFunc = (nth == "nth-child") ? nth_child : nth_last_child let a: Int = (arg1 == "-") ? -1 : Int(arg1)! let b: Int = (arg2.isEmpty) ? 0 : Int(arg2)! @@ -323,7 +321,7 @@ private func getAttrNot(_ str: inout String, skip: Bool = true) -> String? { if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length).. String? { if skip { str = String(str[str.index(str.startIndex, offsetBy: result.range.length)..": return "/" diff --git a/Pods/Kanna/Sources/Kanna/Deprecated.swift b/Pods/Kanna/Sources/Kanna/Deprecated.swift index 0a2045d4..64273c49 100644 --- a/Pods/Kanna/Sources/Kanna/Deprecated.swift +++ b/Pods/Kanna/Sources/Kanna/Deprecated.swift @@ -13,17 +13,17 @@ import Foundation //------------------------------------------------------------- @available(*, unavailable, message: "Use XML(xml: String, url: String?, encoding: String.Encoding, option: ParseOption). The type of the second argument has been changed to String.Encoding from UInt.") public func XML(xml: String, url: String? = nil, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { - return nil + nil } @available(*, unavailable, message: "Use XML(xml: Data, url: String?, encoding: String.Encoding, option: ParseOption). The type of the first argument has been changed to Data and the type of the second argument has been changed to String.Encoding from UInt.") -public func XML(xml: NSData, url: String? = nil, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { - return nil +public func XML(xml: NSData, url: String? = nil, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { + nil } @available(*, unavailable, message: "Use XML(url: URL, encoding: String.Encoding, option: ParseOption). The type of the second argument has been changed to String.Encoding from UInt.") public func XML(url: URL, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { - return nil + nil } //------------------------------------------------------------- @@ -31,15 +31,15 @@ public func XML(url: URL, encoding: UInt, option: ParseOption = kDefaultXmlParse //------------------------------------------------------------- @available(*, unavailable, message: "Use HTML(html: String, url: String?, encoding: String.Encoding, option: ParseOption). The type of the second argument has been changed to String.Encoding from UInt.") public func HTML(html: String, url: String? = nil, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { - return nil + nil } @available(*, unavailable, message: "Use HTML(html: Data, url: String?, encoding: String.Encoding, option: ParseOption). The type of the first argument has been changed to Data and the type of the second argument has been changed to String.Encoding from UInt.") -public func HTML(html: NSData, url: String? = nil, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { - return nil +public func HTML(html: NSData, url: String? = nil, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { + nil } @available(*, unavailable, message: "Use HTML(url: URL, encoding: String.Encoding, option: ParseOption). The type of the second argument has been changed to String.Encoding from UInt.") public func HTML(url: URL, encoding: UInt, option: ParseOption = kDefaultXmlParseOption) -> XMLDocument? { - return nil + nil } diff --git a/Pods/Kanna/Sources/Kanna/Kanna.swift b/Pods/Kanna/Sources/Kanna/Kanna.swift index 7808eba4..6e8f9d6a 100755 --- a/Pods/Kanna/Sources/Kanna/Kanna.swift +++ b/Pods/Kanna/Sources/Kanna/Kanna.swift @@ -23,8 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ import Foundation - -import libxmlKanna +import libxml2 /* ParseOption @@ -35,8 +34,8 @@ public enum ParseOption { case htmlParseUseLibxml(Libxml2HTMLParserOptions) } -public let kDefaultXmlParseOption = ParseOption.xmlParseUseLibxml([.RECOVER, .NOERROR, .NOWARNING]) -public let kDefaultHtmlParseOption = ParseOption.htmlParseUseLibxml([.RECOVER, .NOERROR, .NOWARNING]) +public let kDefaultXmlParseOption = ParseOption.xmlParseUseLibxml([.RECOVER, .NOERROR, .NOWARNING]) +public let kDefaultHtmlParseOption = ParseOption.htmlParseUseLibxml([.RECOVER, .NOERROR, .NOWARNING]) public enum ParseError: Error { case Empty @@ -119,19 +118,19 @@ public protocol Searchable { @param xpath */ - func xpath(_ xpath: String, namespaces: [String:String]?) -> XPathObject + func xpath(_ xpath: String, namespaces: [String: String]?) -> XPathObject func xpath(_ xpath: String) -> XPathObject - func at_xpath(_ xpath: String, namespaces: [String:String]?) -> XMLElement? + func at_xpath(_ xpath: String, namespaces: [String: String]?) -> XMLElement? func at_xpath(_ xpath: String) -> XMLElement? - + /** Search for node from current node by CSS selector. @param selector a CSS selector */ - func css(_ selector: String, namespaces: [String:String]?) -> XPathObject + func css(_ selector: String, namespaces: [String: String]?) -> XPathObject func css(_ selector: String) -> XPathObject - func at_css(_ selector: String, namespaces: [String:String]?) -> XMLElement? + func at_css(_ selector: String, namespaces: [String: String]?) -> XMLElement? func at_css(_ selector: String) -> XMLElement? } @@ -140,12 +139,12 @@ SearchableNode */ public protocol SearchableNode: Searchable { var text: String? { get } - var toHTML: String? { get } - var toXML: String? { get } + var toHTML: String? { get } + var toXML: String? { get } var innerHTML: String? { get } var className: String? { get } - var tagName: String? { get set } - var content: String? { get set } + var tagName: String? { get set } + var content: String? { get set } } /** @@ -166,6 +165,7 @@ public protocol XMLElement: SearchableNode { XMLDocument */ public protocol XMLDocument: class, SearchableNode { + var namespaces: [Namespace] { get } } /** @@ -181,8 +181,8 @@ public protocol HTMLDocument: XMLDocument { XMLNodeSet */ public final class XMLNodeSet { - fileprivate var nodes: [XMLElement] = [] - + private var nodes: [XMLElement] = [] + public var toHTML: String? { let html = nodes.reduce("") { if let text = $1.toHTML { @@ -192,7 +192,7 @@ public final class XMLNodeSet { } return html.isEmpty == false ? html : nil } - + public var innerHTML: String? { let html = nodes.reduce("") { if let text = $1.innerHTML { @@ -202,7 +202,7 @@ public final class XMLNodeSet { } return html.isEmpty == false ? html : nil } - + public var text: String? { let html = nodes.reduce("") { if let text = $1.text { @@ -212,33 +212,25 @@ public final class XMLNodeSet { } return html } - + public subscript(index: Int) -> XMLElement { - return nodes[index] + nodes[index] } - - public var count: Int { - return nodes.count - } - - internal init() { - } - - internal init(nodes: [XMLElement]) { + + public var count: Int { nodes.count } + + init() {} + + init(nodes: [XMLElement]) { self.nodes = nodes } - + public func at(_ index: Int) -> XMLElement? { - return count > index ? nodes[index] : nil - } - - public var first: XMLElement? { - return at(0) - } - - public var last: XMLElement? { - return at(count-1) + count > index ? nodes[index] : nil } + + public var first: XMLElement? { at(0) } + public var last: XMLElement? { at(count - 1) } } extension XMLNodeSet: Sequence { @@ -256,10 +248,17 @@ extension XMLNodeSet: Sequence { } } +/** + Namespace + */ +public struct Namespace { + public let prefix: String + public let name: String +} + /** XPathObject */ - public enum XPathObject { case none case NodeSet(nodeset: XMLNodeSet) @@ -269,7 +268,7 @@ public enum XPathObject { } extension XPathObject { - internal init(document: XMLDocument?, docPtr: xmlDocPtr, object: xmlXPathObject) { + init(document: XMLDocument?, docPtr: xmlDocPtr, object: xmlXPathObject) { switch object.type { case XPATH_NODESET: let nodeSet = object.nodesetval @@ -278,7 +277,7 @@ extension XPathObject { return } - var nodes : [XMLElement] = [] + var nodes: [XMLElement] = [] let size = Int((nodeSet?.pointee.nodeNr)!) for i in 0 ..< size { let node: xmlNodePtr = nodeSet!.pointee.nodeTab[i]! @@ -306,18 +305,15 @@ extension XPathObject { } public subscript(index: Int) -> XMLElement { - return nodeSet![index] + nodeSet![index] } public var first: XMLElement? { - return nodeSet?.first + nodeSet?.first } public var count: Int { - guard let nodeset = nodeSet else { - return 0 - } - return nodeset.count + nodeSet?.count ?? 0 } var nodeSet: XMLNodeSet? { @@ -333,35 +329,35 @@ extension XPathObject { } return nil } - + var number: Double? { if case let .Number(value) = self { return value } return nil } - + var string: Swift.String? { if case let .String(value) = self { return value } return nil } - + var nodeSetValue: XMLNodeSet { - return nodeSet ?? XMLNodeSet() + nodeSet ?? XMLNodeSet() } - + var boolValue: Swift.Bool { - return bool ?? false + bool ?? false } - + var numberValue: Double { - return number ?? 0.0 + number ?? 0 } - + var stringValue: Swift.String { - return string ?? "" + string ?? "" } } diff --git a/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift b/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift index e7111433..9a5e226f 100755 --- a/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift +++ b/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift @@ -24,8 +24,7 @@ SOFTWARE. */ import Foundation import CoreFoundation - -import libxmlKanna +import libxml2 extension String.Encoding { var IANACharSetName: String? { @@ -128,7 +127,7 @@ extension String.Encoding { return nil } #else - let cfenc = CFStringConvertNSStringEncodingToEncoding(self.rawValue) + let cfenc = CFStringConvertNSStringEncodingToEncoding(rawValue) guard let cfencstr = CFStringConvertEncodingToIANACharSetName(cfenc) else { return nil } @@ -140,19 +139,17 @@ extension String.Encoding { /* libxmlHTMLDocument */ -internal final class libxmlHTMLDocument: HTMLDocument { - fileprivate var docPtr: htmlDocPtr? = nil - fileprivate var rootNode: XMLElement? - fileprivate var html: String - fileprivate var url: String? - fileprivate var encoding: String.Encoding - - var text: String? { - return rootNode?.text - } +final class libxmlHTMLDocument: HTMLDocument { + private var docPtr: htmlDocPtr? + private var rootNode: XMLElement? + private var html: String + private var url: String? + private var encoding: String.Encoding + + var text: String? { rootNode?.text } var toHTML: String? { - let buf = xmlBufferCreate() + let buf = xmlBufferCreate() let outputBuf = xmlOutputBufferCreateBuffer(buf, nil) defer { xmlOutputBufferClose(outputBuf) @@ -165,7 +162,7 @@ internal final class libxmlHTMLDocument: HTMLDocument { } var toXML: String? { - var buf: UnsafeMutablePointer? = nil + var buf: UnsafeMutablePointer? let size: UnsafeMutablePointer? = nil defer { xmlFree(buf) @@ -175,40 +172,28 @@ internal final class libxmlHTMLDocument: HTMLDocument { let html = String(cString: UnsafePointer(buf!)) return html } - - var innerHTML: String? { - return rootNode?.innerHTML - } - - var className: String? { - return nil - } - - var tagName: String? { - get { - return nil - } - set { + var innerHTML: String? { rootNode?.innerHTML } - } + var className: String? { nil } + + var tagName: String? { + get { nil } + set {} } var content: String? { - get { - return text - } - - set { - rootNode?.content = newValue - } + get { text } + set { rootNode?.content = newValue } } - + + var namespaces: [Namespace] { getNamespaces(docPtr: docPtr) } + init(html: String, url: String?, encoding: String.Encoding, option: UInt) throws { - self.html = html - self.url = url + self.html = html + self.url = url self.encoding = encoding - + guard html.lengthOfBytes(using: encoding) > 0 else { throw ParseError.Empty } @@ -217,74 +202,71 @@ internal final class libxmlHTMLDocument: HTMLDocument { let cur = html.cString(using: encoding) else { throw ParseError.EncodingMismatch } - - let url : String = "" - docPtr = htmlReadDoc(UnsafeRawPointer(cur).assumingMemoryBound(to: xmlChar.self), url, charsetName, CInt(option)) - + + let url: String = "" + docPtr = cur.withUnsafeBytes { htmlReadDoc($0.bindMemory(to: xmlChar.self).baseAddress!, url, charsetName, CInt(option)) } guard let docPtr = docPtr else { throw ParseError.EncodingMismatch } - - rootNode = libxmlHTMLNode(document: self, docPtr: docPtr) - } - - deinit { - xmlFreeDoc(self.docPtr) + + rootNode = libxmlHTMLNode(document: self, docPtr: docPtr) } - var title: String? { return at_xpath("//title")?.text } - var head: XMLElement? { return at_xpath("//head") } - var body: XMLElement? { return at_xpath("//body") } - - func xpath(_ xpath: String, namespaces: [String:String]?) -> XPathObject { - return rootNode?.xpath(xpath, namespaces: namespaces) ?? XPathObject.none + deinit { + xmlFreeDoc(docPtr) } - + + var title: String? { at_xpath("//title")?.text } + var head: XMLElement? { at_xpath("//head") } + var body: XMLElement? { at_xpath("//body") } + + func xpath(_ xpath: String, namespaces: [String: String]?) -> XPathObject { + rootNode?.xpath(xpath, namespaces: namespaces) ?? .none + } + func xpath(_ xpath: String) -> XPathObject { - return self.xpath(xpath, namespaces: nil) + self.xpath(xpath, namespaces: nil) } - - func at_xpath(_ xpath: String, namespaces: [String:String]?) -> XMLElement? { - return rootNode?.at_xpath(xpath, namespaces: namespaces) + + func at_xpath(_ xpath: String, namespaces: [String: String]?) -> XMLElement? { + rootNode?.at_xpath(xpath, namespaces: namespaces) } - + func at_xpath(_ xpath: String) -> XMLElement? { - return self.at_xpath(xpath, namespaces: nil) + self.at_xpath(xpath, namespaces: nil) } - - func css(_ selector: String, namespaces: [String:String]?) -> XPathObject { - return rootNode?.css(selector, namespaces: namespaces) ?? XPathObject.none + + func css(_ selector: String, namespaces: [String: String]?) -> XPathObject { + rootNode?.css(selector, namespaces: namespaces) ?? .none } - + func css(_ selector: String) -> XPathObject { - return self.css(selector, namespaces: nil) + self.css(selector, namespaces: nil) } - - func at_css(_ selector: String, namespaces: [String:String]?) -> XMLElement? { - return rootNode?.at_css(selector, namespaces: namespaces) + + func at_css(_ selector: String, namespaces: [String: String]?) -> XMLElement? { + rootNode?.at_css(selector, namespaces: namespaces) } - + func at_css(_ selector: String) -> XMLElement? { - return self.at_css(selector, namespaces: nil) + self.at_css(selector, namespaces: nil) } } /* libxmlXMLDocument */ -internal final class libxmlXMLDocument: XMLDocument { - fileprivate var docPtr: xmlDocPtr? = nil - fileprivate var rootNode: XMLElement? - fileprivate var xml: String - fileprivate var url: String? - fileprivate var encoding: String.Encoding - - var text: String? { - return rootNode?.text - } - +final class libxmlXMLDocument: XMLDocument { + private var docPtr: xmlDocPtr? + private var rootNode: XMLElement? + private var xml: String + private var url: String? + private var encoding: String.Encoding + + var text: String? { rootNode?.text } + var toHTML: String? { - let buf = xmlBufferCreate() + let buf = xmlBufferCreate() let outputBuf = xmlOutputBufferCreateBuffer(buf, nil) defer { xmlOutputBufferClose(outputBuf) @@ -297,7 +279,7 @@ internal final class libxmlXMLDocument: XMLDocument { } var toXML: String? { - var buf: UnsafeMutablePointer? = nil + var buf: UnsafeMutablePointer? let size: UnsafeMutablePointer? = nil defer { xmlFree(buf) @@ -307,87 +289,94 @@ internal final class libxmlXMLDocument: XMLDocument { let html = String(cString: UnsafePointer(buf!)) return html } - - var innerHTML: String? { - return rootNode?.innerHTML - } - - var className: String? { - return nil - } - - var tagName: String? { - get { - return nil - } - set { - - } + var innerHTML: String? { rootNode?.innerHTML } + + var className: String? { nil } + + var tagName: String? { + get { nil } + set {} } var content: String? { - get { - return text - } - - set { - rootNode?.content = newValue - } + get { text } + set { rootNode?.content = newValue } } - + + var namespaces: [Namespace] { getNamespaces(docPtr: docPtr) } + init(xml: String, url: String?, encoding: String.Encoding, option: UInt) throws { - self.xml = xml - self.url = url + self.xml = xml + self.url = url self.encoding = encoding - + if xml.isEmpty { throw ParseError.Empty } - guard let charsetName = encoding.IANACharSetName, let cur = xml.cString(using: encoding) else { throw ParseError.EncodingMismatch } - let url : String = "" - docPtr = xmlReadDoc(UnsafeRawPointer(cur).assumingMemoryBound(to: xmlChar.self), url, charsetName, CInt(option)) - rootNode = libxmlHTMLNode(document: self, docPtr: docPtr!) + let url: String = "" + docPtr = cur.withUnsafeBytes { xmlReadDoc($0.bindMemory(to: xmlChar.self).baseAddress!, url, charsetName, CInt(option)) } + rootNode = libxmlHTMLNode(document: self, docPtr: docPtr!) } deinit { - xmlFreeDoc(self.docPtr) + xmlFreeDoc(docPtr) } - - func xpath(_ xpath: String, namespaces: [String:String]?) -> XPathObject { - return rootNode?.xpath(xpath, namespaces: namespaces) ?? XPathObject.none + + func xpath(_ xpath: String, namespaces: [String: String]?) -> XPathObject { + rootNode?.xpath(xpath, namespaces: namespaces) ?? .none } - + func xpath(_ xpath: String) -> XPathObject { - return self.xpath(xpath, namespaces: nil) + self.xpath(xpath, namespaces: nil) } - - func at_xpath(_ xpath: String, namespaces: [String:String]?) -> XMLElement? { - return rootNode?.at_xpath(xpath, namespaces: namespaces) + + func at_xpath(_ xpath: String, namespaces: [String: String]?) -> XMLElement? { + rootNode?.at_xpath(xpath, namespaces: namespaces) } - + func at_xpath(_ xpath: String) -> XMLElement? { - return self.at_xpath(xpath, namespaces: nil) + self.at_xpath(xpath, namespaces: nil) } - - func css(_ selector: String, namespaces: [String:String]?) -> XPathObject { - return rootNode?.css(selector, namespaces: namespaces) ?? XPathObject.none + + func css(_ selector: String, namespaces: [String: String]?) -> XPathObject { + rootNode?.css(selector, namespaces: namespaces) ?? .none } - + func css(_ selector: String) -> XPathObject { - return self.css(selector, namespaces: nil) + self.css(selector, namespaces: nil) } - - func at_css(_ selector: String, namespaces: [String:String]?) -> XMLElement? { - return rootNode?.at_css(selector, namespaces: namespaces) + + func at_css(_ selector: String, namespaces: [String: String]?) -> XMLElement? { + rootNode?.at_css(selector, namespaces: namespaces) } - + func at_css(_ selector: String) -> XMLElement? { - return self.at_css(selector, namespaces: nil) + self.at_css(selector, namespaces: nil) } } + +private func getNamespaces(docPtr: xmlDocPtr?) -> [Namespace] { + let rootNode = xmlDocGetRootElement(docPtr) + guard let ns = xmlGetNsList(docPtr, rootNode) else { + return [] + } + + var result: [Namespace] = [] + var next = ns.pointee + while next != nil { + if let namePtr = next?.pointee.href { + let prefixPtr = next?.pointee.prefix + let prefix = prefixPtr == nil ? "" : String(cString: UnsafePointer(prefixPtr!)) + let name = String(cString: UnsafePointer(namePtr)) + result.append(Namespace(prefix: prefix, name: name)) + } + next = next?.pointee.next + } + return result +} diff --git a/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift b/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift index 699f64d6..4c53b6ab 100755 --- a/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift +++ b/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift @@ -23,20 +23,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ import Foundation - -import libxmlKanna +import libxml2 /** libxmlHTMLNode */ -internal final class libxmlHTMLNode: XMLElement { +final class libxmlHTMLNode: XMLElement { var text: String? { - if nodePtr != nil { - return libxmlGetNodeContent(nodePtr!) - } - return nil + guard let nodePtr = nodePtr else { return nil } + return libxmlGetNodeContent(nodePtr) } - + var toHTML: String? { let buf = xmlBufferCreate() htmlNodeDump(buf, docPtr, nodePtr) @@ -52,28 +49,25 @@ internal final class libxmlHTMLNode: XMLElement { xmlBufferFree(buf) return html } - + var innerHTML: String? { - if let html = self.toHTML { - let inner = html.replacingOccurrences(of: "]*>$", with: "", options: .regularExpression, range: nil) - .replacingOccurrences(of: "^<[^>]*>", with: "", options: .regularExpression, range: nil) - return inner - } - return nil + guard let html = toHTML else { return nil } + return html + .replacingOccurrences(of: "]*>$", with: "", options: .regularExpression, range: nil) + .replacingOccurrences(of: "^<[^>]*>", with: "", options: .regularExpression, range: nil) } - + var className: String? { - return self["class"] + self["class"] } - - var tagName: String? { + + var tagName: String? { get { guard let name = nodePtr?.pointee.name else { return nil } return String(cString: name) } - set { if let newValue = newValue { xmlNodeSetName(nodePtr, newValue) @@ -82,10 +76,7 @@ internal final class libxmlHTMLNode: XMLElement { } var content: String? { - get { - return text - } - + get { text } set { if let newValue = newValue { let v = escape(newValue) @@ -96,9 +87,8 @@ internal final class libxmlHTMLNode: XMLElement { var parent: XMLElement? { get { - return libxmlHTMLNode(document: doc, docPtr: docPtr!, node: (nodePtr?.pointee.parent)!) + libxmlHTMLNode(document: doc, docPtr: docPtr!, node: (nodePtr?.pointee.parent)!) } - set { if let node = newValue as? libxmlHTMLNode { node.addChild(self) @@ -107,26 +97,23 @@ internal final class libxmlHTMLNode: XMLElement { } var nextSibling: XMLElement? { - let val = xmlNextElementSibling(self.nodePtr) - return self.node(from: val) + node(from: xmlNextElementSibling(nodePtr)) } var previousSibling: XMLElement? { - let val = xmlPreviousElementSibling(self.nodePtr) - return self.node(from: val) + node(from: xmlPreviousElementSibling(nodePtr)) } - fileprivate weak var weakDocument: XMLDocument? - fileprivate var document: XMLDocument? - fileprivate var docPtr: htmlDocPtr? = nil - fileprivate var nodePtr: xmlNodePtr? = nil - fileprivate var isRoot: Bool = false - fileprivate var doc: XMLDocument? { - return weakDocument ?? document + private weak var weakDocument: XMLDocument? + private var document: XMLDocument? + private var docPtr: htmlDocPtr? + private var nodePtr: xmlNodePtr? + private var isRoot = false + private var doc: XMLDocument? { + weakDocument ?? document } - - subscript(attributeName: String) -> String? - { + + subscript(attributeName: String) -> String? { get { var attr = nodePtr?.pointee.properties while attr != nil { @@ -144,7 +131,6 @@ internal final class libxmlHTMLNode: XMLElement { } return nil } - set(newValue) { if let newValue = newValue { xmlSetProp(nodePtr, attributeName, newValue) @@ -153,79 +139,75 @@ internal final class libxmlHTMLNode: XMLElement { } } } - + init(document: XMLDocument?, docPtr: xmlDocPtr) { self.weakDocument = document - self.docPtr = docPtr - self.nodePtr = xmlDocGetRootElement(docPtr) - self.isRoot = true + self.docPtr = docPtr + self.nodePtr = xmlDocGetRootElement(docPtr) + self.isRoot = true } - + init(document: XMLDocument?, docPtr: xmlDocPtr, node: xmlNodePtr) { self.document = document - self.docPtr = docPtr - self.nodePtr = node + self.docPtr = docPtr + self.nodePtr = node } - + // MARK: Searchable - func xpath(_ xpath: String, namespaces: [String:String]?) -> XPathObject { + func xpath(_ xpath: String, namespaces: [String: String]?) -> XPathObject { let ctxt = xmlXPathNewContext(docPtr) if ctxt == nil { - return XPathObject.none + return .none } ctxt?.pointee.node = nodePtr - + if let nsDictionary = namespaces { for (ns, name) in nsDictionary { xmlXPathRegisterNs(ctxt, ns, name) } } - + let result = xmlXPathEvalExpression(xpath, ctxt) defer { xmlXPathFreeObject(result) } xmlXPathFreeContext(ctxt) if result == nil { - return XPathObject.none + return .none } return XPathObject(document: doc, docPtr: docPtr!, object: result!.pointee) } - + func xpath(_ xpath: String) -> XPathObject { - return self.xpath(xpath, namespaces: nil) + self.xpath(xpath, namespaces: nil) } - - func at_xpath(_ xpath: String, namespaces: [String:String]?) -> XMLElement? { - return self.xpath(xpath, namespaces: namespaces).nodeSetValue.first + + func at_xpath(_ xpath: String, namespaces: [String: String]?) -> XMLElement? { + self.xpath(xpath, namespaces: namespaces).nodeSetValue.first } - + func at_xpath(_ xpath: String) -> XMLElement? { - return self.at_xpath(xpath, namespaces: nil) + self.at_xpath(xpath, namespaces: nil) } - - func css(_ selector: String, namespaces: [String:String]?) -> XPathObject { - if let xpath = try? CSS.toXPath(selector) { - if isRoot { - return self.xpath(xpath, namespaces: namespaces) - } else { - return self.xpath("." + xpath, namespaces: namespaces) - } + + func css(_ selector: String, namespaces: [String: String]?) -> XPathObject { + if let xpath = try? CSS.toXPath(selector, isRoot: isRoot) { + return self.xpath(xpath, namespaces: namespaces) } - return XPathObject.none + return .none } - + func css(_ selector: String) -> XPathObject { - return self.css(selector, namespaces: nil) + self.css(selector, namespaces: nil) } - - func at_css(_ selector: String, namespaces: [String:String]?) -> XMLElement? { - return self.css(selector, namespaces: namespaces).nodeSetValue.first + + func at_css(_ selector: String, namespaces: [String: String]?) -> XMLElement? { + self.css(selector, namespaces: namespaces).nodeSetValue.first } - + func at_css(_ selector: String) -> XMLElement? { - return self.css(selector, namespaces: nil).nodeSetValue.first + self.css(selector, namespaces: nil).nodeSetValue.first } func addPrevSibling(_ node: XMLElement) { @@ -249,9 +231,8 @@ internal final class libxmlHTMLNode: XMLElement { xmlUnlinkNode(node.nodePtr) xmlAddChild(nodePtr, node.nodePtr) } - + func removeChild(_ node: XMLElement) { - guard let node = node as? libxmlHTMLNode else { return } @@ -260,12 +241,11 @@ internal final class libxmlHTMLNode: XMLElement { } private func node(from ptr: xmlNodePtr?) -> XMLElement? { - guard let doc = self.doc, let docPtr = self.docPtr, let nodePtr = ptr else { + guard let doc = doc, let docPtr = docPtr, let nodePtr = ptr else { return nil } - let element = libxmlHTMLNode(document: doc, docPtr: docPtr, node: nodePtr) - return element + return libxmlHTMLNode(document: doc, docPtr: docPtr, node: nodePtr) } } @@ -286,8 +266,8 @@ private func libxmlGetNodeContent(_ nodePtr: xmlNodePtr) -> String? { let entities = [ "&": "&", - "<" : "<", - ">" : ">", + "<": "<", + ">": ">" ] private func escape(_ str: String) -> String { @@ -297,4 +277,3 @@ private func escape(_ str: String) -> String { } return newStr } - diff --git a/Pods/Kanna/Sources/Kanna/libxmlParserOption.swift b/Pods/Kanna/Sources/Kanna/libxmlParserOption.swift index 7b8d36b8..e75c6d4d 100755 --- a/Pods/Kanna/Sources/Kanna/libxmlParserOption.swift +++ b/Pods/Kanna/Sources/Kanna/libxmlParserOption.swift @@ -23,23 +23,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ import Foundation - -import libxmlKanna +import libxml2 /* Libxml2HTMLParserOptions */ -public struct Libxml2HTMLParserOptions : OptionSet { +public struct Libxml2HTMLParserOptions: OptionSet { public typealias RawValue = UInt private var value: UInt = 0 init(_ value: UInt) { self.value = value } - private init(_ opt: htmlParserOption) { self.value = UInt(opt.rawValue) } + private init(_ opt: htmlParserOption) { value = UInt(opt.rawValue) } public init(rawValue value: UInt) { self.value = value } - public init(nilLiteral: ()) { self.value = 0 } - public static var allZeros: Libxml2HTMLParserOptions { return .init(0) } - static func fromMask(raw: UInt) -> Libxml2HTMLParserOptions { return .init(raw) } - public var rawValue: UInt { return self.value } - + public init(nilLiteral: ()) { value = 0 } + public static var allZeros: Libxml2HTMLParserOptions { .init(0) } + static func fromMask(raw: UInt) -> Libxml2HTMLParserOptions { .init(raw) } + public var rawValue: UInt { value } + public static let STRICT = Libxml2HTMLParserOptions(0) public static let RECOVER = Libxml2HTMLParserOptions(HTML_PARSE_RECOVER) public static let NODEFDTD = Libxml2HTMLParserOptions(HTML_PARSE_NODEFDTD) @@ -60,13 +59,13 @@ public struct Libxml2XMLParserOptions: OptionSet { public typealias RawValue = UInt private var value: UInt = 0 init(_ value: UInt) { self.value = value } - private init(_ opt: xmlParserOption) { self.value = UInt(opt.rawValue) } + private init(_ opt: xmlParserOption) { value = UInt(opt.rawValue) } public init(rawValue value: UInt) { self.value = value } - public init(nilLiteral: ()) { self.value = 0 } - public static var allZeros: Libxml2XMLParserOptions { return .init(0) } - static func fromMask(raw: UInt) -> Libxml2XMLParserOptions { return .init(raw) } - public var rawValue: UInt { return self.value } - + public init(nilLiteral: ()) { value = 0 } + public static var allZeros: Libxml2XMLParserOptions { .init(0) } + static func fromMask(raw: UInt) -> Libxml2XMLParserOptions { .init(raw) } + public var rawValue: UInt { value } + public static let STRICT = Libxml2XMLParserOptions(0) public static let RECOVER = Libxml2XMLParserOptions(XML_PARSE_RECOVER) public static let NOENT = Libxml2XMLParserOptions(XML_PARSE_NOENT) diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 7277917c..b003f37c 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,6 +1,6 @@ PODS: - Commander (0.9.1) - - Kanna (5.0.0) + - Kanna (5.2.2) - PathKit (0.9.2) - Stencil (0.13.1): - PathKit (~> 0.9.0) @@ -11,11 +11,11 @@ PODS: DEPENDENCIES: - Commander (~> 0.9) - - Kanna (~> 5.0.0) - - PathKit (~> 0.9.0) + - Kanna (~> 5.2) + - PathKit (~> 0.9) - StencilSwiftKit (~> 2.7) - SwiftLint (~> 0.39) - - Yams (~> 2.0.0) + - Yams (~> 2.0) SPEC REPOS: trunk: @@ -29,7 +29,7 @@ SPEC REPOS: SPEC CHECKSUMS: Commander: 723330cf3697b604c00afb9db9576be81a03c501 - Kanna: a32875df62975f8f4b871e933b4ea1a5c3b8be0f + Kanna: 2c4eddaaa4bfb9a1ed19e53c0b3d42ef02838046 PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06 Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 52bd3470..ef33b10c 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -27,203 +27,203 @@ /* Begin PBXContainerItemProxy section */ 07280764696D1180A3428A1A3EA2B84C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna.xcodeproj */; + containerPortal = 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna.xcodeproj */; proxyType = 1; remoteGlobalIDString = 198F9A3E9BE876E12EA9A48C2A5867A5; remoteInfo = Kanna; }; 07E4EF85EF08D1971B22C3375856BB40 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna.xcodeproj */; + containerPortal = 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna.xcodeproj */; proxyType = 1; remoteGlobalIDString = 198F9A3E9BE876E12EA9A48C2A5867A5; remoteInfo = Kanna; }; 31AAE1421882B87DDB95E15EF20A990A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 06DC7371A01A793D100A1429BB1795A1 /* Yams.xcodeproj */; + containerPortal = 2425125ED9A4C8B11E40442340546D3A /* Yams.xcodeproj */; proxyType = 1; remoteGlobalIDString = 1A02B50228A8EE851568FFB6A9533223; remoteInfo = Yams; }; 34F8FBADE23C27CAD1D095C65EC47B87 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna.xcodeproj */; + containerPortal = 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna.xcodeproj */; proxyType = 1; remoteGlobalIDString = 198F9A3E9BE876E12EA9A48C2A5867A5; remoteInfo = Kanna; }; 3C2AA149883E9B7053552608953F6BF6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint.xcodeproj */; + containerPortal = F301E60812399A7CB62160933628F4DA /* SwiftLint.xcodeproj */; proxyType = 1; remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; remoteInfo = SwiftLint; }; 405E11F5F80DEEE7B50C38C438F6CA23 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 06DC7371A01A793D100A1429BB1795A1 /* Yams.xcodeproj */; + containerPortal = 2425125ED9A4C8B11E40442340546D3A /* Yams.xcodeproj */; proxyType = 1; remoteGlobalIDString = 1A02B50228A8EE851568FFB6A9533223; remoteInfo = Yams; }; 48A448B9F460C2AA7CED37ED521D0DDD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint.xcodeproj */; + containerPortal = F301E60812399A7CB62160933628F4DA /* SwiftLint.xcodeproj */; proxyType = 1; remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; remoteInfo = SwiftLint; }; 779DDD0500190E6F1E3B3BD67B6B74A7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 00625AB957E2188438FF2DEE70466855 /* StencilSwiftKit.xcodeproj */; + containerPortal = 6610201D65293740A8A17726DFBA36C1 /* StencilSwiftKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = 6E666B761CEFBCA6E567F287EBE49D13; remoteInfo = StencilSwiftKit; }; 782A39EEA17ADD4845AB4AEFE0C309C3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 0B49BCBA8060EDA6F195E4C46F060498 /* Commander.xcodeproj */; + containerPortal = 12B83D5FD864F04B2CFDD49993C1316A /* Commander.xcodeproj */; proxyType = 1; remoteGlobalIDString = 4A50E2BE2DE9BE847A6934E7C2C10389; remoteInfo = Commander; }; 81337CAC5B10CDD73D6874CBE587AEEE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit.xcodeproj */; + containerPortal = E4F1296D8C38EC9C487DA5870581EA49 /* PathKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = B4C4433A0942F44A502A8BF212B71BAC; remoteInfo = PathKit; }; 82FF8E76D6DBA5304CCD6B6EC1F4931C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 22182313382083C9D24D5DA0B44B09EC /* Stencil.xcodeproj */; + containerPortal = 0AE67785A65A0DEABD584ABD2F3DCAA8 /* Stencil.xcodeproj */; proxyType = 1; remoteGlobalIDString = 9107B3F2331D60BA08A1A2603425733F; remoteInfo = Stencil; }; 88ECC7138EF6587070FC84DC8253A3F4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit.xcodeproj */; + containerPortal = E4F1296D8C38EC9C487DA5870581EA49 /* PathKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = B4C4433A0942F44A502A8BF212B71BAC; remoteInfo = PathKit; }; 908F988F716C5D11828D855EE07686BD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint.xcodeproj */; + containerPortal = F301E60812399A7CB62160933628F4DA /* SwiftLint.xcodeproj */; proxyType = 1; remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; remoteInfo = SwiftLint; }; 959990DB07C010C3FAFE2CA7A01DC41A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 0B49BCBA8060EDA6F195E4C46F060498 /* Commander.xcodeproj */; + containerPortal = 12B83D5FD864F04B2CFDD49993C1316A /* Commander.xcodeproj */; proxyType = 1; remoteGlobalIDString = 4A50E2BE2DE9BE847A6934E7C2C10389; remoteInfo = Commander; }; 959F716BD22C823F05DEAC4D2674B59A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna.xcodeproj */; + containerPortal = 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna.xcodeproj */; proxyType = 1; remoteGlobalIDString = 198F9A3E9BE876E12EA9A48C2A5867A5; remoteInfo = Kanna; }; 9A811F341292A9DC58EB29C2D86B12FF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 06DC7371A01A793D100A1429BB1795A1 /* Yams.xcodeproj */; + containerPortal = 2425125ED9A4C8B11E40442340546D3A /* Yams.xcodeproj */; proxyType = 1; remoteGlobalIDString = 1A02B50228A8EE851568FFB6A9533223; remoteInfo = Yams; }; 9D7A634304E19DCD137EA6EF87C75CE7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 06DC7371A01A793D100A1429BB1795A1 /* Yams.xcodeproj */; + containerPortal = 2425125ED9A4C8B11E40442340546D3A /* Yams.xcodeproj */; proxyType = 1; remoteGlobalIDString = 1A02B50228A8EE851568FFB6A9533223; remoteInfo = Yams; }; A4F87BE672AE807CAEAED3775DF1056A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit.xcodeproj */; + containerPortal = E4F1296D8C38EC9C487DA5870581EA49 /* PathKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = B4C4433A0942F44A502A8BF212B71BAC; remoteInfo = PathKit; }; AC95143B40160AC097C6A6A25816A1E3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 00625AB957E2188438FF2DEE70466855 /* StencilSwiftKit.xcodeproj */; + containerPortal = 6610201D65293740A8A17726DFBA36C1 /* StencilSwiftKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = 6E666B761CEFBCA6E567F287EBE49D13; remoteInfo = StencilSwiftKit; }; B65489F48832698D4E570CA306AFE23E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 06DC7371A01A793D100A1429BB1795A1 /* Yams.xcodeproj */; + containerPortal = 2425125ED9A4C8B11E40442340546D3A /* Yams.xcodeproj */; proxyType = 1; remoteGlobalIDString = 1A02B50228A8EE851568FFB6A9533223; remoteInfo = Yams; }; B88F86493BE0C7C7C8009F7EB6058179 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 22182313382083C9D24D5DA0B44B09EC /* Stencil.xcodeproj */; + containerPortal = 0AE67785A65A0DEABD584ABD2F3DCAA8 /* Stencil.xcodeproj */; proxyType = 1; remoteGlobalIDString = 9107B3F2331D60BA08A1A2603425733F; remoteInfo = Stencil; }; B8C65D277B82547F450D2EE7BEAB021B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit.xcodeproj */; + containerPortal = E4F1296D8C38EC9C487DA5870581EA49 /* PathKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = B4C4433A0942F44A502A8BF212B71BAC; remoteInfo = PathKit; }; BAF7354198836E1272AC31BAD333F7EC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna.xcodeproj */; + containerPortal = 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna.xcodeproj */; proxyType = 1; remoteGlobalIDString = 198F9A3E9BE876E12EA9A48C2A5867A5; remoteInfo = Kanna; }; BC98F742298DBE5F3CCF322B14B38A71 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 0B49BCBA8060EDA6F195E4C46F060498 /* Commander.xcodeproj */; + containerPortal = 12B83D5FD864F04B2CFDD49993C1316A /* Commander.xcodeproj */; proxyType = 1; remoteGlobalIDString = 4A50E2BE2DE9BE847A6934E7C2C10389; remoteInfo = Commander; }; C422BE6193CF97AFD49A583457B58B71 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit.xcodeproj */; + containerPortal = E4F1296D8C38EC9C487DA5870581EA49 /* PathKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = B4C4433A0942F44A502A8BF212B71BAC; remoteInfo = PathKit; }; C81C398FAB1669B50CD1CC29F270350E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 22182313382083C9D24D5DA0B44B09EC /* Stencil.xcodeproj */; + containerPortal = 0AE67785A65A0DEABD584ABD2F3DCAA8 /* Stencil.xcodeproj */; proxyType = 1; remoteGlobalIDString = 9107B3F2331D60BA08A1A2603425733F; remoteInfo = Stencil; }; D36211C4B4D4C90BB2DFC52D6F6574BB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint.xcodeproj */; + containerPortal = F301E60812399A7CB62160933628F4DA /* SwiftLint.xcodeproj */; proxyType = 1; remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; remoteInfo = SwiftLint; }; E019FACE19CA11D9AB8AA80288BBFB0F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 00625AB957E2188438FF2DEE70466855 /* StencilSwiftKit.xcodeproj */; + containerPortal = 6610201D65293740A8A17726DFBA36C1 /* StencilSwiftKit.xcodeproj */; proxyType = 1; remoteGlobalIDString = 6E666B761CEFBCA6E567F287EBE49D13; remoteInfo = StencilSwiftKit; }; FC29D6D635B79D8440E3B1554D2C57A3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint.xcodeproj */; + containerPortal = F301E60812399A7CB62160933628F4DA /* SwiftLint.xcodeproj */; proxyType = 1; remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; remoteInfo = SwiftLint; @@ -231,23 +231,19 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 00625AB957E2188438FF2DEE70466855 /* StencilSwiftKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = StencilSwiftKit; path = StencilSwiftKit.xcodeproj; sourceTree = ""; }; - 06DC7371A01A793D100A1429BB1795A1 /* Yams */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Yams; path = Yams.xcodeproj; sourceTree = ""; }; 08E3A2F8E4B380D5C032AD2CAE089D5E /* Pods-SwiftGenKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwiftGenKit.release.xcconfig"; sourceTree = ""; }; - 0B49BCBA8060EDA6F195E4C46F060498 /* Commander */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Commander; path = Commander.xcodeproj; sourceTree = ""; }; + 0AE67785A65A0DEABD584ABD2F3DCAA8 /* Stencil */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stencil; path = Stencil.xcodeproj; sourceTree = ""; }; 0DEFB0F474149B6909ADF2B02C3E0E36 /* Pods_swiftgen_Templates_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_swiftgen_Templates_UnitTests.framework; path = "Pods-swiftgen-Templates UnitTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftLint; path = SwiftLint.xcodeproj; sourceTree = ""; }; + 12B83D5FD864F04B2CFDD49993C1316A /* Commander */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Commander; path = Commander.xcodeproj; sourceTree = ""; }; 1390315F7F1EFA8E1526B436D075CEB0 /* Pods-swiftgen-SwiftGen UnitTests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-swiftgen-SwiftGen UnitTests-Info.plist"; sourceTree = ""; }; 17E05794BC04B44006A98BD2D7D7726B /* Pods-swiftgen-Templates UnitTests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-swiftgen-Templates UnitTests-Info.plist"; sourceTree = ""; }; 1993626EC58FA16D8803FB857ABDE66A /* Pods-SwiftGenKit-SwiftGenKit UnitTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests-dummy.m"; sourceTree = ""; }; - 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PathKit; path = PathKit.xcodeproj; sourceTree = ""; }; - 22182313382083C9D24D5DA0B44B09EC /* Stencil */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stencil; path = Stencil.xcodeproj; sourceTree = ""; }; + 2425125ED9A4C8B11E40442340546D3A /* Yams */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Yams; path = Yams.xcodeproj; sourceTree = ""; }; 28EDE5F0277638BF91586ADD3BDDC54E /* Pods-SwiftGenKit-SwiftGenKit UnitTests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests-Info.plist"; sourceTree = ""; }; 2B13AB71283B2C50EC4D5F86F0558DC4 /* Pods-swiftgen-Templates UnitTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-swiftgen-Templates UnitTests-acknowledgements.markdown"; sourceTree = ""; }; 34B196A1B62C489512EFF08BD7EBEF1B /* Pods_SwiftGenKit_SwiftGenKit_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwiftGenKit_SwiftGenKit_UnitTests.framework; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 3E8B96676425F286F2FC0CF50B238CB7 /* Pods-swiftgen-Templates UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-swiftgen-Templates UnitTests.release.xcconfig"; sourceTree = ""; }; 40E495C99902737E966F3522AF27DC86 /* Pods-SwiftGenKit-SwiftGenKit UnitTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests-umbrella.h"; sourceTree = ""; }; - 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kanna; path = Kanna.xcodeproj; sourceTree = ""; }; 4A92CC5F5F7C9A5A09AB3D6F2CCFB2EA /* Pods_SwiftGenKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwiftGenKit.framework; path = "Pods-SwiftGenKit.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 4B7CD177C091D1511775343BF209D2D2 /* Pods-SwiftGenKit-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwiftGenKit-Info.plist"; sourceTree = ""; }; 4C3718BE86003EBE81F229E0B7E77AB8 /* Pods-swiftgen.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-swiftgen.modulemap"; sourceTree = ""; }; @@ -261,10 +257,12 @@ 5EEB68D1066E4EE7FBCB044A92690797 /* Pods-swiftgen-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-swiftgen-Info.plist"; sourceTree = ""; }; 5FB979C925D19CB5EE610CA6D64396D9 /* Pods-swiftgen-SwiftGen UnitTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-swiftgen-SwiftGen UnitTests-umbrella.h"; sourceTree = ""; }; 647046F5E1F1FE7728F6CF39B41BB2ED /* Pods-swiftgen-SwiftGen UnitTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-swiftgen-SwiftGen UnitTests-acknowledgements.markdown"; sourceTree = ""; }; + 6610201D65293740A8A17726DFBA36C1 /* StencilSwiftKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = StencilSwiftKit; path = StencilSwiftKit.xcodeproj; sourceTree = ""; }; 6BEB777939662C07D438C98BCE1AEE25 /* Pods-swiftgen.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-swiftgen.release.xcconfig"; sourceTree = ""; }; 6F2A2E609164B2801F4C5FEE238F1964 /* Pods-swiftgen-SwiftGen UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-swiftgen-SwiftGen UnitTests.debug.xcconfig"; sourceTree = ""; }; 7B42D99809B065FBADCEFB8BBA7449CE /* Pods-SwiftGenKit-SwiftGenKit UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests.debug.xcconfig"; sourceTree = ""; }; 803CDBF6DF3859F8B9767FDE3E966C3A /* Pods-swiftgen-Templates UnitTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-swiftgen-Templates UnitTests-frameworks.sh"; sourceTree = ""; }; + 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kanna; path = Kanna.xcodeproj; sourceTree = ""; }; 934A523D3842C7F4124C85248658AE31 /* Pods-SwiftGenKit-SwiftGenKit UnitTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests-frameworks.sh"; sourceTree = ""; }; 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9FD17D97EB5153316217424C76039726 /* Pods-SwiftGenKit-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwiftGenKit-acknowledgements.markdown"; sourceTree = ""; }; @@ -279,6 +277,7 @@ DD34B883142F941D37080608EB16E9E1 /* Pods-SwiftGenKit-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwiftGenKit-acknowledgements.plist"; sourceTree = ""; }; DD4EB08591BC37BEA5FDAC7613152666 /* Pods-swiftgen-Templates UnitTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-swiftgen-Templates UnitTests.modulemap"; sourceTree = ""; }; E2738A8AB838BCC4EF1F88D35DA59343 /* Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.plist"; sourceTree = ""; }; + E4F1296D8C38EC9C487DA5870581EA49 /* PathKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PathKit; path = PathKit.xcodeproj; sourceTree = ""; }; E7A3F36B124572BDD5A7B94B0CA75E9D /* Pods-swiftgen-SwiftGen UnitTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-swiftgen-SwiftGen UnitTests-dummy.m"; sourceTree = ""; }; E98C8CECFAE4E9C9130F6E8A7404AEB9 /* Pods-SwiftGenKit-SwiftGenKit UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests.release.xcconfig"; sourceTree = ""; }; E9ED521A3C06704493E19AD741699619 /* Pods_swiftgen_SwiftGen_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_swiftgen_SwiftGen_UnitTests.framework; path = "Pods-swiftgen-SwiftGen UnitTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -286,6 +285,7 @@ EBD74BC80F3DEAD961E7CFE4897BBBE4 /* Pods-swiftgen-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-swiftgen-dummy.m"; sourceTree = ""; }; ED83B2C06CC8724452BC997E6A123176 /* Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.markdown"; sourceTree = ""; }; EED1ED6EB1CD297EA50BD4985C9B768F /* Pods-swiftgen-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-swiftgen-umbrella.h"; sourceTree = ""; }; + F301E60812399A7CB62160933628F4DA /* SwiftLint */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftLint; path = SwiftLint.xcodeproj; sourceTree = ""; }; F40DF63C113D711D0B31FFF2B5FEC71F /* Pods-swiftgen-Templates UnitTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-swiftgen-Templates UnitTests-umbrella.h"; sourceTree = ""; }; F940C819049CFF8741C0F5E3E075E607 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; FAA071A90E0181D1F5DF2667978654D7 /* Pods-swiftgen-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-swiftgen-acknowledgements.markdown"; sourceTree = ""; }; @@ -364,20 +364,6 @@ name = "Targets Support Files"; sourceTree = ""; }; - 54DBED1BE90C75DAA87D0F5EA40F0901 /* Pods */ = { - isa = PBXGroup; - children = ( - 0B49BCBA8060EDA6F195E4C46F060498 /* Commander */, - 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna */, - 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit */, - 22182313382083C9D24D5DA0B44B09EC /* Stencil */, - 00625AB957E2188438FF2DEE70466855 /* StencilSwiftKit */, - 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint */, - 06DC7371A01A793D100A1429BB1795A1 /* Yams */, - ); - name = Pods; - sourceTree = ""; - }; 6D8DE6E0F71049736A7D25A0E53A48CC /* Pods-swiftgen */ = { isa = PBXGroup; children = ( @@ -454,12 +440,26 @@ children = ( 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */, E0A1E60606E0BF6E2E10F1F01350DFE8 /* Frameworks */, - 54DBED1BE90C75DAA87D0F5EA40F0901 /* Pods */, + D199C0212BCAE2F753E087A74F858387 /* Pods */, BEDD3790237B7CCF6EE60EAB9F0D9685 /* Products */, 4731D55204868409DFB4561737E4953B /* Targets Support Files */, ); sourceTree = ""; }; + D199C0212BCAE2F753E087A74F858387 /* Pods */ = { + isa = PBXGroup; + children = ( + 12B83D5FD864F04B2CFDD49993C1316A /* Commander */, + 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna */, + E4F1296D8C38EC9C487DA5870581EA49 /* PathKit */, + 0AE67785A65A0DEABD584ABD2F3DCAA8 /* Stencil */, + 6610201D65293740A8A17726DFBA36C1 /* StencilSwiftKit */, + F301E60812399A7CB62160933628F4DA /* SwiftLint */, + 2425125ED9A4C8B11E40442340546D3A /* Yams */, + ); + name = Pods; + sourceTree = ""; + }; E0A1E60606E0BF6E2E10F1F01350DFE8 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -671,25 +671,25 @@ projectDirPath = ""; projectReferences = ( { - ProjectRef = 0B49BCBA8060EDA6F195E4C46F060498 /* Commander */; + ProjectRef = 91AD2DAA5AE36747B017C6FB20CB5A12 /* Kanna */; }, { - ProjectRef = 454D4E5B645E7DDE8DA53F70736A90C0 /* Kanna */; + ProjectRef = E4F1296D8C38EC9C487DA5870581EA49 /* PathKit */; }, { - ProjectRef = 1A84C242AD4BE8A9A5E8702D8118964E /* PathKit */; + ProjectRef = F301E60812399A7CB62160933628F4DA /* SwiftLint */; }, { - ProjectRef = 22182313382083C9D24D5DA0B44B09EC /* Stencil */; + ProjectRef = 2425125ED9A4C8B11E40442340546D3A /* Yams */; }, { - ProjectRef = 00625AB957E2188438FF2DEE70466855 /* StencilSwiftKit */; + ProjectRef = 12B83D5FD864F04B2CFDD49993C1316A /* Commander */; }, { - ProjectRef = 1149EC0244717BC3E1E2B14A49E0D43C /* SwiftLint */; + ProjectRef = 0AE67785A65A0DEABD584ABD2F3DCAA8 /* Stencil */; }, { - ProjectRef = 06DC7371A01A793D100A1429BB1795A1 /* Yams */; + ProjectRef = 6610201D65293740A8A17726DFBA36C1 /* StencilSwiftKit */; }, ); projectRoot = ""; diff --git a/Pods/Target Support Files/Kanna/Kanna-Info.plist b/Pods/Target Support Files/Kanna/Kanna-Info.plist index e2771ff4..a5e054ef 100644 --- a/Pods/Target Support Files/Kanna/Kanna-Info.plist +++ b/Pods/Target Support Files/Kanna/Kanna-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.0.0 + 5.2.2 CFBundleSignature ???? CFBundleVersion diff --git a/Pods/Target Support Files/Kanna/Kanna.debug.xcconfig b/Pods/Target Support Files/Kanna/Kanna.debug.xcconfig index 73f110a0..d267912b 100644 --- a/Pods/Target Support Files/Kanna/Kanna.debug.xcconfig +++ b/Pods/Target Support Files/Kanna/Kanna.debug.xcconfig @@ -2,6 +2,7 @@ CODE_SIGN_IDENTITY = CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Kanna GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) $(SDKROOT)/usr/include/libxml2 +OTHER_LDFLAGS = $(inherited) -l"xml2" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) @@ -9,5 +10,4 @@ PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/Kanna PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Kanna/Kanna.release.xcconfig b/Pods/Target Support Files/Kanna/Kanna.release.xcconfig index 73f110a0..d267912b 100644 --- a/Pods/Target Support Files/Kanna/Kanna.release.xcconfig +++ b/Pods/Target Support Files/Kanna/Kanna.release.xcconfig @@ -2,6 +2,7 @@ CODE_SIGN_IDENTITY = CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Kanna GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) $(SDKROOT)/usr/include/libxml2 +OTHER_LDFLAGS = $(inherited) -l"xml2" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) @@ -9,5 +10,4 @@ PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/Kanna PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.markdown b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.markdown index 4a34c2f5..080c4d1f 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.markdown @@ -56,7 +56,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.plist b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.plist index 0de5653f..0bf90d3b 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests-acknowledgements.plist @@ -79,7 +79,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. FooterText The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.debug.xcconfig b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.debug.xcconfig index 08b710be..69d47fbc 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.debug.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna" "$ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Kanna" -framework "PathKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Kanna" -framework "PathKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.release.xcconfig b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.release.xcconfig index 08b710be..69d47fbc 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-SwiftGenKit-SwiftGenKit UnitTests/Pods-SwiftGenKit-SwiftGenKit UnitTests.release.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna" "$ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Kanna" -framework "PathKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Kanna" -framework "PathKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.markdown b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.markdown index 4a34c2f5..080c4d1f 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.markdown @@ -56,7 +56,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.plist b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.plist index 0de5653f..0bf90d3b 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit-acknowledgements.plist @@ -79,7 +79,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. FooterText The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.debug.xcconfig b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.debug.xcconfig index 173eadd5..32abfc0c 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.debug.xcconfig +++ b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.debug.xcconfig @@ -2,11 +2,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna" "$ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Kanna" -framework "PathKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Kanna" -framework "PathKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.release.xcconfig b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.release.xcconfig index 173eadd5..32abfc0c 100644 --- a/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.release.xcconfig +++ b/Pods/Target Support Files/Pods-SwiftGenKit/Pods-SwiftGenKit.release.xcconfig @@ -2,11 +2,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna" "$ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Kanna" -framework "PathKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Kanna" -framework "PathKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.markdown b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.markdown index bdaf80c4..21dfe094 100644 --- a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.markdown @@ -16,9 +16,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the {organization} nor the names of its +* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -139,7 +139,7 @@ SOFTWARE. The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.plist b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.plist index fa0cc20c..1e8402b1 100644 --- a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests-acknowledgements.plist @@ -27,9 +27,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the {organization} nor the names of its +* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -180,7 +180,7 @@ SOFTWARE. FooterText The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.debug.xcconfig b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.debug.xcconfig index c3a2c9b4..f92f35ec 100644 --- a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.debug.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander/Commander.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stencil/Stencil.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/StencilSwiftKit/StencilSwiftKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.release.xcconfig b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.release.xcconfig index c3a2c9b4..f92f35ec 100644 --- a/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-swiftgen-SwiftGen UnitTests/Pods-swiftgen-SwiftGen UnitTests.release.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander/Commander.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stencil/Stencil.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/StencilSwiftKit/StencilSwiftKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.markdown b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.markdown index bdaf80c4..21dfe094 100644 --- a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.markdown @@ -16,9 +16,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the {organization} nor the names of its +* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -139,7 +139,7 @@ SOFTWARE. The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.plist b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.plist index fa0cc20c..1e8402b1 100644 --- a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests-acknowledgements.plist @@ -27,9 +27,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the {organization} nor the names of its +* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -180,7 +180,7 @@ SOFTWARE. FooterText The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.debug.xcconfig b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.debug.xcconfig index c3a2c9b4..f92f35ec 100644 --- a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.debug.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander/Commander.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stencil/Stencil.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/StencilSwiftKit/StencilSwiftKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.release.xcconfig b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.release.xcconfig index c3a2c9b4..f92f35ec 100644 --- a/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-swiftgen-Templates UnitTests/Pods-swiftgen-Templates UnitTests.release.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander/Commander.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stencil/Stencil.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/StencilSwiftKit/StencilSwiftKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.markdown b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.markdown index bdaf80c4..21dfe094 100644 --- a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.markdown @@ -16,9 +16,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the {organization} nor the names of its +* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -139,7 +139,7 @@ SOFTWARE. The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.plist b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.plist index fa0cc20c..1e8402b1 100644 --- a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen-acknowledgements.plist @@ -27,9 +27,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the {organization} nor the names of its +* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -180,7 +180,7 @@ SOFTWARE. FooterText The MIT License (MIT) -Copyright (c) 2015 Realm Inc. +Copyright (c) 2020 Realm Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.debug.xcconfig b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.debug.xcconfig index 1c2d6095..9627b95f 100644 --- a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.debug.xcconfig +++ b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.debug.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander/Commander.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stencil/Stencil.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/StencilSwiftKit/StencilSwiftKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.release.xcconfig b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.release.xcconfig index 1c2d6095..9627b95f 100644 --- a/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.release.xcconfig +++ b/Pods/Target Support Files/Pods-swiftgen/Pods-swiftgen.release.xcconfig @@ -3,11 +3,10 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Commander/Commander.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Kanna/Kanna.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/PathKit/PathKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stencil/Stencil.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/StencilSwiftKit/StencilSwiftKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Yams/Yams.framework/Headers" $(SDKROOT)/usr/include/libxml2 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" +OTHER_LDFLAGS = $(inherited) -l"xml2" -framework "Commander" -framework "Foundation" -framework "Kanna" -framework "PathKit" -framework "Stencil" -framework "StencilSwiftKit" -framework "Yams" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS 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 -SWIFT_INCLUDE_PATHS = $(inherited) $(SRCROOT)/Kanna/Modules USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES diff --git a/SwiftGenKit.podspec b/SwiftGenKit.podspec index 70a163ec..c9d52a1c 100644 --- a/SwiftGenKit.podspec +++ b/SwiftGenKit.podspec @@ -28,8 +28,8 @@ Pod::Spec.new do |s| } s.source_files = 'Sources/**/*.swift' - s.dependency 'Kanna', '~> 5.0.0' - s.dependency 'PathKit', '~> 0.9.0' - s.dependency 'Yams', '~> 2.0.0' + s.dependency 'Kanna', '~> 5.2' + s.dependency 'PathKit', '~> 0.9' + s.dependency 'Yams', '~> 2.0' s.framework = 'Foundation' end