Upgrade to Xcode 12, Swift 5 and add support for SPM

.swift-version

@@ -1 +1 @@
-4.0
+5.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode12.0.1
 before_install:
 - gem install xcpretty
 script:

Package.swift

@@ -0,0 +1,37 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Toucan",
+    platforms: [
+        .iOS(.v9), .tvOS(.v9)
+    ],
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "Toucan",
+            targets: ["Toucan"])
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "Toucan",
+            dependencies: [],
+            path: "Sources",
+            exclude: ["Toucan-Info.plist", "tvOS/Toucan.tvOS-Info.plist"]),
+        .testTarget(
+            name: "ToucanTests",
+            dependencies: ["Toucan"],
+            path: "Tests",
+            exclude: ["Info.plist"],
+            resources: [
+                .process("Assets")
+            ])
+    ]
+)

Source/Toucan.swift → Sources/Toucan.swift

@@ -36,18 +36,26 @@ import CoreGraphics
  let resizedAndMaskedImage = Toucan(withImage: myImage).resize(CGSize(width: 100, height: 150)).maskWithEllipse().image
  */
 public class Toucan : NSObject {
-
-    #if swift(>=4.2)
+
     internal typealias ImageOrientation = UIImage.Orientation
-    #else
-    internal typealias ImageOrientation = UIImageOrientation
-    #endif
 
     public var image : UIImage?
 
     public init(image withImage: UIImage) {
         self.image = withImage
     }
+
+    /**
+     Image with the orientation fixed up based on EXF data.
+
+     - parameter image: Source image
+
+     - returns: Image with corrected orientation
+     */
+    public static func imageWithCorrectedOrientation(_ image: UIImage) -> UIImage {
+        let imgRef = Util.CGImageWithCorrectOrientation(image)
+        return UIImage(cgImage: imgRef)
+    }
 
     // MARK: - Resize
 

Tests/ToucanTestCase.swift

@@ -25,21 +25,21 @@ import XCTest
 class ToucanTestCase : XCTestCase {
 
     internal var portraitImage : UIImage {
-        let imageData = try? Data(contentsOf: Bundle(for: ToucanTestCase.self).url(forResource: "Portrait", withExtension: "jpg")!)
+        let imageData = try? Data(contentsOf: Bundle.module.url(forResource: "Portrait", withExtension: "jpg")!)
         let image = UIImage(data: imageData!)
         XCTAssertEqual(image!.size, CGSize(width: 1593, height: 2161), "Verify portrait image size")
         return image!
     }
 
     internal var landscapeImage : UIImage {
-        let imageData = try? Data(contentsOf: Bundle(for: ToucanTestCase.self).url(forResource: "Landscape", withExtension: "jpg")!)
+        let imageData = try? Data(contentsOf: Bundle.module.url(forResource: "Landscape", withExtension: "jpg")!)
         let image = UIImage(data: imageData!)
         XCTAssertEqual(image!.size, CGSize(width: 3872, height: 2592), "Verify landscape image size")
         return image!
     }
 
     internal var maskImage : UIImage {
-        let imageData = try? Data(contentsOf: Bundle(for: ToucanTestCase.self).url(forResource: "OctagonMask", withExtension: "png")!)
+        let imageData = try? Data(contentsOf: Bundle.module.url(forResource: "OctagonMask", withExtension: "png")!)
         let image = UIImage(data: imageData!)
         XCTAssertEqual(image!.size, CGSize(width: 500, height: 500), "Verify mask image size")
         return image!

Toucan.podspec

@@ -8,11 +8,11 @@ Pod::Spec.new do |s|
   s.authors = { 'Gavin Bunney' => 'gavin@bunney.net.au' }
   s.source = { :git => 'https://github.com/gavinbunney/Toucan.git', :tag => s.version }
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
 
   s.source_files = 'Source/*.swift'
-  s.swift_version = '4.0'
+  s.swift_version = '5.0'
 
   s.requires_arc = true
 end