tutu-ru-mobile · s-efanov · Sep 29, 2021
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ComposableArchitecture.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ComposableArchitecture.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ComposableCoreLocation.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ComposableCoreLocation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/rxswift-composable-architecture-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/rxswift-composable-architecture-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj b/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		7854FF92249318910094D8A8 /* UIKitCaseStudiesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7854FF91249318910094D8A8 /* UIKitCaseStudiesTests.swift */; };
 		78634FE924930375006E231F /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 78634FE824930375006E231F /* RxCocoa */; };
-		78BC6CAC24D9BD200061AB2D /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = 78BC6CAB24D9BD200061AB2D /* ComposableArchitecture */; };
 		DC25DC5F2450F13200082E81 /* IfLetStoreController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC25DC5E2450F13200082E81 /* IfLetStoreController.swift */; };
 		DC25DC612450F2B000082E81 /* LoadThenNavigate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC25DC602450F2B000082E81 /* LoadThenNavigate.swift */; };
 		DC25DC642450F2DF00082E81 /* ActivityIndicatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC25DC632450F2DF00082E81 /* ActivityIndicatorViewController.swift */; };
@@ -21,6 +20,7 @@
 		DC4C6ED62450E1050066A05D /* CounterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4C6ED52450E1050066A05D /* CounterViewController.swift */; };
 		DC4C6EDA2450E6050066A05D /* NavigateAndLoad.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4C6ED92450E6050066A05D /* NavigateAndLoad.swift */; };
 		DC630FDA2451016B00BAECBA /* ListsOfState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC630FD92451016B00BAECBA /* ListsOfState.swift */; };
+		FCA7EB552704A55300E873AE /* TutuComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = FCA7EB542704A55300E873AE /* TutuComposableArchitecture */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -82,7 +82,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				78BC6CAC24D9BD200061AB2D /* ComposableArchitecture in Frameworks */,
+				FCA7EB552704A55300E873AE /* TutuComposableArchitecture in Frameworks */,
 				78634FE924930375006E231F /* RxCocoa in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -188,7 +188,7 @@
 			name = UIKitCaseStudies;
 			packageProductDependencies = (
 				78634FE824930375006E231F /* RxCocoa */,
-				78BC6CAB24D9BD200061AB2D /* ComposableArchitecture */,
+				FCA7EB542704A55300E873AE /* TutuComposableArchitecture */,
 			);
 			productName = UIKitCaseStudies;
 			productReference = DC4C6EA72450DD380066A05D /* UIKitCaseStudies.app */;
@@ -222,7 +222,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1140;
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "Point-Free";
 				TargetAttributes = {
 					DC4C6EA62450DD380066A05D = {
@@ -246,7 +246,7 @@
 			mainGroup = DC89C40A24460F95006900B9;
 			packageReferences = (
 				78634FE724930375006E231F /* XCRemoteSwiftPackageReference "RxSwift" */,
-				78BC6CAA24D9BD200061AB2D /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */,
+				FC3F18FE2704A33300BFD3BB /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */,
 			);
 			productRefGroup = DC89C41424460F95006900B9 /* Products */;
 			projectDirPath = "";
@@ -433,6 +433,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;
@@ -492,6 +493,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;
@@ -557,15 +559,15 @@
 			repositoryURL = "https://github.com/ReactiveX/RxSwift.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.1.1;
+				minimumVersion = 6.2.0;
 			};
 		};
-		78BC6CAA24D9BD200061AB2D /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */ = {
+		FC3F18FE2704A33300BFD3BB /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/dannyhertz/rxswift-composable-architecture.git";
+			repositoryURL = "git@github.com:tutu-ru-mobile/rxswift-composable-architecture.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.6.0;
+				branch = master;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -576,10 +578,9 @@
 			package = 78634FE724930375006E231F /* XCRemoteSwiftPackageReference "RxSwift" */;
 			productName = RxCocoa;
 		};
