dnrops
/
SwiftSoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop 

* master:
  Ignore xcuserdata
  Delete .swift-version
  s.swift_versions = ['4.0', '4.2', '5.0', '5.1']
  bump version 2.2.2
  Fix hang on Xcode 11
This commit is contained in:
Nabil Chatbi 2019-12-20 21:26:11 +01:00
parent 0b8c0dd19d 38bd6564e7
commit 04ed48a128
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,2 +1,5 @@
# OS X # OS X
.DS_Store .DS_Store
# Xcode user settings
xcuserdata/

1
.swift-version
View File

@ -1 +0,0 @@
4.2

4
Sources/StructuralEvaluator.swift
View File

@ -78,11 +78,9 @@ public class StructuralEvaluator: Evaluator {
var parent = element.parent() var parent = element.parent()
while (true) { while (true) {
do { do {
if parent != nil { if let p = parent, try evaluator.matches(root, p) {
if (try evaluator.matches(root, parent!)) {
return true return true
} }
}
} catch {} } catch {}
if (parent == root) { if (parent == root) {

3
SwiftSoup.podspec
View File

@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'SwiftSoup' s.name = 'SwiftSoup'
s.version = '2.2.1' s.version = '2.2.2'
s.summary = 'Swift HTML Parser / Reader, XML , with best of DOM, CSS, and jquery' s.summary = 'Swift HTML Parser / Reader, XML , with best of DOM, CSS, and jquery'
s.description = <<-DESC s.description = <<-DESC
SwiftSoup is a Swift library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods. SwiftSoup is a Swift library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods.
@ -26,6 +26,7 @@ SwiftSoup is a Swift library for working with real-world HTML. It provides a ver
s.tvos.deployment_target = "9.0" s.tvos.deployment_target = "9.0"
s.source_files = 'Sources/**/*.swift' s.source_files = 'Sources/**/*.swift'
s.swift_versions = ['4.0', '4.2', '5.0', '5.1']
#s.resource_bundles = { #s.resource_bundles = {
# 'SwiftSoup' => ['Assets/*.properties'] # 'SwiftSoup' => ['Assets/*.properties']