Merge pull request #42 from SlaunchaMan/swift-4.2

Update to Swift 4.2

Author: SlaunchaMan

.swift-version

@@ -1 +1 @@
-4.1
+4.2

.travis.yml

@@ -3,7 +3,7 @@ branches:
     - develop
     - master
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10
 notifications:
   slack:
     rooms:

BugShaker.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |spec|
   spec.name              = 'BugShaker'
-  spec.version           = '0.4.1'
+  spec.version           = '0.5.0'
   spec.license           = { :type => 'Apache 2.0' }
   spec.homepage          = 'https://github.com/dtrenz/BugShaker'
   spec.documentation_url = 'http://dtrenz.github.io/BugShaker/'
   spec.authors           = { 'Dan Trenz' => 'dtrenz@gmail.com' }
   spec.summary           = 'Shake to submit a bug report (w/ screenshot) via email.'
   spec.source            = { :git => 'https://github.com/dtrenz/BugShaker.git', :tag => spec.version.to_s }
   spec.source_files      = 'Sources/*.swift'
-  spec.swift_version     = '4.1'
+  spec.swift_version     = '4.2'
   spec.platform          = :ios, '9.0'
   spec.frameworks        = 'UIKit', 'MessageUI'
   spec.requires_arc      = true

BugShaker.xcodeproj/project.pbxproj

@@ -196,12 +196,12 @@
 					C51FD83F1DCBADE700FC21FC = {
 						CreatedOnToolsVersion = 8.1;
 						DevelopmentTeam = 69MZ6T95LT;
-						LastSwiftMigration = 0940;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					C52820F71CA43D40003EA0D4 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0940;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -325,7 +325,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.detroitlabs.BugShakerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -342,7 +342,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.detroitlabs.BugShakerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -480,7 +480,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -501,7 +501,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.dtrenz.BugShaker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - Nimble (7.1.3)
-  - Quick (1.3.1)
+  - Nimble (7.3.1)
+  - Quick (1.3.2)
 
 DEPENDENCIES:
   - Nimble
@@ -12,8 +12,8 @@ SPEC REPOS:
     - Quick
 
 SPEC CHECKSUMS:
-  Nimble: 2839b01d1b31f6a6a7777a221f0d91cf52e8e27b
-  Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
+  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
+  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
 
 PODFILE CHECKSUM: 670d452da847b95b324bec94807b831678d715b0
 

Sources/BugShaker.swift

@@ -46,7 +46,7 @@ extension UIViewController: MFMailComposeViewControllerDelegate {
         return true
     }
 
-    override open func motionEnded(_ motion: UIEventSubtype, with event: UIEvent?) {
+    override open func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
         guard BugShaker.isEnabled && motion == .motionShake else { return }
 
         let cachedScreenshot = captureScreenshot()
@@ -59,7 +59,7 @@ extension UIViewController: MFMailComposeViewControllerDelegate {
     // MARK: - Alert
 
     @objc func presentReportPrompt(_ reportActionHandler: @escaping (UIAlertAction) -> Void) {
-        let preferredStyle: UIAlertControllerStyle
+        let preferredStyle: UIAlertController.Style
 
         if UIDevice.current.userInterfaceIdiom == .pad {
             preferredStyle = .alert
@@ -124,7 +124,7 @@ extension UIViewController: MFMailComposeViewControllerDelegate {
             mailComposer.setMessageBody(BugShaker.Config.body ?? "", isHTML: false)
             mailComposer.mailComposeDelegate = self
 
-            if let screenshot = screenshot, let screenshotJPEG = UIImageJPEGRepresentation(screenshot, CGFloat(1.0)) {
+            if let screenshot = screenshot, let screenshotJPEG = screenshot.jpegData(compressionQuality: CGFloat(1.0)) {
                 mailComposer.addAttachmentData(screenshotJPEG, mimeType: "image/jpeg", fileName: "screenshot.jpeg")
             }
 

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1</string>
+	<string>0.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>