diff --git a/Package.resolved b/Package.resolved index 5771ba78..b830dde8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/tid-kijyun/Kanna.git", "state": { "branch": null, - "revision": "0534d5d4917410870fcac8907e06f69b58a23417", - "version": "4.0.3" + "revision": "9b8f73f8c8e145dc496565bbf878a709793e7ba3", + "version": "5.0.0" } }, { diff --git a/Package.swift b/Package.swift index 7ca4e7f6..687e5eaa 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: "1.0.0"), .package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", from: "2.7.0"), - .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "4.0.0") + .package(url: "https://github.com/tid-kijyun/Kanna.git", from: "5.0.0") ], targets: [ .target(name: "SwiftGen", dependencies: [ diff --git a/Podfile.lock b/Podfile.lock index f3ad155c..89ebce43 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,6 +1,6 @@ PODS: - Commander (0.8.0) - - Kanna (4.0.3) + - Kanna (5.0.0) - PathKit (0.9.2) - Stencil (0.13.1): - PathKit (~> 0.9.0) @@ -11,7 +11,7 @@ PODS: DEPENDENCIES: - Commander (~> 0.8) - - Kanna (~> 4.0.0) + - Kanna (~> 5.0.0) - PathKit (~> 0.9.0) - StencilSwiftKit (~> 2.7) - SwiftLint (~> 0.31) @@ -29,7 +29,7 @@ SPEC REPOS: SPEC CHECKSUMS: Commander: 6eda7635b133e239faa85bf75dcab88d6fd63aaa - Kanna: 0ebbdd0e7e3308f0aafbd569e79c8cadc5eb877c + Kanna: a32875df62975f8f4b871e933b4ea1a5c3b8be0f PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06 Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff diff --git a/Pods/Kanna/README.md b/Pods/Kanna/README.md index 0f9ed322..04fd6d18 100644 --- a/Pods/Kanna/README.md +++ b/Pods/Kanna/README.md @@ -25,6 +25,26 @@ Features: Installation: ================= +### Swift 5 +##### CocoaPods +Adding it to your `Podfile`: +```ruby +use_frameworks! +pod 'Kanna', '~> 5.0.0' +``` + +##### Carthage +Adding it to your `Cartfile`: + +```ogdl +github "tid-kijyun/Kanna" ~> 5.0.0 +``` + +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.** @@ -165,49 +185,6 @@ $ 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 -### Swift 2.x - -Three means of installation are supported: - -##### CocoaPods -**:warning: CocoaPods (`0.39 or later`) is required.** - -Adding it to your `Podfile`: -```ruby -use_frameworks! -pod 'Kanna', '~> 1.1.0' -``` - -##### Carthage -Adding it to your `Cartfile`: - -```ogdl -github "tid-kijyun/Kanna" ~> 1.1.0 -``` - -##### 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) -1. In the target settings add `$(SDKROOT)/usr/include/libxml2` to the `Search Paths > Header Search Paths` field -1. In the target settings add `-lxml2` to the `Linking > Other Linker Flags` field -1. Import `libxml` headers: - - Copy the those import statements: - - ```objective-c - #import - #import - #import - ``` - - and paste them into your [Modulename]-Bridging-Header.h - -*Note: With manual installation, this library doesn't need to be imported, or namespace-qualified in your code.* - Synopsis: ================= diff --git a/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift b/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift index 1e5aef91..e7111433 100755 --- a/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift +++ b/Pods/Kanna/Sources/Kanna/libxmlHTMLDocument.swift @@ -172,7 +172,7 @@ internal final class libxmlHTMLDocument: HTMLDocument { } xmlDocDumpMemory(docPtr, &buf, size) - let html = String(cString: UnsafePointer(buf!)) + let html = String(cString: UnsafePointer(buf!)) return html } @@ -304,7 +304,7 @@ internal final class libxmlXMLDocument: XMLDocument { } xmlDocDumpMemory(docPtr, &buf, size) - let html = String(cString: UnsafePointer(buf!)) + let html = String(cString: UnsafePointer(buf!)) return html } diff --git a/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift b/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift index 5d8bf772..699f64d6 100755 --- a/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift +++ b/Pods/Kanna/Sources/Kanna/libxmlHTMLNode.swift @@ -40,7 +40,7 @@ internal final class libxmlHTMLNode: XMLElement { var toHTML: String? { let buf = xmlBufferCreate() htmlNodeDump(buf, docPtr, nodePtr) - let html = String(cString: UnsafePointer((buf?.pointee.content)!)) + let html = String(cString: UnsafePointer((buf?.pointee.content)!)) xmlBufferFree(buf) return html } @@ -48,7 +48,7 @@ internal final class libxmlHTMLNode: XMLElement { var toXML: String? { let buf = xmlBufferCreate() xmlNodeDump(buf, docPtr, nodePtr, 0, 0) - let html = String(cString: UnsafePointer((buf?.pointee.content)!)) + let html = String(cString: UnsafePointer((buf?.pointee.content)!)) xmlBufferFree(buf) return html } diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index f3ad155c..89ebce43 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,6 +1,6 @@ PODS: - Commander (0.8.0) - - Kanna (4.0.3) + - Kanna (5.0.0) - PathKit (0.9.2) - Stencil (0.13.1): - PathKit (~> 0.9.0) @@ -11,7 +11,7 @@ PODS: DEPENDENCIES: - Commander (~> 0.8) - - Kanna (~> 4.0.0) + - Kanna (~> 5.0.0) - PathKit (~> 0.9.0) - StencilSwiftKit (~> 2.7) - SwiftLint (~> 0.31) @@ -29,7 +29,7 @@ SPEC REPOS: SPEC CHECKSUMS: Commander: 6eda7635b133e239faa85bf75dcab88d6fd63aaa - Kanna: 0ebbdd0e7e3308f0aafbd569e79c8cadc5eb877c + Kanna: a32875df62975f8f4b871e933b4ea1a5c3b8be0f PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06 Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff diff --git a/Pods/Target Support Files/Kanna/Kanna-Info.plist b/Pods/Target Support Files/Kanna/Kanna-Info.plist index 204204a7..e2771ff4 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 - 4.0.3 + 5.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/SwiftGenKit.podspec b/SwiftGenKit.podspec index 1de64fd7..c8e76c6a 100644 --- a/SwiftGenKit.podspec +++ b/SwiftGenKit.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| } s.source_files = 'Sources/**/*.swift' - s.dependency 'Kanna', '~> 4.0.0' + s.dependency 'Kanna', '~> 5.0.0' s.dependency 'PathKit', '~> 0.9.0' s.dependency 'Yams', '~> 1.0.0' s.framework = 'Foundation'