From f3658f614e213256761c1f61355edc280b08c235 Mon Sep 17 00:00:00 2001
From: Christian Tietze <me@christiantietze.de>
Date: Fri, 20 Aug 2021 07:26:11 +0200
Subject: [PATCH] remove obsolete StateType requirements (#48)

* remove obsolete StateType requirements

* add line to changelog

* pin ReSwift requirement to 6.1.0

* use ReSwift 6.1.0 in Cartfile
---
 CHANGELOG.md                              | 2 ++
 Cartfile                                  | 4 +++-
 Cartfile.resolved                         | 2 +-
 Package.swift                             | 2 +-
 ReSwift-Thunk/createThunkMiddleware.swift | 4 ++--
 ReSwift-ThunkTests/ExpectThunk.swift      | 2 +-
 ReSwift-ThunkTests/Tests.swift            | 2 +-
 ReSwiftThunk.podspec                      | 5 +++--
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42ddb55..87f3d3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 **API Changes:**
 
+- Remove deprecated `StateType` protocol requirement (#48) - @DivineDominion, @mjarvis
+
 **Fixes:**
 
 # 2.0.1
diff --git a/Cartfile b/Cartfile
index 1166681..d4c451f 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1 +1,3 @@
-github "ReSwift/ReSwift" ~> 6.0.0
+# github "ReSwift/ReSwift" ~> 6.1.0
+# Use master until new version is ready
+github "ReSwift/ReSwift" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index d893c71..91f4378 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "ReSwift/ReSwift" "6.0.0"
+github "ReSwift/ReSwift" "95b81b75f26d467bb624939a92189b1bae3e7b27"
diff --git a/Package.swift b/Package.swift
index 8e1d5b5..66c8116 100644
--- a/Package.swift
+++ b/Package.swift
@@ -9,7 +9,7 @@ let package = Package(
       .library(name: "ReSwiftThunkTesting", targets: ["ReSwiftThunkTesting"])
     ],
     dependencies: [
-      .package(url: "https://github.com/ReSwift/ReSwift", .upToNextMajor(from: "6.0.0"))
+      .package(url: "https://github.com/ReSwift/ReSwift", .upToNextMajor(from: "6.1.0"))
     ],
     targets: [
       .target(
diff --git a/ReSwift-Thunk/createThunkMiddleware.swift b/ReSwift-Thunk/createThunkMiddleware.swift
index 885cbde..9e21b24 100644
--- a/ReSwift-Thunk/createThunkMiddleware.swift
+++ b/ReSwift-Thunk/createThunkMiddleware.swift
@@ -26,12 +26,12 @@ public func createThunkMiddleware<State>() -> Middleware<State> {
 
 // swiftlint:disable identifier_name
 @available(*, deprecated, renamed: "createThunkMiddleware")
-func ThunkMiddleware<State: StateType>() -> Middleware<State> {
+func ThunkMiddleware<State>() -> Middleware<State> {
     return createThunkMiddleware()
 }
 // swiftlint:enable identifier_name
 
 @available(*, deprecated, renamed: "createThunkMiddleware")
-func createThunksMiddleware<State: StateType>() -> Middleware<State> {
+func createThunksMiddleware<State>() -> Middleware<State> {
     return createThunkMiddleware()
 }
diff --git a/ReSwift-ThunkTests/ExpectThunk.swift b/ReSwift-ThunkTests/ExpectThunk.swift
index 40cfad5..d1a20b8 100644
--- a/ReSwift-ThunkTests/ExpectThunk.swift
+++ b/ReSwift-ThunkTests/ExpectThunk.swift
@@ -28,7 +28,7 @@ private struct ExpectThunkAssertion<T> {
     }
 }
 
-public class ExpectThunk<State: StateType> {
+public class ExpectThunk<State> {
     private var dispatch: DispatchFunction {
         return { action in
             self.dispatched.append(action)
diff --git a/ReSwift-ThunkTests/Tests.swift b/ReSwift-ThunkTests/Tests.swift
index c73a31e..4111b60 100644
--- a/ReSwift-ThunkTests/Tests.swift
+++ b/ReSwift-ThunkTests/Tests.swift
@@ -11,7 +11,7 @@ import XCTest
 
 import ReSwift
 
-private struct FakeState: StateType {}
+private struct FakeState {}
 private struct FakeAction: Action {}
 private struct AnotherFakeAction: Action, Equatable {}
 private func fakeReducer(action: Action, state: FakeState?) -> FakeState {
diff --git a/ReSwiftThunk.podspec b/ReSwiftThunk.podspec
index 969eb8a..81e97ce 100644
--- a/ReSwiftThunk.podspec
+++ b/ReSwiftThunk.podspec
@@ -1,6 +1,7 @@
+
 Pod::Spec.new do |spec|
   spec.name         = "ReSwiftThunk"
-  spec.version      = "2.0.1"
+  spec.version      = "2.1.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.
@@ -37,5 +38,5 @@ Pod::Spec.new do |spec|
 
   spec.default_subspec = "Core"
 
-  spec.dependency "ReSwift", "~> 6.0"
+  spec.dependency "ReSwift", "~> 6.1"
 end