Merge branch 'release/1.5.0'

.swift-version

@@ -1 +1 @@
-3.0
+4.0

README.md

@@ -12,7 +12,8 @@
 
 ## Requirements
 - iOS 8.0+, macOS 10.9+, watchOS 2.0+, tvOS 9.0+
-- Swift 3.0
+- Swift 4.0
+- Swift 3.0 ([1.0.6](https://github.com/Kofktu/Sniffer/tree/1.0.6))
 
 ## Example
 To run the example project, clone the repo, and run `pod install` from the Example directory first.

Sniffer.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "Sniffer"
-  s.version      = "1.0.6"
+  s.version      = "1.5.0"
   s.summary      = "Automatic network activity logger for Swift"
   s.homepage     = "https://github.com/Kofktu/Sniffer"
   # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"

Sniffer.xcodeproj/project.pbxproj

@@ -384,7 +384,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -405,7 +405,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.kofktu.Sniffer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -418,7 +418,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kofktu.SnifferTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -431,7 +431,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kofktu.SnifferTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Sniffer/Classes/BodyDeserializer.swift

@@ -39,8 +39,12 @@ public final class JSONBodyDeserializer: BodyDeserializer {
 public final class HTMLBodyDeserializer: BodyDeserializer {
     public func deserialize(body: Data) -> String? {
         do {
-            let attr = NSMutableAttributedString()
-            attr.append(try NSAttributedString(data: body, options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType], documentAttributes: nil))
+            let attr = try NSAttributedString(
+                data: body,
+                options: [NSAttributedString.DocumentReadingOptionKey.documentType : NSAttributedString.DocumentType.html,
+                          NSAttributedString.DocumentReadingOptionKey.characterEncoding: String.Encoding.utf8.rawValue
+                ],
+                documentAttributes: nil)
             return attr.string
         } catch {
             return nil

Sniffer/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.6</string>
+	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>