Update xcode deployment

AdamShare · AdamShare · commit 780821232f44 · 2021-01-29T17:13:36.000-08:00
diff --git a/Examples/Hybrid/Hybrid-Example.xcodeproj/project.pbxproj b/Examples/Hybrid/Hybrid-Example.xcodeproj/project.pbxproj
@@ -372,7 +372,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -427,7 +427,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/Examples/RIBs/RIBs-Example.xcodeproj/project.pbxproj b/Examples/RIBs/RIBs-Example.xcodeproj/project.pbxproj
@@ -466,7 +466,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -522,7 +522,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -537,7 +537,9 @@
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
 				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 5Q8MZG7V3R;
 				INFOPLIST_FILE = TicTacToe/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -554,7 +556,9 @@
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
 				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 5Q8MZG7V3R;
 				INFOPLIST_FILE = TicTacToe/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/Examples/SPIR/SPIR-Example.xcodeproj/project.pbxproj b/Examples/SPIR/SPIR-Example.xcodeproj/project.pbxproj
@@ -389,7 +389,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -444,7 +444,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/Examples/SPIR/TicTacToe/App/Root/LoggedIn/LoggedInBuilder.swift b/Examples/SPIR/TicTacToe/App/Root/LoggedIn/LoggedInBuilder.swift
@@ -21,7 +21,7 @@ protocol LoggedInDependency: Dependency {
     var loggedInPresenter: LoggedInPresentable { get }
 }
 
