diff --git a/.swift-version b/.swift-version index 5186d07..819e07a 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +5.0 diff --git a/Example/Podfile b/Example/Podfile index 1e818cf..da22abc 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,3 +1,4 @@ +platform :ios, '8.3' use_frameworks! target 'ReadabilityKit_Example' do diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 86585a4..5882a1b 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,23 +1,23 @@ PODS: - - Ji (2.1.0): - - Ji/Ji (= 2.1.0) - - Ji/Ji (2.1.0): - - Ji/Ji-libxml - - Ji/Ji-libxml (2.1.0) - - ReadabilityKit (0.7.0): - - Ji + - Ji (5.0.0) + - ReadabilityKit (0.7.1): + - Ji (= 5.0.0) DEPENDENCIES: - ReadabilityKit (from `../`) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Ji + EXTERNAL SOURCES: ReadabilityKit: - :path: ../ + :path: "../" SPEC CHECKSUMS: - Ji: 21946da4e13425485ddd424edfaeeced0d80ad28 - ReadabilityKit: 18382f7abda6cd768e8dd23f7e1fc814f5127944 + Ji: d795fed288fe78658b404c88946d753b17d8d7f4 + ReadabilityKit: 94cdec0266cf09b434829554b01eadaf3ce2862a -PODFILE CHECKSUM: b704b32dddbe11611f701c0548068289c2cc88f4 +PODFILE CHECKSUM: 51d8e36b0be7e9863f061fdd6dd82cb519146085 -COCOAPODS: 1.3.1 +COCOAPODS: 1.7.1 diff --git a/Example/ReadabilityKit.xcodeproj/project.pbxproj b/Example/ReadabilityKit.xcodeproj/project.pbxproj index ec9bb50..70a5768 100644 --- a/Example/ReadabilityKit.xcodeproj/project.pbxproj +++ b/Example/ReadabilityKit.xcodeproj/project.pbxproj @@ -132,7 +132,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, E8845BC4AC6DB6E104C66B77 /* [CP] Embed Pods Frameworks */, - 07BE57630D24C84443D2003E /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -155,7 +154,7 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1020; }; }; }; @@ -164,6 +163,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -191,28 +191,13 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 07BE57630D24C84443D2003E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReadabilityKit_Example/Pods-ReadabilityKit_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; E8845BC4AC6DB6E104C66B77 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-ReadabilityKit_Example/Pods-ReadabilityKit_Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-ReadabilityKit_Example/Pods-ReadabilityKit_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Ji/Ji.framework", "${BUILT_PRODUCTS_DIR}/ReadabilityKit/ReadabilityKit.framework", ); @@ -223,7 +208,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReadabilityKit_Example/Pods-ReadabilityKit_Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReadabilityKit_Example/Pods-ReadabilityKit_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; FF90ED04199015556F2EECBA /* [CP] Check Pods Manifest.lock */ = { @@ -323,6 +308,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -362,6 +348,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -370,14 +357,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 4F4AB35539AF14A978B8F170 /* Pods-ReadabilityKit_Example.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = ReadabilityKit/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -385,14 +372,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 374B5BD1C49566CBDE5FE6AA /* Pods-ReadabilityKit_Example.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = ReadabilityKit/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Example/ReadabilityKit/AppDelegate.swift b/Example/ReadabilityKit/AppDelegate.swift index 7e6f898..1a19dc3 100644 --- a/Example/ReadabilityKit/AppDelegate.swift +++ b/Example/ReadabilityKit/AppDelegate.swift @@ -30,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { return true } diff --git a/ReadabilityKit.podspec b/ReadabilityKit.podspec index 0672c5a..cb0cc30 100644 --- a/ReadabilityKit.podspec +++ b/ReadabilityKit.podspec @@ -14,12 +14,12 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '2.0' s.tvos.deployment_target = '9.0' - s.dependency 'Ji' + s.dependency 'Ji', '5.0.0' s.source_files = [ 'Sources/*.swift', ] - s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' } + s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' } end diff --git a/Sources/Readability+Async.swift b/Sources/Readability+Async.swift index 98a8fe5..d73c13e 100644 --- a/Sources/Readability+Async.swift +++ b/Sources/Readability+Async.swift @@ -24,7 +24,7 @@ // public extension Readability { - public class func parse(data htmlData: Data, completion: @escaping (ReadabilityData?) -> ()) { + class func parse(data htmlData: Data, completion: @escaping (ReadabilityData?) -> ()) { let isMainThread = Thread.isMainThread DispatchQueue.global(qos: .default).async { diff --git a/Sources/Readability+Networking.swift b/Sources/Readability+Networking.swift index 75357e2..51317cb 100644 --- a/Sources/Readability+Networking.swift +++ b/Sources/Readability+Networking.swift @@ -33,7 +33,7 @@ let readabilityUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) Appl public extension Readability { - public class func parse(url: URL, completion: @escaping (ReadabilityData?) -> ()) { + class func parse(url: URL, completion: @escaping (ReadabilityData?) -> ()) { let isMainThread = Thread.isMainThread diff --git a/Sources/Readability+String.swift b/Sources/Readability+String.swift index dc95b87..7287e6f 100644 --- a/Sources/Readability+String.swift +++ b/Sources/Readability+String.swift @@ -25,7 +25,7 @@ public extension Readability { - public class func parse(htmlString: String, completion: @escaping (ReadabilityData?) -> ()) { + class func parse(htmlString: String, completion: @escaping (ReadabilityData?) -> ()) { guard let htmlData = htmlString.data(using: String.Encoding.utf8) else { completion(.none)