Merge pull request #154 from ReSwift/release/2.1.0

Release: 2.1.0
ReSwift · Sep 16, 2016 · 4784e3a · 4784e3a
2 parents 0d03c03 + 06f3cc5
commit 4784e3a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 #Upcoming Release
 
+#2.1.0
+
+*Released: 09/15/2016*
+
 **Other**:
 
-- Swift 3 preview compatibility, maintaining Swift 2 naming - (#126) @agentk
-- Migrate Quick/Nimble testing to XCTest - (#127) @agentk
+- Swift 3 preview compatibility, maintaining Swift 2 naming - (#126) - @agentk
+- Xcode 8 GM Swift 3 Updates (#149) - @tkersey
+- Migrate Quick/Nimble testing to XCTest - (#127) - @agentk
+- Automatically build docs via Travis CI (#128) - @agentk
+- Documentation Updates & Fixes	- @mikekavouras, @ColinEberhardt
 
 #2.0.0
 

diff --git a/ReSwift.podspec b/ReSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "ReSwift"
-  s.version          = "2.0.0"
+  s.version          = "2.1.0"
   s.summary          = "Unidirectional Data Flow in Swift"
   s.description      = <<-DESC
                         ReSwift is a Redux-like implementation of the unidirectional data flow architecture in Swift.

diff --git a/ReSwift/Info.plist b/ReSwift/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ReSwiftTests/XCTest+Assertions.swift b/ReSwiftTests/XCTest+Assertions.swift
@@ -43,7 +43,7 @@ public extension XCTestCase {
         }
     }
 
-    // MARK:- Private Methods
+    // MARK: Private Methods
 
     // swiftlint:disable function_parameter_count
     private func expectAssertionNoReturnFunction(
@@ -106,7 +106,7 @@ public extension XCTestCase {
         }
     }
 
-    // MARK:- Private Methods
+    // MARK: Private Methods
 
     // swiftlint:disable function_parameter_count
     private func expectAssertionNoReturnFunction(