Skip to content

Commit 7355c0c

Browse files
plajdoplajdo
authored
Merge pull request #6 from GoodRequest/replay-publisher
Improvements & features
2 parents 162f897 + fb61831 commit 7355c0c

35 files changed

+569
-64
lines changed

‎GoodReactor-Sample/GoodReactor-Sample.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
0908A6462C91C0B10035A749 /* GoodCoordinator in Frameworks */ = {isa = PBXBuildFile; productRef = 0908A6452C91C0B10035A749 /* GoodCoordinator */; };
11-
092188C22C8CD57900C6085A /* NewReactor in Frameworks */ = {isa = PBXBuildFile; productRef = 092188C12C8CD57900C6085A /* NewReactor */; };
12-
099D61632C8211B500B86922 /* NewReactor in Frameworks */ = {isa = PBXBuildFile; productRef = 099D61622C8211B500B86922 /* NewReactor */; };
11+
09545AF02CB6704900DC5A61 /* LegacyReactor in Frameworks */ = {isa = PBXBuildFile; productRef = 09545AEF2CB6704900DC5A61 /* LegacyReactor */; };
12+
09545AF22CB6705100DC5A61 /* GoodReactor in Frameworks */ = {isa = PBXBuildFile; productRef = 09545AF12CB6705100DC5A61 /* GoodReactor */; };
1313
099D61702C83447900B86922 /* GoodCoordinator in Frameworks */ = {isa = PBXBuildFile; productRef = 099D616F2C83447900B86922 /* GoodCoordinator */; };
1414
099D61732C8472D300B86922 /* GoodNetworking in Frameworks */ = {isa = PBXBuildFile; productRef = 099D61722C8472D300B86922 /* GoodNetworking */; };
1515
099D617F2C84A3CC00B86922 /* RandomNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099D617C2C84A3CC00B86922 /* RandomNumber.swift */; };
1616
099D61802C84A3CC00B86922 /* RNGEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099D617D2C84A3CC00B86922 /* RNGEndpoint.swift */; };
17-
5D4A9750299CCA4800DFAEAE /* GoodReactor in Frameworks */ = {isa = PBXBuildFile; productRef = 5D4A974F299CCA4800DFAEAE /* GoodReactor */; };
1817
EA51F944299424A900B14A7C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA51F943299424A900B14A7C /* AppDelegate.swift */; };
1918
EA51F94F299424AA00B14A7C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA51F94E299424AA00B14A7C /* Assets.xcassets */; };
2019
EA51F952299424AA00B14A7C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA51F950299424AA00B14A7C /* LaunchScreen.storyboard */; };
@@ -73,8 +72,8 @@
7372
isa = PBXFrameworksBuildPhase;
7473
buildActionMask = 2147483647;
7574
files = (
75+
09545AF22CB6705100DC5A61 /* GoodReactor in Frameworks */,
7676
0908A6462C91C0B10035A749 /* GoodCoordinator in Frameworks */,
77-
092188C22C8CD57900C6085A /* NewReactor in Frameworks */,
7877
);
7978
runOnlyForDeploymentPostprocessing = 0;
8079
};
@@ -83,9 +82,8 @@
8382
buildActionMask = 2147483647;
8483
files = (
8584
099D61702C83447900B86922 /* GoodCoordinator in Frameworks */,
86-
099D61632C8211B500B86922 /* NewReactor in Frameworks */,
87-
5D4A9750299CCA4800DFAEAE /* GoodReactor in Frameworks */,
8885
099D61732C8472D300B86922 /* GoodNetworking in Frameworks */,
86+
09545AF02CB6704900DC5A61 /* LegacyReactor in Frameworks */,
8987
);
9088
runOnlyForDeploymentPostprocessing = 0;
9189
};
@@ -280,8 +278,8 @@
280278
);
281279
name = "goodreactor-swiftui-sample";
282280
packageProductDependencies = (
283-
092188C12C8CD57900C6085A /* NewReactor */,
284281
0908A6452C91C0B10035A749 /* GoodCoordinator */,
282+
09545AF12CB6705100DC5A61 /* GoodReactor */,
285283
);
286284
productName = "goodreactor-swiftui-sample";
287285
productReference = 092188B02C8CD2A100C6085A /* goodreactor-swiftui-sample.app */;
@@ -301,10 +299,9 @@
301299
);
302300
name = "GoodReactor-Sample";
303301
packageProductDependencies = (
304-
5D4A974F299CCA4800DFAEAE /* GoodReactor */,
305-
099D61622C8211B500B86922 /* NewReactor */,
306302
099D616F2C83447900B86922 /* GoodCoordinator */,
307303
099D61722C8472D300B86922 /* GoodNetworking */,
304+
09545AEF2CB6704900DC5A61 /* LegacyReactor */,
308305
);
309306
productName = "GoodReactor-Sample";
310307
productReference = EA51F940299424A900B14A7C /* GoodReactor-Sample.app */;
@@ -707,13 +704,13 @@
707704
isa = XCSwiftPackageProductDependency;
708705
productName = GoodCoordinator;
709706
};
710-
092188C12C8CD57900C6085A /* NewReactor */ = {
707+
09545AEF2CB6704900DC5A61 /* LegacyReactor */ = {
711708
isa = XCSwiftPackageProductDependency;
712-
productName = NewReactor;
709+
productName = LegacyReactor;
713710
};
714-
099D61622C8211B500B86922 /* NewReactor */ = {
711+
09545AF12CB6705100DC5A61 /* GoodReactor */ = {
715712
isa = XCSwiftPackageProductDependency;
716-
productName = NewReactor;
713+
productName = GoodReactor;
717714
};
718715
099D616F2C83447900B86922 /* GoodCoordinator */ = {
719716
isa = XCSwiftPackageProductDependency;
@@ -723,10 +720,6 @@
723720
isa = XCSwiftPackageProductDependency;
724721
productName = GoodNetworking;
725722
};
726-
5D4A974F299CCA4800DFAEAE /* GoodReactor */ = {
727-
isa = XCSwiftPackageProductDependency;
728-
productName = GoodReactor;
729-
};
730723
/* End XCSwiftPackageProductDependency section */
731724
};
732725
rootObject = EA51F938299424A900B14A7C /* Project object */;

‎GoodReactor-Sample/GoodReactor-Sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 41 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GoodReactor-Sample/GoodReactor-Sample/Screens/About/AboutViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Combine
99
import Foundation
10-
import GoodReactor
10+
import LegacyReactor
1111

1212
final class AboutViewModel: GoodReactor {
1313

‎GoodReactor-Sample/GoodReactor-Sample/Screens/Home/HomeViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Combine
99
import UIKit
10-
import NewReactor
10+
import GoodReactor
1111

1212
final class HomeViewController: BaseViewController<HomeViewModel> {
1313

‎GoodReactor-Sample/goodreactor-swiftui-sample/App/AppReactor.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
//
77

88
import GoodCoordinator
9-
import NewReactor
9+
import GoodReactor
1010
import Observation
1111
import SwiftUI
1212

1313
// TODO: Coordinator reactor macro for empty reactors
1414
@Observable final class AppReactor: Reactor {
1515

16-
typealias Event = NewReactor.Event<Action, Mutation, Destination>
16+
typealias Event = GoodReactor.Event<Action, Mutation, Destination>
1717

1818
enum Action {
1919

‎GoodReactor-Sample/goodreactor-swiftui-sample/App/AppSwiftUI.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import GoodCoordinator
9-
import NewReactor
9+
import GoodReactor
1010
import SwiftUI
1111

1212
@main struct goodreactor_swiftui_sampleApp: App {
@@ -16,6 +16,7 @@ import SwiftUI
1616
MainWindow()
1717
}
1818
}
19+
1920
}
2021

2122
@NavigationRoot struct MainWindow: View {

‎GoodReactor-Sample/goodreactor-swiftui-sample/Screens/Content/ContentView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import GoodCoordinator
9-
import NewReactor
9+
import GoodReactor
1010
import SwiftUI
1111

1212
struct ContentView: View {

‎GoodReactor-Sample/goodreactor-swiftui-sample/Screens/Content/ContentViewModel.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
//
77

88
import GoodCoordinator
9-
import NewReactor
9+
import GoodReactor
1010
import Observation
1111
import SwiftUI
1212

1313
@Observable final class ContentViewModel: Reactor {
1414

15-
typealias Event = NewReactor.Event<Action, Mutation, Destination>
15+
typealias Event = GoodReactor.Event<Action, Mutation, Destination>
1616

1717
enum Action {
1818

‎GoodReactor-Sample/goodreactor-swiftui-sample/Screens/Detail/DetailView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import GoodCoordinator
99
import SwiftUI
10-
import NewReactor
10+
import GoodReactor
1111

1212
struct DetailView: View {
1313

‎GoodReactor-Sample/goodreactor-swiftui-sample/Screens/Detail/DetailViewModel.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
//
77

88
import GoodCoordinator
9-
import NewReactor
9+
import GoodReactor
1010
import Observation
1111

1212
@Observable final class DetailViewModel: Reactor {
1313

14-
typealias Event = NewReactor.Event<Action, Mutation, Destination>
14+
typealias Event = GoodReactor.Event<Action, Mutation, Destination>
1515

1616
enum Action {
1717

0 commit comments

Comments
 (0)