Release 6.1.0 (#475)

* trim whitespace in changelog

* update changelog for 6.1.0

* bump Xcode marketing version

* update pod version

* denote Swift 5.4/5.3 support in podfile

* update travis to use Xcode 12.5 by default

* specify Travis iOS target more clearly

.travis.yml

@@ -5,7 +5,7 @@ branches:
     - gh-pages
 
 before_install:
-  - gem install cocoapods -v '1.9.3'
+  - gem install cocoapods -v '1.10.1'
 
 install:
   - gem install xcpretty
@@ -24,14 +24,16 @@ matrix:
     - osx_image: xcode11.6
       env: SCHEME="macOS"    SDK="macosx10.15"        DESTINATION="arch=x86_64"                    SWIFT_VERSION="5.0" ACTION="test"
     - osx_image: xcode12
-      env: SCHEME="iOS"      SDK="iphonesimulator"    DESTINATION="OS=14.0,name=iPhone 11 Pro Max" SWIFT_VERSION="5.2" ACTION="test"
-    - osx_image: xcode12
-      env: SCHEME="watchOS"  SDK="watchsimulator"     DESTINATION="OS=7.0,name=Apple Watch Series 6 - 44mm" SWIFT_VERSION="5.2" ACTION="build"
-    - osx_image: xcode12
-      env: SCHEME="tvOS"     SDK="appletvsimulator"   DESTINATION="OS=14.0,name=Apple TV 4K"       SWIFT_VERSION="5.2" ACTION="test"
-    - osx_image: xcode12
-      env: SCHEME="macOS"    SDK="macosx10.15"        DESTINATION="arch=x86_64"                    SWIFT_VERSION="5.2" ACTION="test"
-    - osx_image: xcode12
+      env: SCHEME="macOS"    SDK="macosx10.15"        DESTINATION="arch=x86_64"                    SWIFT_VERSION="5.0" ACTION="test"
+    - osx_image: xcode12.5
+      env: SCHEME="iOS"      SDK="iphonesimulator"    DESTINATION="platform=iOS Simulator,OS=14.5,name=iPhone 12 Pro Max" SWIFT_VERSION="5.4" ACTION="test"
+    - osx_image: xcode12.5
+      env: SCHEME="watchOS"  SDK="watchsimulator"     DESTINATION="OS=7.0,name=Apple Watch Series 6 - 44mm" SWIFT_VERSION="5.4" ACTION="build"
+    - osx_image: xcode12.5
+      env: SCHEME="tvOS"     SDK="appletvsimulator"   DESTINATION="OS=14.0,name=Apple TV 4K"       SWIFT_VERSION="5.4" ACTION="test"
+    - osx_image: xcode12.5
+      env: SCHEME="macOS"    SDK="macosx11.3"        DESTINATION="arch=x86_64"                    SWIFT_VERSION="5.4" ACTION="test"
+    - osx_image: xcode12.5
       env: TEST_SWIFTPM="true" POD_LINT="YES"
 
 script:

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 **Breaking API Changes:**
 
+**API Changes:**
+
+**Other:**
+
+# 6.1.0
+
+*Released: 2021-05-09*
+
 **API Changes:**
 - Deprecate `StateType` protocol requirement (#462) - @mjarvis
 
@@ -26,11 +34,11 @@
 
 # 5.0.0
 
-*Released: 2019-06-30* 
+*Released: 2019-06-30*
 
 **Breaking API Changes:**
 - Remove `StandardAction` and `StandardActionConvertible` (#270) - @mjarvis
-    
+
     - The existence of `StandardAction` and `StandardActionConvertible` is somewhat confusing to new users, and does not have a direct use case within the core ReSwift library. Therefore, it has been moved to [ReSwift-Recorder](https://github.com/ReSwift/ReSwift-Recorder) where it belongs.
     - If you're using `StandardAction` in your project without `ReSwift-Recorder`, you can copy the old implementation into your project as a middle ground while you migrate away from its usage.
 
@@ -55,7 +63,7 @@
 
 **API Changes:**
 - Deprecate `StandardAction` and `StandardActionConvertible` - @mjarvis
-    
+
     - These have been moved to https://github.com/ReSwift/ReSwift-Recorder since they are unnecessary for the base use of ReSwift
 
 - Deprecate `ActionCreator` and `AsyncActionCreator` (#391) - @mjarvis

ReSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "ReSwift"
-  s.version          = "6.0.0"
+  s.version          = "6.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.
@@ -28,5 +28,5 @@ Pod::Spec.new do |s|
 
   s.requires_arc     = true
   s.source_files     = 'ReSwift/**/*.swift'
-  s.swift_versions   = [ "5.2", "5.0", "4.2" ]
+  s.swift_versions   = [ "5.4", "5.3", "5.2", "5.0", "4.2" ]
 end

ReSwift.xcodeproj/project.pbxproj

@@ -1118,6 +1118,7 @@
 				INFOPLIST_FILE = ReSwift/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MARKETING_VERSION = 6.1.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = reswift.github.io.ReSwift;
@@ -1181,6 +1182,7 @@
 				INFOPLIST_FILE = ReSwift/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MARKETING_VERSION = 6.1.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = reswift.github.io.ReSwift;
 				PRODUCT_NAME = ReSwift;

ReSwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>