Merge branch 'master' into master

Author: wokalski

Diff.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Diff"
-  s.version      = "0.5.1"
+  s.version      = "0.5.2"
   s.summary      = "The fastest Diff library in Swift. Includes UICollectionView/UITableView utils."
   s.homepage     = "https://github.com/wokalski/Diff.swift"
   s.description  = <<-DESC
@@ -16,7 +16,7 @@ This library generates differences between any two Collections (and Strings). It
   s.osx.exclude_files = "Sources/Diff+UIKit.swift"
   s.watchos.exclude_files = "Sources/Diff+UIKit.swift"
 
-  s.source       = { :git => "https://github.com/wokalski/Diff.swift.git", :tag => "0.5.1" }
+  s.source       = { :git => "https://github.com/wokalski/Diff.swift.git", :tag => "0.5.2" }
 
   s.source_files  = "Sources"
 end

Diff.xcodeproj/project.pbxproj

@@ -295,6 +295,7 @@
 			baseConfigurationReference = 900E03AF1DE7F1E80033A799 /* Deployment-Targets.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -347,6 +348,7 @@
 			baseConfigurationReference = 900E03AF1DE7F1E80033A799 /* Deployment-Targets.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

Framework/Info.plist

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

Sources/Diff.swift

@@ -2,7 +2,13 @@
 public protocol DiffProtocol: Collection, Sequence {
 
     associatedtype DiffElementType
+
+    #if swift(>=3.1)
+    // The typealias is causing crashes in SourceKitService under Swift 3.1 snapshots.
+    #else
+    // TODO: Verify that the typealias workaround is still required when Xcode 8.3 is released.
     typealias Index = Int
+    #endif
 
     var elements: [DiffElementType] { get }
 }

Sources/NestedExtendedDiff.swift

@@ -24,7 +24,7 @@ public struct NestedExtendedDiff: DiffProtocol {
     public let elements: [Element]
 }
 
-typealias NestedElementEqualityChecker<T: Collection> = (T.Iterator.Element.Iterator.Element, T.Iterator.Element.Iterator.Element) -> Bool where T.Iterator.Element: Collection
+public typealias NestedElementEqualityChecker<T: Collection> = (T.Iterator.Element.Iterator.Element, T.Iterator.Element.Iterator.Element) -> Bool where T.Iterator.Element: Collection
 
 public extension Collection
     where Iterator.Element: Collection {