Skip to content

Commit 7fb200a

Browse files
author
Thibault Wittemberg
committed
project: bump to version 0.19.0
1 parent f41829c commit 7fb200a

File tree

5 files changed

+25
-118
lines changed

5 files changed

+25
-118
lines changed

Spin.SwiftUI.Demo.xcodeproj/project.pbxproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
7462043E24566F4700BBB9C4 /* RxSwiftTrendingRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7462043C24566F4700BBB9C4 /* RxSwiftTrendingRowView.swift */; };
6868
7462043F24566F4700BBB9C4 /* RxSwiftTrendingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7462043D24566F4700BBB9C4 /* RxSwiftTrendingView.swift */; };
6969
7464BA6223BE260800ACA419 /* ReactiveSwiftTrendingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7464BA6123BE260800ACA419 /* ReactiveSwiftTrendingView.swift */; };
70-
7464BA8223BE2FAD00ACA419 /* FeedbackAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7464BA8123BE2FAD00ACA419 /* FeedbackAssembly.swift */; };
7170
7464BAA523BE302E00ACA419 /* FeatureAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7464BAA423BE302E00ACA419 /* FeatureAssembly.swift */; };
7271
7472AE8C2458E8070094FC1B /* PlayerUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472AE8B2458E8070094FC1B /* PlayerUIView.swift */; };
7372
7472AE8E2458E9450094FC1B /* PlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472AE8D2458E9450094FC1B /* PlayerView.swift */; };
@@ -139,7 +138,6 @@
139138
7462043C24566F4700BBB9C4 /* RxSwiftTrendingRowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxSwiftTrendingRowView.swift; sourceTree = "<group>"; };
140139
7462043D24566F4700BBB9C4 /* RxSwiftTrendingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxSwiftTrendingView.swift; sourceTree = "<group>"; };
141140
7464BA6123BE260800ACA419 /* ReactiveSwiftTrendingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactiveSwiftTrendingView.swift; sourceTree = "<group>"; };
142-
7464BA8123BE2FAD00ACA419 /* FeedbackAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbackAssembly.swift; sourceTree = "<group>"; };
143141
7464BAA423BE302E00ACA419 /* FeatureAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureAssembly.swift; sourceTree = "<group>"; };
144142
7472AE8B2458E8070094FC1B /* PlayerUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerUIView.swift; sourceTree = "<group>"; };
145143
7472AE8D2458E9450094FC1B /* PlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerView.swift; sourceTree = "<group>"; };
@@ -323,7 +321,6 @@
323321
743BE5CA23BD7CC9000BE177 /* ServiceAssembly.swift */,
324322
743BE5CC23BD7CC9000BE177 /* ApisAssembly.swift */,
325323
743BE5CF23BD7CC9000BE177 /* EntityAssembly.swift */,
326-
7464BA8123BE2FAD00ACA419 /* FeedbackAssembly.swift */,
327324
74EDF15223F0BB760036EC4E /* SpinAssembly.swift */,
328325
7464BAA423BE302E00ACA419 /* FeatureAssembly.swift */,
329326
);
@@ -627,7 +624,6 @@
627624
743BE57F23BD582D000BE177 /* AppView.swift in Sources */,
628625
743BE5F123BD7CCA000BE177 /* Policy.swift in Sources */,
629626
74B45A9D23CD1BDE009191DD /* LabelAndToggle.swift in Sources */,
630-
7464BA8223BE2FAD00ACA419 /* FeedbackAssembly.swift in Sources */,
631627
7464BA6223BE260800ACA419 /* ReactiveSwiftTrendingView.swift in Sources */,
632628
74B45A9F23CE7AF8009191DD /* ViewBuilder.swift in Sources */,
633629
74620436245652BF00BBB9C4 /* GifReducer.swift in Sources */,
@@ -872,7 +868,7 @@
872868
repositoryURL = "https://github.com/Spinners/Spin.Swift";
873869
requirement = {
874870
kind = upToNextMajorVersion;
875-
minimumVersion = 0.18.0;
871+
minimumVersion = 0.19.0;
876872
};
877873
};
878874
743BE59723BD786A000BE177 /* XCRemoteSwiftPackageReference "Alamofire" */ = {

Spin.SwiftUI.Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"repositoryURL": "https://github.com/Spinners/Spin.Swift",
3434
"state": {
3535
"branch": null,
36-
"revision": "d7df7deb3ecccd30fd3539dd83372002cf8a2d58",
37-
"version": "0.18.0"
36+
"revision": "8bbe898bc9e6769d44c8599706405ed16684e501",
37+
"version": "0.19.0"
3838
}
3939
},
4040
{

Spin.SwiftUI.Demo/Assemblies/FeedbackAssembly.swift

-92
This file was deleted.

Spin.SwiftUI.Demo/Assemblies/SpinAssembly.swift

+22-18
Original file line numberDiff line numberDiff line change
@@ -21,55 +21,59 @@ class SpinAssembly: Assembly {
2121
// Trending Spin
2222
// (ReactiveSwift implementation)
2323
container.register(ReactiveSpin<Trending.State, Trending.Event>.self) { resolver -> ReactiveSpin<Trending.State, Trending.Event> in
24-
let loadFeedback = resolver.resolve(TrendingReactiveSwiftFeedback.self)!
24+
let loadEntityFunction = resolver.resolve(TrendingReactiveSwiftEntity.self)!
2525

2626
// build Spin with a Builder pattern
2727
return
2828
Spinner
2929
.initialState(.idle)
30-
.feedback(ReactiveFeedback(effect: loadFeedback, on: QueueScheduler()))
30+
.feedback(ReactiveFeedback(effect: Trending.Feedbacks.loadPage, on: QueueScheduler(), dep1: loadEntityFunction))
3131
.reducer(Reducer(Trending.reducer))
3232
}
3333

3434
// Trending Spin
3535
// (Combine implementation)
3636
container.register(CombineSpin<Trending.State, Trending.Event>.self) { resolver -> CombineSpin<Trending.State, Trending.Event> in
37-
let loadFeedback = resolver.resolve(TrendingCombineFeedback.self)!
37+
let loadEntityFunction = resolver.resolve(TrendingCombineEntity.self)!
3838

3939
// build Spin with a Builder pattern
4040
return
4141
Spinner
4242
.initialState(.idle)
43-
.feedback(CombineFeedback(effect: loadFeedback, on: DispatchQueue(label: "background").eraseToAnyScheduler()))
43+
.feedback(CombineFeedback(effect: Trending.Feedbacks.loadPage,
44+
on: DispatchQueue(label: "background").eraseToAnyScheduler(),
45+
dep1: loadEntityFunction))
4446
.reducer(Reducer(Trending.reducer))
4547
}
4648

4749
// Trending Spin
4850
// (RxSwift implementation)
4951
container.register(RxSpin<Trending.State, Trending.Event>.self) { resolver -> RxSpin<Trending.State, Trending.Event> in
50-
let loadFeedback = resolver.resolve(TrendingRxSwiftFeedback.self)!
52+
let loadEntityFunction = resolver.resolve(TrendingRxSwiftEntity.self)!
5153

5254
// build Spin with a Builder pattern
5355
return
5456
Spinner
5557
.initialState(.idle)
56-
.feedback(RxFeedback(effect: loadFeedback, on: SerialDispatchQueueScheduler(qos: .userInitiated)))
58+
.feedback(RxFeedback(effect: Trending.Feedbacks.loadPage,
59+
on: SerialDispatchQueueScheduler(qos: .userInitiated),
60+
dep1: loadEntityFunction))
5761
.reducer(Reducer(Trending.reducer))
5862
}
5963

6064
// Gif Spin
6165
// (ReactiveSwift implementation)
6266
container.register(ReactiveSpin<Gif.State, Gif.Event>.self) { (resolver, gifId: String)
6367
-> ReactiveSpin<Gif.State, Gif.Event> in
64-
let loadGifFeedback = resolver.resolve(LoadGifReactiveSwiftFeedback.self, name: "ReactiveSwiftLoadFeedback")!
65-
let persistFavoriteFeedback = resolver.resolve(SetFavoriteReactiveSwiftFeedback.self, name: "ReactiveSwiftPersistFeedback")!
68+
let loadEntityFunction = resolver.resolve(GifReactiveSwiftEntity.self)!
69+
let favoriteService = resolver.resolve(FavoriteService.self)!
6670

6771
// build Spin with a declarative "SwiftUI" pattern
6872
return
6973
ReactiveSpin(initialState: .loading(id: gifId)) {
70-
ReactiveFeedback(effect: loadGifFeedback)
74+
ReactiveFeedback(effect: Gif.Feedbacks.load, dep1: loadEntityFunction)
7175
.execute(on: QueueScheduler())
72-
ReactiveFeedback(effect: persistFavoriteFeedback)
76+
ReactiveFeedback(effect: Gif.Feedbacks.persist, dep1: favoriteService.set(favorite:for:))
7377
.execute(on: QueueScheduler())
7478
Reducer(Gif.reducer)
7579
}
@@ -79,15 +83,15 @@ class SpinAssembly: Assembly {
7983
// (Combine implementation)
8084
container.register(CombineSpin<Gif.State, Gif.Event>.self) { (resolver, gifId: String)
8185
-> CombineSpin<Gif.State, Gif.Event> in
82-
let loadGifFeedback = resolver.resolve(LoadGifCombineFeedback.self, name: "CombineLoadFeedback")!
83-
let persistFavoriteFeedback = resolver.resolve(SetFavoriteCombineFeedback.self, name: "CombinePersistFeedback")!
86+
let loadEntityFunction = resolver.resolve(GifCombineEntity.self)!
87+
let favoriteService = resolver.resolve(FavoriteService.self)!
8488

8589
// build Spin with a declarative "SwiftUI" pattern
8690
return
8791
CombineSpin(initialState: .loading(id: gifId)) {
88-
CombineFeedback(effect: loadGifFeedback)
92+
CombineFeedback(effect: Gif.Feedbacks.load, dep1: loadEntityFunction)
8993
.execute(on: DispatchQueue(label: "\(UUID())", qos: .userInitiated).eraseToAnyScheduler())
90-
CombineFeedback(effect: persistFavoriteFeedback)
94+
CombineFeedback(effect: Gif.Feedbacks.persist, dep1: favoriteService.set(favorite:for:))
9195
.execute(on: DispatchQueue(label: "\(UUID())", qos: .userInitiated).eraseToAnyScheduler())
9296
Reducer(Gif.reducer)
9397
}
@@ -97,15 +101,15 @@ class SpinAssembly: Assembly {
97101
// (RxSwift implementation)
98102
container.register(RxSpin<Gif.State, Gif.Event>.self) { (resolver, gifId: String)
99103
-> RxSpin<Gif.State, Gif.Event> in
100-
let loadGifFeedback = resolver.resolve(LoadGifRxSwiftFeedback.self, name: "RxSwiftLoadFeedback")!
101-
let persistFavoriteFeedback = resolver.resolve(SetFavoriteRxSwiftFeedback.self, name: "RxSwiftPersistFeedback")!
104+
let loadEntityFunction = resolver.resolve(GifRxSwiftEntity.self)!
105+
let favoriteService = resolver.resolve(FavoriteService.self)!
102106

103107
// build Spin with a declarative "SwiftUI" pattern
104108
return
105109
RxSpin(initialState: .loading(id: gifId)) {
106-
RxFeedback(effect: loadGifFeedback)
110+
RxFeedback(effect: Gif.Feedbacks.load, dep1: loadEntityFunction)
107111
.execute(on: SerialDispatchQueueScheduler(qos: .userInitiated))
108-
RxFeedback(effect: persistFavoriteFeedback)
112+
RxFeedback(effect: Gif.Feedbacks.persist, dep1: favoriteService.set(favorite:for:))
109113
.execute(on: SerialDispatchQueueScheduler(qos: .userInitiated))
110114
Reducer(Gif.reducer)
111115
}

Spin.SwiftUI.Demo/SceneDelegate.swift

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
1818
ServiceAssembly(),
1919
ApisAssembly(),
2020
EntityAssembly(),
21-
FeedbackAssembly(),
2221
SpinAssembly(),
2322
FeatureAssembly()
2423
])

0 commit comments

Comments
 (0)