-final class LoggedInComponent: Component<LoggedInDependency>, InteractorProviding {
+final class LoggedInComponent: Component<LoggedInDependency>, InteractorProviding, LifecycleOwner {
 
     private let dynamicDependency: DynamicDependency
 
diff --git a/Examples/SPIR/TicTacToe/App/Root/RootBuilder.swift b/Examples/SPIR/TicTacToe/App/Root/RootBuilder.swift
@@ -18,7 +18,7 @@ import Lifecycle
 import SPIR
 import SwiftUI
 
-final class RootComponent: BootstrapComponent, PresentableInteractorProviding {
+final class RootComponent: BootstrapComponent, PresentableInteractorProviding, LifecycleOwner {
 
     var loggedOutListener: LoggedOutListener {
         return interactor
diff --git a/Package.swift b/Package.swift
@@ -58,6 +58,7 @@ let package = Package(
         .target(name: "RIBs",
                 dependencies: ["Lifecycle"]),
         .testTarget(name: "RIBsTests",
-                    dependencies: ["RIBs"]),
+                    dependencies: ["RIBs",
+                                   "NeedleFoundation"]),
     ]
 )
diff --git a/Sources/Lifecycle/View/ViewLifecycleComponent.swift b/Sources/Lifecycle/View/ViewLifecycleComponent.swift
@@ -40,11 +40,11 @@ public protocol ViewLifecycleOwnerViewProviding: ViewableBuildable {
     var viewLifecycleOwner: ViewLifecycleOwner { get }
 }
 
-public protocol EmptyInit {
+public protocol Initializable {
     init()
 }
 
-public extension ViewLifecycleOwnerViewProviding where ContentView: EmptyInit {
+public extension ViewLifecycleOwnerViewProviding where ContentView: Initializable {
     var view: ContentView {
         return ContentView()
     }
diff --git a/Sources/MVVM/Lifecycle.swift b/Sources/MVVM/Lifecycle.swift
@@ -23,6 +23,7 @@ public typealias AnyBuilder = Lifecycle.AnyBuilder
 public typealias AnyDynamicBuilder = Lifecycle.AnyDynamicBuilder
 public typealias AtomicLazy = Lifecycle.AtomicLazy
 public typealias AtomicWeakLazy = Lifecycle.AtomicWeakLazy
+public typealias Initializable = Lifecycle.Initializable
 public typealias Lazy = Lifecycle.Lazy
 public typealias LazyViewable = Lifecycle.LazyViewable
 public typealias LazyView = Lifecycle.LazyView
diff --git a/Sources/RIBs/DI/Component.swift b/Sources/RIBs/DI/Component.swift
@@ -76,4 +76,6 @@ import Foundation
         /// Initializer.
         public init() {}
     }
+
+    extension Component: SharedComponent {}
 #endif
diff --git a/Sources/RIBs/Lifecycle.swift b/Sources/RIBs/Lifecycle.swift
@@ -23,6 +23,7 @@ public typealias AnyBuilder = Lifecycle.AnyBuilder
 public typealias AnyDynamicBuilder = Lifecycle.AnyDynamicBuilder
 public typealias AtomicLazy = Lifecycle.AtomicLazy
 public typealias AtomicWeakLazy = Lifecycle.AtomicWeakLazy
+public typealias Initializable = Lifecycle.Initializable
 public typealias Lazy = Lifecycle.Lazy
 public typealias LazyViewable = Lifecycle.LazyViewable
 public typealias LazyView = Lifecycle.LazyView
diff --git a/Sources/SPIR/Lifecycle.swift b/Sources/SPIR/Lifecycle.swift
@@ -23,6 +23,7 @@ public typealias AnyBuilder = Lifecycle.AnyBuilder
 public typealias AnyDynamicBuilder = Lifecycle.AnyDynamicBuilder
 public typealias AtomicLazy = Lifecycle.AtomicLazy
 public typealias AtomicWeakLazy = Lifecycle.AtomicWeakLazy
+public typealias Initializable = Lifecycle.Initializable
 public typealias Lazy = Lifecycle.Lazy
 public typealias LazyViewable = Lifecycle.LazyViewable
 public typealias LazyView = Lifecycle.LazyView
diff --git a/Tests/MVVMTests/ScopeTests.swift b/Tests/MVVMTests/ScopeTests.swift
@@ -26,7 +26,7 @@ final class ScopeTests: XCTestCase {
         __DependencyProviderRegistry.instance.registerDependencyProviderFactory(for: "^->TestComponent") { component in
             return EmptyDependencyProvider(component: component)
         }
-        XCTAssertTrue(TestComponent().build() is LifecycleOwnerViewProvider<ModifiedContent<TestComponent.ContentView, TrackingViewModifier>>)
+        XCTAssertTrue(TestComponent().build() is LifecycleOwnerViewProvider<ModifiedContent<ModifiedContent<TestComponent.ContentView, TrackingViewModifier>, _EnvironmentKeyWritingModifier<Optional<TestComponent>>>>)
     }
 }
 
diff --git a/Tests/SPIRTests/ScopeTests.swift b/Tests/SPIRTests/ScopeTests.swift
@@ -28,5 +28,8 @@ final class ScopeTests: XCTestCase {
 
         let component = BootstrapComponent()
         XCTAssertEqual(component.scopeLifecycle, component.scopeLifecycle)
+        XCTAssertEqual(component.viewLifecycle, component.viewLifecycle)
     }
 }
+
+extension BootstrapComponent: LifecycleOwner, ViewLifecycleOwner {}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protocol LoggedInDependency: Dependency {`
`21`	`21`	`var loggedInPresenter: LoggedInPresentable { get }`
`22`	`22`	`}`
`23`	`23`
`24`		`-final class LoggedInComponent: Component<LoggedInDependency>, InteractorProviding {`
	`24`	`+final class LoggedInComponent: Component<LoggedInDependency>, InteractorProviding, LifecycleOwner {`
`25`	`25`
`26`	`26`	`private let dynamicDependency: DynamicDependency`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ let package = Package(`
`58`	`58`	`.target(name: "RIBs",`
`59`	`59`	`dependencies: ["Lifecycle"]),`
`60`	`60`	`.testTarget(name: "RIBsTests",`
`61`		`- dependencies: ["RIBs"]),`
	`61`	`+ dependencies: ["RIBs",`
	`62`	`+ "NeedleFoundation"]),`
`62`	`63`	`]`
`63`	`64`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ public protocol ViewLifecycleOwnerViewProviding: ViewableBuildable {`
`40`	`40`	`var viewLifecycleOwner: ViewLifecycleOwner { get }`
`41`	`41`	`}`
`42`	`42`
`43`		`-public protocol EmptyInit {`
	`43`	`+public protocol Initializable {`
`44`	`44`	`init()`
`45`	`45`	`}`
`46`	`46`
`47`		`-public extension ViewLifecycleOwnerViewProviding where ContentView: EmptyInit {`
	`47`	`+public extension ViewLifecycleOwnerViewProviding where ContentView: Initializable {`
`48`	`48`	`var view: ContentView {`
`49`	`49`	`return ContentView()`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,4 +76,6 @@ import Foundation`
`76`	`76`	`/// Initializer.`
`77`	`77`	`public init() {}`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ extension Component: SharedComponent {}`
`79`	`81`	`#endif`