diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/.travis.yml b/.travis.yml index 782ad42..9bad45c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -language: objective-c +language: swift os: osx -osx_image: xcode10 +osx_image: xcode10.2 cache: cocoapods podfile: Example/Podfile before_install: @@ -8,5 +8,5 @@ before_install: - pod repo update - pod install --project-directory=Example script: -- set -o pipefail && xcodebuild clean test -workspace Example/KingfisherWebP.xcworkspace -scheme KingfisherWebP-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.3' | xcpretty +- set -o pipefail && xcodebuild clean test -workspace Example/KingfisherWebP.xcworkspace -scheme KingfisherWebP-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 8,OS=12.2' | xcpretty - pod lib lint --allow-warnings diff --git a/Example/KingfisherWebP.xcodeproj/project.pbxproj b/Example/KingfisherWebP.xcodeproj/project.pbxproj index b51af1a..73acce6 100644 --- a/Example/KingfisherWebP.xcodeproj/project.pbxproj +++ b/Example/KingfisherWebP.xcodeproj/project.pbxproj @@ -249,7 +249,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-KingfisherWebP_Tests/Pods-KingfisherWebP_Tests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-KingfisherWebP_Tests/Pods-KingfisherWebP_Tests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework", "${BUILT_PRODUCTS_DIR}/KingfisherWebP/KingfisherWebP.framework", "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework", @@ -262,7 +262,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-KingfisherWebP_Tests/Pods-KingfisherWebP_Tests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-KingfisherWebP_Tests/Pods-KingfisherWebP_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; E2D6F902231FDD839C3FC5BB /* [CP] Check Pods Manifest.lock */ = { diff --git a/Example/Podfile.lock b/Example/Podfile.lock index a2f10ee..1a507de 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,32 +1,32 @@ PODS: - - Kingfisher (5.0.1) + - Kingfisher (5.5.0) - KingfisherWebP (0.5.0): - Kingfisher (~> 5.0) - libwebp (>= 0.5.0) - - libwebp (1.0.0): - - libwebp/core (= 1.0.0) - - libwebp/dec (= 1.0.0) - - libwebp/demux (= 1.0.0) - - libwebp/dsp (= 1.0.0) - - libwebp/enc (= 1.0.0) - - libwebp/mux (= 1.0.0) - - libwebp/utils (= 1.0.0) - - libwebp/webp (= 1.0.0) - - libwebp/core (1.0.0): + - libwebp (1.0.2): + - libwebp/core (= 1.0.2) + - libwebp/dec (= 1.0.2) + - libwebp/demux (= 1.0.2) + - libwebp/dsp (= 1.0.2) + - libwebp/enc (= 1.0.2) + - libwebp/mux (= 1.0.2) + - libwebp/utils (= 1.0.2) + - libwebp/webp (= 1.0.2) + - libwebp/core (1.0.2): - libwebp/webp - - libwebp/dec (1.0.0): + - libwebp/dec (1.0.2): - libwebp/core - - libwebp/demux (1.0.0): + - libwebp/demux (1.0.2): - libwebp/core - - libwebp/dsp (1.0.0): + - libwebp/dsp (1.0.2): - libwebp/core - - libwebp/enc (1.0.0): + - libwebp/enc (1.0.2): - libwebp/core - - libwebp/mux (1.0.0): + - libwebp/mux (1.0.2): - libwebp/core - - libwebp/utils (1.0.0): + - libwebp/utils (1.0.2): - libwebp/core - - libwebp/webp (1.0.0) + - libwebp/webp (1.0.2) DEPENDENCIES: - KingfisherWebP (from `../`) @@ -41,10 +41,10 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Kingfisher: 4f771421b9208185217550528a06fd48756cb7c2 - KingfisherWebP: eccd2881669c39a26c97c3e12d1565f2588fdaa6 - libwebp: d7e0c95fe97245c97e08101eba10702ebb0f6101 + Kingfisher: 6fe5e67a90fd335e49b0f5c075ff55ac5ebedd94 + KingfisherWebP: 91320aa70790f2810b5e683d22da7c9712080aaf + libwebp: b068a3bd7c45f7460f6715be7bed1a18fd5d6b48 PODFILE CHECKSUM: 912da7ea47a860c96d3fc41cfad2d5c868f105ec -COCOAPODS: 1.5.3 +COCOAPODS: 1.7.0 diff --git a/KingfisherWebP.podspec b/KingfisherWebP.podspec index 0c84f22..96e2120 100644 --- a/KingfisherWebP.podspec +++ b/KingfisherWebP.podspec @@ -1,6 +1,7 @@ Pod::Spec.new do |s| s.name = 'KingfisherWebP' s.version = '0.5.0' + s.swift_version = '5.0' s.summary = 'A Kingfisher extension helping you process webp format' s.description = <<-DESC @@ -8,7 +9,6 @@ KingfisherWebP is an extension of the popular library [Kingfisher](https://githu DESC s.homepage = 'https://github.com/yeatse/KingfisherWebP' - # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'Yang Chao' => 'iyeatse@gmail.com' } s.source = { :git => 'https://github.com/yeatse/KingfisherWebP.git', :tag => s.version.to_s } @@ -16,14 +16,10 @@ KingfisherWebP is an extension of the popular library [Kingfisher](https://githu s.ios.deployment_target = '10.0' s.tvos.deployment_target = '10.0' -# s.osx.deployment_target = '10.12' s.watchos.deployment_target = '3.0' +# s.osx.deployment_target = '10.12' s.source_files = 'KingfisherWebP/Classes/**/*' - s.public_header_files = 'KingfisherWebP/Classes/KingfisherWebP-umbrella.h' - s.private_header_files = 'KingfisherWebP/Classes/CGImage+WebP.h' - s.module_map = 'KingfisherWebP/KingfisherWebP.modulemap' - s.pod_target_xcconfig = { 'USER_HEADER_SEARCH_PATHS' => '$(inherited) $(SRCROOT)/libwebp/src' } @@ -38,11 +34,6 @@ KingfisherWebP is an extension of the popular library [Kingfisher](https://githu 'USER_HEADER_SEARCH_PATHS' => '$(inherited) $(SRCROOT)/libwebp/src' } - #s.osx.exclude_files = # None - #s.watchos.exclude_files = # None - #s.ios.exclude_files = # None - #s.tvos.exclude_files = # None - s.dependency 'Kingfisher', '~> 5.0' s.dependency 'libwebp', '>= 0.5.0' diff --git a/KingfisherWebP/Classes/Image+WebP.swift b/KingfisherWebP/Classes/Image+WebP.swift index cc87578..ed61c19 100644 --- a/KingfisherWebP/Classes/Image+WebP.swift +++ b/KingfisherWebP/Classes/Image+WebP.swift @@ -7,7 +7,6 @@ // import Kingfisher -import KingfisherWebP.Private import CoreGraphics // MARK: - Image Representation diff --git a/KingfisherWebP/Classes/KingfisherWebP-umbrella.h b/KingfisherWebP/Classes/KingfisherWebP-umbrella.h deleted file mode 100644 index de4edd4..0000000 --- a/KingfisherWebP/Classes/KingfisherWebP-umbrella.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef FOUNDATION_EXPORT - #if defined(__cplusplus) - #define FOUNDATION_EXPORT extern "C" - #else - #define FOUNDATION_EXPORT extern - #endif -#endif - -FOUNDATION_EXPORT double KingfisherWebPVersionNumber; -FOUNDATION_EXPORT const unsigned char KingfisherWebPVersionString[]; -