Merge branch 'xcode11' into swiftui-support

# Conflicts:
#	.travis.yml
#	Demo/Kingfisher-Demo.xcodeproj/project.pbxproj
#	Kingfisher.xcodeproj/project.pbxproj
#	Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-macOS.xcscheme
#	Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-tvOS.xcscheme
#	Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher-watchOS.xcscheme
#	Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme

.travis.yml

@@ -1,25 +1,34 @@
 language: swift
 
 osx_image: 
-- xcode10.2
-- xcode11
+- xcode10.1
+- xcode10.3
 
 env:
-- SCHEME=Kingfisher SWIFT_VERSION=5.0
-- SCHEME=Kingfisher-macOS SWIFT_VERSION=5.0
-- SCHEME=Kingfisher-tvOS SWIFT_VERSION=5.0
-- SCHEME=Kingfisher SWIFT_VERSION=4.2
-- SCHEME=Kingfisher-macOS SWIFT_VERSION=4.2
-- SCHEME=Kingfisher-tvOS SWIFT_VERSION=4.2
-- SCHEME=Kingfisher SWIFT_VERSION=4.0
-- SCHEME=Kingfisher-macOS SWIFT_VERSION=4.0
-- SCHEME=Kingfisher-tvOS SWIFT_VERSION=4.0
+- DESTINATION='platform=macOS' SWIFT_VERSION=5.0
+- DESTINATION='platform=iOS Simulator,name=iPhone 8' SWIFT_VERSION=5.0
+- DESTINATION='platform=tvOS Simulator,name=Apple TV' SWIFT_VERSION=5.0
+- DESTINATION='platform=macOS' SWIFT_VERSION=4.2
+- DESTINATION='platform=iOS Simulator,name=iPhone 8' SWIFT_VERSION=4.2
+- DESTINATION='platform=tvOS Simulator,name=Apple TV' SWIFT_VERSION=4.2
+- DESTINATION='platform=macOS' SWIFT_VERSION=4.0
+- DESTINATION='platform=iOS Simulator,name=iPhone 8' SWIFT_VERSION=4.0
+- DESTINATION='platform=tvOS Simulator,name=Apple TV' SWIFT_VERSION=4.0
 
 cache: bundler
 
 before_install:
   - gem update --system
   - gem install bundler
 
+matrix:
+  exclude:
+  - osx_image: xcode10.1
+    env: DESTINATION='platform=macOS' SWIFT_VERSION=5.0
+  - osx_image: xcode10.1
+    env: DESTINATION='platform=iOS Simulator,name=iPhone 8' SWIFT_VERSION=5.0
+  - osx_image: xcode10.1
+    env: DESTINATION='platform=tvOS Simulator,name=Apple TV' SWIFT_VERSION=5.0
+
 script:
   - bundle exec fastlane test_ci

Kingfisher.podspec

@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.license      = { :type => "MIT", :file => "LICENSE" }
 
   s.authors            = { "onevcat" => "[email protected]" }
-  s.social_media_url   = "http://twitter.com/onevcat"
+  s.social_media_url   = "https://twitter.com/onevcat"
 
   s.swift_version = "4.2"
   s.swift_versions = ['4.0', '4.2', '5.0']
@@ -37,29 +37,7 @@ Pod::Spec.new do |s|
 
   s.source_files  = ["Sources/**/*.swift", "Sources/Kingfisher.h"]
   s.public_header_files = ["Sources/Kingfisher.h"]
-
-  s.osx.exclude_files = [
-      "Sources/Views/AnimatedImageView.swift", 
-      "Sources/Extensions/UIButton+Kingfisher.swift", 
-      "Sources/Extensions/WKInterfaceImage+Kingfisher.swift"
-    ]
-  s.watchos.exclude_files = [
-      "Sources/Views/AnimatedImageView.swift", 
-      "Sources/Extensions/UIButton+Kingfisher.swift", 
-      "Sources/Extensions/ImageView+Kingfisher.swift", 
-      "Sources/Extensions/NSButton+Kingfisher.swift", 
-      "Sources/Views/Indicator.swift", 
-      "Sources/Image/Filter.swift",
-      "Sources/Image/Placeholder.swift"
-    ]
-  s.ios.exclude_files = [
-      "Sources/Extensions/NSButton+Kingfisher.swift", 
-      "Sources/Extensions/WKInterfaceImage+Kingfisher.swift"
-    ]
-  s.tvos.exclude_files = [
-      "Sources/Extensions/NSButton+Kingfisher.swift", 
-      "Sources/Extensions/WKInterfaceImage+Kingfisher.swift"
-    ]
+
   s.requires_arc = true
   s.frameworks = "CFNetwork", "Accelerate"
 

Kingfisher.xcodeproj/xcshareddata/xcschemes/Kingfisher.xcscheme

@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D1ED2D341AD2D09F00CFC3EB"
                BuildableName = "Kingfisher.framework"
-               BlueprintName = "Kingfisher-iOS"
+               BlueprintName = "Kingfisher"
                ReferencedContainer = "container:Kingfisher.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,7 +33,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D1ED2D341AD2D09F00CFC3EB"
             BuildableName = "Kingfisher.framework"
-            BlueprintName = "Kingfisher-iOS"
+            BlueprintName = "Kingfisher"
             ReferencedContainer = "container:Kingfisher.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -66,7 +66,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D1ED2D341AD2D09F00CFC3EB"
             BuildableName = "Kingfisher.framework"
-            BlueprintName = "Kingfisher-iOS"
+            BlueprintName = "Kingfisher"
             ReferencedContainer = "container:Kingfisher.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -82,7 +82,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D1ED2D341AD2D09F00CFC3EB"
             BuildableName = "Kingfisher.framework"
-            BlueprintName = "Kingfisher-iOS"
+            BlueprintName = "Kingfisher"
             ReferencedContainer = "container:Kingfisher.xcodeproj">
          </BuildableReference>
       </MacroExpansion>