Bump ReSwift dependency to 6.0.0

.travis.yml

@@ -8,25 +8,23 @@ env:
 
 matrix:
   include:
-    - osx_image: xcode9.3
-      env: SCHEME="macOS"  SDK="macosx10.13"          DESTINATION="arch=x86_64"                    SWIFT_VERSION="4.1" ACTION="test"
     - osx_image: xcode10.1
       env: SCHEME="macOS"  SDK="macosx10.14"          DESTINATION="arch=x86_64"                    SWIFT_VERSION="4.2" ACTION="test"
-    - osx_image: xcode10.2
-      env: SCHEME="macOS"  SDK="macosx10.14"          DESTINATION="arch=x86_64"                    SWIFT_VERSION="5.0" ACTION="test" POD_LINT="YES"
-    - osx_image: xcode10.2
-      env: SCHEME="iOS"    SDK="iphonesimulator"      DESTINATION="OS=12.0,name=iPhone 8"          SWIFT_VERSION="5.0" ACTION="test"
-    - osx_image: xcode10.2
-      env: SCHEME="tvOS"   SDK="appletvsimulator"     DESTINATION="OS=12.0,name=Apple TV 4K"       SWIFT_VERSION="5.0" ACTION="test"
-    - osx_image: xcode10.2
-      env: SCHEME="watchOS"  SDK="watchsimulator"     DESTINATION="OS=4.0,name=Apple Watch - 42mm" SWIFT_VERSION="5.0" ACTION="build"
+    - osx_image: xcode12
+      env: SCHEME="macOS"  SDK="macosx10.15"          DESTINATION="arch=x86_64"                    SWIFT_VERSION="5.3" ACTION="test" POD_LINT="YES"
+    - osx_image: xcode12
+      env: SCHEME="iOS"    SDK="iphonesimulator"      DESTINATION="OS=14.0,name=iPhone 11"         SWIFT_VERSION="5.3" ACTION="test"
+    - osx_image: xcode12
+      env: SCHEME="tvOS"   SDK="appletvsimulator"     DESTINATION="OS=14.0,name=Apple TV 4K"       SWIFT_VERSION="5.3" ACTION="test"
+    - osx_image: xcode12
+      env: SCHEME="watchOS"  SDK="watchsimulator"     DESTINATION="OS=7.0,name=Apple Watch Series 6 - 44mm" SWIFT_VERSION="5.3" ACTION="build"
 
 before_install:
   - if [ $POD_LINT == "YES" ]; then
       gem install cocoapods -v '1.7.5';
       pod repo update;
     fi
-  - carthage bootstrap --platform "$SCHEME" --verbose
+  - ./carthage.sh bootstrap --platform "$SCHEME" --verbose
 
 install:
   - gem install xcpretty

CHANGELOG.md

@@ -6,11 +6,15 @@
 
 **Fixes:**
 
-**Other:**
-- Rename SwiftPM library to `ReSwiftThunk`, this makes naming consistent across all package manager (Cocoapods, Carthage and SwiftPM)
+# 2.0.0
 
