Merge pull request #27 from Yeatse/feature/modular_headers

Make CG functions public & remove custom modular headers

.travis.yml

@@ -1,12 +1,12 @@
-language: objective-c
+language: swift
 os: osx
-osx_image: xcode10
+osx_image: xcode10.2
 cache: cocoapods
 podfile: Example/Podfile
 before_install:
 - gem install cocoapods # Since Travis is not always on latest version
 - 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

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 */ = {

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

KingfisherWebP.podspec

@@ -1,29 +1,25 @@
 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
 KingfisherWebP is an extension of the popular library [Kingfisher](https://github.com/onevcat/Kingfisher), providing a ImageProcessor and CacheSerializer for you to conveniently handle the WebP format.
                        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' => '[email protected]' }
   s.source           = { :git => 'https://github.com/yeatse/KingfisherWebP.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/yeatse'
 
   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'
 

KingfisherWebP/Classes/Image+WebP.swift

@@ -7,7 +7,6 @@
 //
 
 import Kingfisher
-import KingfisherWebP.Private
 import CoreGraphics
 
 // MARK: - Image Representation