-		78BC6CAB24D9BD200061AB2D /* ComposableArchitecture */ = {
+		FCA7EB542704A55300E873AE /* TutuComposableArchitecture */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 78BC6CAA24D9BD200061AB2D /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */;
-			productName = ComposableArchitecture;
+			productName = TutuComposableArchitecture;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

diff --git a/...les/CaseStudies/CaseStudies.xcodeproj/xcshareddata/xcschemes/CaseStudies (UIKit).xcscheme b/...les/CaseStudies/CaseStudies.xcodeproj/xcshareddata/xcschemes/CaseStudies (UIKit).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Examples/CaseStudies/UIKitCaseStudies/CounterViewController.swift b/Examples/CaseStudies/UIKitCaseStudies/CounterViewController.swift
@@ -1,5 +1,5 @@
 import RxSwift
-import ComposableArchitecture
+import TutuComposableArchitecture
 import UIKit
 import RxCocoa
 

diff --git a/Examples/CaseStudies/UIKitCaseStudies/Internal/IfLetStoreController.swift b/Examples/CaseStudies/UIKitCaseStudies/Internal/IfLetStoreController.swift
@@ -1,6 +1,6 @@
 import RxSwift
 import RxCocoa
-import ComposableArchitecture
+import TutuComposableArchitecture
 import UIKit
 
 final class IfLetStoreController<State, Action>: UIViewController {

diff --git a/Examples/CaseStudies/UIKitCaseStudies/ListsOfState.swift b/Examples/CaseStudies/UIKitCaseStudies/ListsOfState.swift
@@ -1,5 +1,5 @@
 import RxSwift
-import ComposableArchitecture
+import TutuComposableArchitecture
 import UIKit
 import RxCocoa
 

diff --git a/Examples/CaseStudies/UIKitCaseStudies/LoadThenNavigate.swift b/Examples/CaseStudies/UIKitCaseStudies/LoadThenNavigate.swift
@@ -1,6 +1,6 @@
 import RxCocoa
 import RxSwift
-import ComposableArchitecture
+import TutuComposableArchitecture
 import UIKit
 
 struct LazyNavigationState: Equatable {

diff --git a/Examples/CaseStudies/UIKitCaseStudies/NavigateAndLoad.swift b/Examples/CaseStudies/UIKitCaseStudies/NavigateAndLoad.swift
@@ -1,5 +1,5 @@
 import RxSwift
-import ComposableArchitecture
+import TutuComposableArchitecture
 import UIKit
 import RxCocoa
 

diff --git a/Examples/CaseStudies/UIKitCaseStudies/RootViewController.swift b/Examples/CaseStudies/UIKitCaseStudies/RootViewController.swift
@@ -1,4 +1,4 @@
-import ComposableArchitecture
+import TutuComposableArchitecture
 import UIKit
 import RxSwift
 

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "rxswift-composable-architecture",
+    name: "TutuComposableArchitecture",
     platforms: [
         .iOS(.v12),
         .macOS(.v10_15),
@@ -12,8 +12,8 @@ let package = Package(
     ],
     products: [
         .library(
-            name: "ComposableArchitecture",
-            targets: ["ComposableArchitecture"]
+            name: "TutuComposableArchitecture",
+            targets: ["TutuComposableArchitecture"]
         )
     ],
     dependencies: [
@@ -22,7 +22,7 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "ComposableArchitecture",
+            name: "TutuComposableArchitecture",
             dependencies: [
                 .product(name: "CasePaths", package: "swift-case-paths"),
                 .product(name: "RxRelay", package: "RxSwift"),
@@ -31,9 +31,9 @@ let package = Package(
             path: "Sources"
         ),
         .testTarget(
-            name: "ComposableArchitectureTests",
+            name: "TutuComposableArchitectureTests",
             dependencies: [
-                "ComposableArchitecture",
+                "TutuComposableArchitecture",
                 .product(name: "RxTest", package: "RxSwift")
             ],
             path: "Tests"

diff --git a/Sources/Internal/Debug.swift b/Sources/Internal/Debug.swift
@@ -211,7 +211,7 @@ extension Effect: CustomDebugOutputConvertible {
         let scheduler = mirror.children.first(where: { label, _ in label == "scheduler" })!.value
         let ns = Int("\(Mirror(reflecting: interval).children.first!.value)")!
         path.append(
-          "\n.delay(for: \(Double(ns) / Double(NSEC_PER_SEC)), scheduler: \(ComposableArchitecture.debugOutput(scheduler)))"
+          "\n.delay(for: \(Double(ns) / Double(NSEC_PER_SEC)), scheduler: \(TutuComposableArchitecture.debugOutput(scheduler)))"
         )
       }
       if subjectType.hasPrefix("Empty<") {
@@ -233,7 +233,7 @@ extension Effect: CustomDebugOutputConvertible {
       }
       if subjectType.hasPrefix("ReceiveOn<") {
         let scheduler = mirror.children.first(where: { label, _ in label == "scheduler" })!.value
-        path.append("\n.receive(on: \(ComposableArchitecture.debugOutput(scheduler)))")
+        path.append("\n.receive(on: \(TutuComposableArchitecture.debugOutput(scheduler)))")
       }
 
       mirror.children.forEach { _, v in updatePath(v) }
@@ -243,8 +243,8 @@ extension Effect: CustomDebugOutputConvertible {
 
     guard mergeMany.isEmpty else {
       return
-        ComposableArchitecture
-        .debugOutput(mergeMany.filter { !ComposableArchitecture.debugOutput($0).isEmpty })
+        TutuComposableArchitecture
+        .debugOutput(mergeMany.filter { !TutuComposableArchitecture.debugOutput($0).isEmpty })
     }
     guard empty == nil else { return "" }
 
@@ -258,7 +258,7 @@ extension Effect: CustomDebugOutputConvertible {
     let operators = path.reversed().joined()
     return """
       \(type(of: self))(\
-      \(just.map { "\n\("value: \(ComposableArchitecture.debugOutput($0))".indent(by: 2))\n" } ?? "")\
+      \(just.map { "\n\("value: \(TutuComposableArchitecture.debugOutput($0))".indent(by: 2))\n" } ?? "")\
       )\(operators.indent(by: !operators.isEmpty && just == nil ? 2 : 0))
       """
   }

diff --git a/Tests/ComposableArchitectureTests.swift b/Tests/ComposableArchitectureTests.swift
@@ -1,4 +1,4 @@
-import ComposableArchitecture
+import TutuComposableArchitecture
 import RxSwift
 import RxTest
 import XCTest

diff --git a/Tests/EffectCancellationTests.swift b/Tests/EffectCancellationTests.swift
@@ -2,7 +2,7 @@ import RxSwift
 import RxTest
 import XCTest
 
-@testable import ComposableArchitecture
+@testable import TutuComposableArchitecture
 
 final class EffectCancellationTests: XCTestCase {
   struct CancelToken: Hashable {}

diff --git a/Tests/EffectDebounceTests.swift b/Tests/EffectDebounceTests.swift
@@ -1,4 +1,4 @@
-import ComposableArchitecture
+import TutuComposableArchitecture
 import RxSwift
 import RxTest
 import XCTest

diff --git a/Tests/EffectTests.swift b/Tests/EffectTests.swift
@@ -2,7 +2,7 @@ import RxSwift
 import RxTest
 import XCTest
 
-@testable import ComposableArchitecture
+@testable import TutuComposableArchitecture
 
 final class EffectTests: XCTestCase {
   var disposeBag = DisposeBag()

diff --git a/Tests/Internal/EffectThrottleTests.swift b/Tests/Internal/EffectThrottleTests.swift
@@ -2,7 +2,7 @@ import RxSwift
 import RxTest
 import XCTest
 
-@testable import ComposableArchitecture
+@testable import TutuComposableArchitecture
 
 final class EffectThrottleTests: XCTestCase {
   var disposeBag = DisposeBag()

diff --git a/Tests/MemoryManagementTests.swift b/Tests/MemoryManagementTests.swift
@@ -1,4 +1,4 @@
-import ComposableArchitecture
+import TutuComposableArchitecture
 import RxSwift
 import RxTest
 import XCTest

diff --git a/Tests/ReducerTests.swift b/Tests/ReducerTests.swift
@@ -1,4 +1,4 @@
-import ComposableArchitecture
+import TutuComposableArchitecture
 import RxSwift
 import RxTest
 import XCTest

diff --git a/Tests/StoreTests.swift b/Tests/StoreTests.swift
@@ -2,7 +2,7 @@ import RxSwift
 import RxTest
 import XCTest
 
-@testable import ComposableArchitecture
+@testable import TutuComposableArchitecture
 
 final class StoreTests: XCTestCase {
   var disposeBag = DisposeBag()

diff --git a/Tests/TimerTests.swift b/Tests/TimerTests.swift
@@ -1,5 +1,5 @@
 //import RxSwift
-import ComposableArchitecture
+import TutuComposableArchitecture
 import RxSwift
 import RxTest
 import XCTest