+**Breaking API Changes:**
+- Drop support for Swift 3.2, 4.0, and 4.1. (#45) - @shawnkoh, @mjarvis
+- Drop support for iOS 8 (#45) - @shawnkoh, @mjarvis
 
-- `ExpectThunk`'s methods `dispatches` and `getsState` no longer have `@discardableResult` return values
+**Other:**
+- Rename SwiftPM library to `ReSwiftThunk`, this makes naming consistent across all package manager (Cocoapods, Carthage and SwiftPM) (#42) - @jookes
+- `ExpectThunk`'s methods `dispatches` and `getsState` no longer have `@discardableResult` return values (#40) - @xavierLowmiller
 
 # 1.2.0
 

Cartfile

@@ -1 +1 @@
-github "ReSwift/ReSwift" ~> 5.0.0
+github "ReSwift/ReSwift" ~> 6.0.0

Cartfile.resolved

@@ -1 +1 @@
-github "ReSwift/ReSwift" "5.0.0"
+github "ReSwift/ReSwift" "6.0.0"

Package.swift

@@ -8,7 +8,7 @@ let package = Package(
       .library(name: "ReSwiftThunk", targets: ["ReSwiftThunk"])
     ],
     dependencies: [
-      .package(url: "https://github.com/ReSwift/ReSwift", .upToNextMajor(from: "5.0.0"))
+      .package(url: "https://github.com/ReSwift/ReSwift", .upToNextMajor(from: "6.0.0"))
     ],
     targets: [
       .target(

README.md

@@ -6,7 +6,7 @@
 [![Platform support](https://img.shields.io/badge/platform-ios%20%7C%20osx%20%7C%20tvos%20%7C%20watchos-lightgrey.svg?style=flat-square)](https://github.com/ReSwift/ReSwift-Thunk/blob/master/LICENSE.md)
 [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/ReSwift/ReSwift-Thunk/blob/master/LICENSE.md) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg?style=flat-square)](https://houndci.com)
 
-**Supported Swift Versions:** Swift 4.1, Swift 4.2, Swift 5.0
+**Supported Swift Versions:** Swift 4.2, Swift 5.0, Swift 5.3
 
 When [ReSwift](https://github.com/ReSwift/ReSwift/) is a [Redux](https://github.com/reactjs/redux)-like implementation of the unidirectional data flow architecture in Swift, ReSwift-Thunk is like [redux-thunk](https://github.com/reduxjs/redux-thunk). 
 

ReSwift-Thunk.xcodeproj/project.pbxproj

@@ -168,15 +168,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = ReSwift;
 				TargetAttributes = {
 					65A3D6D4218B89A60075CB92 = {
 						CreatedOnToolsVersion = 10.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1200;
 					};
 					65A3D6DD218B89A60075CB92 = {
 						CreatedOnToolsVersion = 10.0;
+						LastSwiftMigration = 1200;
 					};
 				};
 			};
@@ -186,6 +187,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 65A3D6CB218B89A60075CB92;
 			productRefGroup = 65A3D6D6218B89A60075CB92 /* Products */;
@@ -271,6 +273,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -303,7 +306,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -347,6 +350,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -373,7 +377,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -404,7 +408,6 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "ReSwift-Thunk/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -415,7 +418,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -432,7 +435,6 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "ReSwift-Thunk/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -442,7 +444,7 @@
 				PRODUCT_NAME = ReSwiftThunk;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -465,7 +467,7 @@
 				OTHER_SWIFT_FLAGS = "-D RESWIFT_THUNKTESTS";
 				PRODUCT_BUNDLE_IDENTIFIER = "reswift.github.io.ReSwift-ThunkTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -488,7 +490,7 @@
 				OTHER_SWIFT_FLAGS = "-D RESWIFT_THUNKTESTS";
 				PRODUCT_BUNDLE_IDENTIFIER = "reswift.github.io.ReSwift-ThunkTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

ReSwift-Thunk.xcodeproj/xcshareddata/xcschemes/ReSwift-Thunk.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
+            BuildableName = "ReSwiftThunk.framework"
+            BlueprintName = "ReSwift-Thunk"
+            ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
-            BuildableName = "ReSwiftThunk.framework"
-            BlueprintName = "ReSwift-Thunk"
-            ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ReSwift-Thunk/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

ReSwiftThunk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "ReSwiftThunk"
-  spec.version      = "1.2.0"
+  spec.version      = "2.0.0"
   spec.summary      = "Thunk middleware for ReSwift."
   spec.description  = <<-DESC
                       ReSwift-Thunk allows you to write action creators that return a function instead of an action. Instead of dispatching an `Action` directly, you can dispatch a `Thunk` that creates an action at a later time, for example after a network request finishes.
@@ -10,13 +10,13 @@ Pod::Spec.new do |spec|
   spec.license      = { :type => "MIT", :file => "LICENSE.md" }
   spec.authors      = "ReSwift"
 
-  spec.ios.deployment_target = "8.0"
+  spec.ios.deployment_target = "9.0"
   spec.osx.deployment_target = "10.10"
   spec.watchos.deployment_target = "2.0"
   spec.tvos.deployment_target = "9.0"
 
   spec.module_name  = "ReSwiftThunk"
-  spec.swift_versions = ["5.0", "4.2", "4.1"]
+  spec.swift_versions = ["5.2", "5.0", "4.2"]
   spec.source = {
     :git => "https://github.com/ReSwift/ReSwift-Thunk.git",
     :tag => spec.version.to_s }
@@ -26,7 +26,7 @@ Pod::Spec.new do |spec|
   end
 
   spec.subspec "ExpectThunk" do |sp|
-    sp.ios.deployment_target = "8.0"
+    sp.ios.deployment_target = "9.0"
     sp.osx.deployment_target = "10.10"
     sp.tvos.deployment_target = "9.0"
     sp.dependency "ReSwiftThunk/Core"
@@ -37,5 +37,5 @@ Pod::Spec.new do |spec|
 
   spec.default_subspec = "Core"
 
-  spec.dependency "ReSwift", "~> 5.0"
+  spec.dependency "ReSwift", "~> 6.0"
 end

carthage.sh

@@ -0,0 +1,19 @@
+# carthage.sh
+# Usage example: ./carthage.sh build --platform iOS
+
+set -euo pipefail
+
+xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+
+# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+# the build will fail on lipo due to duplicate architectures.
+
+CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
+echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig
+
+echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig
+echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+
+export XCODE_XCCONFIG_FILE="$xcconfig"
+carthage "$@"