Merge branch 'main' into jquadri/workflow-observers

* main:
  [fix]: use weak reference to internal sinks when vending to clients (#189)
  [feat]: add primary associated types to more protocols (#188)
  [chore]: pre major version bump cleanup (#187)
  [chore]: bump minimum deployment & swift versions (#186)
  Abstract ViewEnvironment to shared framework (#185)
  Bump activesupport from 6.1.4.4 to 6.1.7.1 (#183)
  [feat]: add primary associated types to `Workflow` protocol (#181)
  [chore]: update swiftformat ifdef indent rule to no-indent (#182)

Author: jamieQ

.github/workflows/swift.yaml

@@ -41,11 +41,11 @@ jobs:
         bundle exec pod gen Development.podspec
 
     - name: Switch Xcode
-      run: sudo xcode-select -s /Applications/Xcode_13.3.1.app
+      run: sudo xcode-select -s /Applications/Xcode_14.2.0.app
 
     - name: Build & Test
       run: |
-        set -o pipefail && xcodebuild -workspace gen/Development/Development.xcworkspace -scheme ${{ matrix.scheme }} -destination platform\=iOS\ Simulator,OS\=15.4,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty
+        set -o pipefail && xcodebuild -workspace gen/Development/Development.xcworkspace -scheme ${{ matrix.scheme }} -destination platform\=iOS\ Simulator,OS\=16.2,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty
 
   spm:
     runs-on: macos-latest
@@ -54,7 +54,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Switch Xcode
-      run: sudo xcode-select -s /Applications/Xcode_13.3.1.app
+      run: sudo xcode-select -s /Applications/Xcode_14.2.0.app
 
     - name: Swift Package Manager - iOS
       run: |
@@ -81,13 +81,13 @@ jobs:
         bundle check || bundle install --path .bundle
 
     - name: Switch Xcode
-      run: sudo xcode-select -s /Applications/Xcode_13.3.1.app
+      run: sudo xcode-select -s /Applications/Xcode_14.2.0.app
 
     - name: Tutorial App
       run: |
         cd Samples/Tutorial
         bundle exec pod install
-        set -o pipefail && xcodebuild -workspace Tutorial.xcworkspace -scheme Tutorial -destination platform\=iOS\ Simulator,OS\=15.4,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty
+        set -o pipefail && xcodebuild -workspace Tutorial.xcworkspace -scheme Tutorial -destination platform\=iOS\ Simulator,OS\=16.2,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty
 
   documentation-lint:
     runs-on: macos-latest
@@ -107,7 +107,7 @@ jobs:
         brew install sourcedocs
 
     - name: Switch Xcode
-      run: sudo xcode-select -s /Applications/Xcode_13.3.1.app
+      run: sudo xcode-select -s /Applications/Xcode_14.2.0.app
 
     - name: Swiftdocs
       run: |

Development.podspec

@@ -1,3 +1,5 @@
+require_relative('version')
+
 Pod::Spec.new do |s|
   s.name         = 'Development'
   s.version      = '0.1.0'
@@ -7,14 +9,15 @@ Pod::Spec.new do |s|
   s.author       = 'Square'
   s.source       = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" }
 
-  s.ios.deployment_target = '11.0'
-  s.swift_version = '5.0'
+  s.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET
+  s.swift_version = WORKFLOW_SWIFT_VERSION
   s.dependency 'Workflow'
   s.dependency 'WorkflowUI'
   s.dependency 'WorkflowReactiveSwift'
   s.dependency 'WorkflowRxSwift'
-  # s.dependency 'WorkflowCombine' # TODO: Disabled because app specs cannot increase the deployment target of the root
-  # s.dependency 'WorkflowConcurrency' # TODO: Disabled because app specs cannot increase the deployment target of the root
+  s.dependency 'WorkflowCombine'
+  s.dependency 'WorkflowConcurrency'
+  s.dependency 'ViewEnvironment'
 
   s.source_files = 'Samples/Dummy.swift'
 
@@ -44,17 +47,14 @@ Pod::Spec.new do |s|
     test_spec.source_files = 'WorkflowTesting/Tests/**/*.swift'
   end
 
-  # TODO: Disabled because app specs cannot increase the deployment target of the root
-  # To use, increase the deployment target of this spec to 13.0 or higher
-  #
-  # s.app_spec 'SampleSwiftUIApp' do |app_spec|
-  #   app_spec.ios.deployment_target = '13.0'
-  #   app_spec.dependency 'WorkflowSwiftUI'
-  #   app_spec.pod_target_xcconfig = {
-  #     'IFNFOPLIST_FILE' => '${PODS_ROOT}/../Samples/SampleSwiftUIApp/SampleSwiftUIApp/Configuration/Info.plist'
-  #   }
-  #   app_spec.source_files = 'SampleSwiftUIApp/SampleSwiftUIApp/**/*.swift'
-  # end
+  s.app_spec 'SampleSwiftUIApp' do |app_spec|
+    app_spec.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET
+    app_spec.dependency 'WorkflowSwiftUI'
+    app_spec.pod_target_xcconfig = {
+      'IFNFOPLIST_FILE' => '${PODS_ROOT}/../Samples/SampleSwiftUIApp/SampleSwiftUIApp/Configuration/Info.plist'
+    }
+    app_spec.source_files = 'Samples/SampleSwiftUIApp/SampleSwiftUIApp/**/*.swift'
+  end
 
   s.app_spec 'SampleTicTacToe' do |app_spec|
     app_spec.source_files = 'Samples/TicTacToe/Sources/**/*.swift'
@@ -145,48 +145,46 @@ Pod::Spec.new do |s|
     test_spec.dependency 'WorkflowRxSwiftTesting'
   end
 
-  # TODO: Disabled because app specs cannot increase the deployment target of the root
-  #  To use, increase the deployment target of this spec to 13.0 or higher
-  # s.app_spec 'WorkflowCombineSampleApp' do |app_spec|
-  #   app_spec.source_files = 'Samples/WorkflowCombineSampleApp/WorkflowCombineSampleApp/**/*.swift'
-  # end
-  #
-  # s.test_spec 'WorkflowCombineSampleAppTests' do |test_spec|
-  #   test_spec.dependency 'Development/WorkflowCombineSampleApp'
-  #   test_spec.dependency 'WorkflowTesting'
-  #   test_spec.requires_app_host = true
-  #   test_spec.app_host_name = 'Development/WorkflowCombineSampleApp'
-  #   test_spec.source_files = 'Samples/WorkflowCombineSampleApp/WorkflowCombineSampleAppUnitTests/**/*.swift'
-  # end
-
-  # s.test_spec 'WorkflowCombineTests' do |test_spec|
-  #   test_spec.requires_app_host = true
-  #   test_spec.source_files = 'WorkflowCombine/Tests/**/*.swift'
-  #   test_spec.framework = 'XCTest'
-  #   test_spec.dependency 'WorkflowTesting'
-  #   test_spec.dependency 'WorkflowCombineTesting'
-  # end
-
-  # s.test_spec 'WorkflowCombineTestingTests' do |test_spec|
-  #   test_spec.requires_app_host = true
-  #   test_spec.source_files = 'WorkflowCombine/TestingTests/**/*.swift'
-  #   test_spec.framework = 'XCTest'
-  #   test_spec.dependency 'WorkflowTesting'
-  #   test_spec.dependency 'WorkflowCombineTesting'
-  # end
+  s.app_spec 'WorkflowCombineSampleApp' do |app_spec|
+    app_spec.source_files = 'Samples/WorkflowCombineSampleApp/WorkflowCombineSampleApp/**/*.swift'
+  end
+  
+  s.test_spec 'WorkflowCombineSampleAppTests' do |test_spec|
+    test_spec.dependency 'Development/WorkflowCombineSampleApp'
+    test_spec.dependency 'WorkflowTesting'
+    test_spec.requires_app_host = true
+    test_spec.app_host_name = 'Development/WorkflowCombineSampleApp'
+    test_spec.source_files = 'Samples/WorkflowCombineSampleApp/WorkflowCombineSampleAppUnitTests/**/*.swift'
+  end
+
+  s.test_spec 'WorkflowCombineTests' do |test_spec|
+    test_spec.requires_app_host = true
+    test_spec.source_files = 'WorkflowCombine/Tests/**/*.swift'
+    test_spec.framework = 'XCTest'
+    test_spec.dependency 'WorkflowTesting'
+    test_spec.dependency 'WorkflowCombineTesting'
+  end
+
+  s.test_spec 'WorkflowCombineTestingTests' do |test_spec|
+    test_spec.requires_app_host = true
+    test_spec.source_files = 'WorkflowCombine/TestingTests/**/*.swift'
+    test_spec.framework = 'XCTest'
+    test_spec.dependency 'WorkflowTesting'
+    test_spec.dependency 'WorkflowCombineTesting'
+  end
 
-  # s.test_spec 'WorkflowConcurrencyTests' do |test_spec|
-  #   test_spec.requires_app_host = true
-  #   test_spec.source_files = 'WorkflowConcurrency/Tests/**/*.swift'
-  #   test_spec.framework = 'XCTest'
-  #   test_spec.dependency 'WorkflowTesting'
-  # end
+  s.test_spec 'WorkflowConcurrencyTests' do |test_spec|
+    test_spec.requires_app_host = true
+    test_spec.source_files = 'WorkflowConcurrency/Tests/**/*.swift'
+    test_spec.framework = 'XCTest'
+    test_spec.dependency 'WorkflowTesting'
+  end
 
-  # s.test_spec 'WorkflowConcurrencyTestingTests' do |test_spec|
-  #   test_spec.requires_app_host = true
-  #   test_spec.source_files = 'WorkflowConcurrency/TestingTests/**/*.swift'
-  #   test_spec.framework = 'XCTest'
-  #   test_spec.dependency 'WorkflowTesting'
-  #   test_spec.dependency 'WorkflowConcurrencyTesting'
-  # end
+  s.test_spec 'WorkflowConcurrencyTestingTests' do |test_spec|
+    test_spec.requires_app_host = true
+    test_spec.source_files = 'WorkflowConcurrency/TestingTests/**/*.swift'
+    test_spec.framework = 'XCTest'
+    test_spec.dependency 'WorkflowTesting'
+    test_spec.dependency 'WorkflowConcurrencyTesting'
+  end
 end

Gemfile

@@ -3,6 +3,4 @@ source 'https://rubygems.org'
 gem 'cocoapods-trunk', '>=1.6.0'
 gem 'cocoapods'
 
-# Need it for Ruby 3.0 support and no release has happened yet
-gem 'cocoapods-disable-podfile-validations', :git => 'https://github.com/segiddins/cocoapods-disable-podfile-validations.git', :ref => '55598d677fa995be496a47b810f4f9dce732b169'
 gem 'cocoapods-generate'

Gemfile.lock

@@ -1,16 +1,9 @@
-GIT
-  remote: https://github.com/segiddins/cocoapods-disable-podfile-validations.git
-  revision: 55598d677fa995be496a47b810f4f9dce732b169
-  ref: 55598d677fa995be496a47b810f4f9dce732b169
-  specs:
-    cocoapods-disable-podfile-validations (0.1.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.4)
+    activesupport (6.1.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -52,9 +45,10 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
+    cocoapods-disable-podfile-validations (0.2.0)
     cocoapods-downloader (1.6.3)
-    cocoapods-generate (2.2.2)
-      cocoapods-disable-podfile-validations (~> 0.1.1)
+    cocoapods-generate (2.2.3)
+      cocoapods-disable-podfile-validations (>= 0.1.1, < 0.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -63,7 +57,7 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.0)
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
@@ -72,10 +66,10 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
-    minitest (5.15.0)
+    minitest (5.17.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -85,7 +79,7 @@ GEM
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -94,14 +88,13 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cocoapods
-  cocoapods-disable-podfile-validations!
   cocoapods-generate
   cocoapods-trunk (>= 1.6.0)
 

Package.swift

@@ -1,13 +1,13 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Workflow",
     platforms: [
-        .iOS("11.0"),
-        .macOS("10.13"),
+        .iOS("14.0"),
+        .macOS("10.15"),
     ],
     products: [
         // MARK: Workflow
@@ -75,11 +75,18 @@ let package = Package(
             name: "WorkflowConcurrencyTesting",
             targets: ["WorkflowConcurrencyTesting"]
         ),
+
+        // MARK: ViewEnvironment
+
+        .library(
+            name: "ViewEnvironment",
+            targets: ["ViewEnvironment"]
+        ),
     ],
     dependencies: [
         .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "7.1.1"),
         .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.2.0"),
-        .package(url: "https://github.com/nicklockwood/SwiftFormat", .exact("0.44.14")),
+        .package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.44.14"),
     ],
     targets: [
         // MARK: Workflow
@@ -109,7 +116,7 @@ let package = Package(
 
         .target(
             name: "WorkflowUI",
-            dependencies: ["Workflow"],
+            dependencies: ["Workflow", "ViewEnvironment"],
             path: "WorkflowUI/Sources"
         ),
         .testTarget(
@@ -214,6 +221,13 @@ let package = Package(
             dependencies: ["WorkflowConcurrencyTesting"],
             path: "WorkflowConcurrency/TestingTests"
         ),
+
+        // MARK: ViewEnvironment
+
+        .target(
+            name: "ViewEnvironment",
+            path: "ViewEnvironment/Sources"
+        ),
     ],
     swiftLanguageVersions: [.v5]
 )

RELEASING.md

@@ -17,7 +17,7 @@ For Squares, membership is managed through the `Workflow Swift Owners` registry
 
 > ⚠️ [Optional] To avoid possible headaches when publishing podspecs, validation can be performed before updating the Workflow version number(s). To do this, run the following in the root directory of this repo:
 > ```bash
-> bundle exec pod lib lint Workflow.podspec WorkflowTesting.podspec WorkflowReactiveSwift.podspec WorkflowUI.podspec WorkflowRxSwift.podspec WorkflowReactiveSwiftTesting.podspec WorkflowRxSwiftTesting.podspec WorkflowSwiftUI.podspec WorkflowCombine.podspec WorkflowCombineTesting.podspec
+> bundle exec pod lib lint Workflow.podspec WorkflowTesting.podspec WorkflowReactiveSwift.podspec WorkflowUI.podspec WorkflowRxSwift.podspec WorkflowReactiveSwiftTesting.podspec WorkflowRxSwiftTesting.podspec WorkflowSwiftUI.podspec WorkflowCombine.podspec WorkflowCombineTesting.podspec ViewEnvironment.podspec
 > ```
 > And then run a similar command to check the `WorkflowConcurrency*` libraries. These specs will fail default validation as their version differs from the git tag used, so run the command with the `--allow-warnings` option, and check that only that warning is produced.
 > ```bash
@@ -40,6 +40,7 @@ For Squares, membership is managed through the `Workflow Swift Owners` registry
     bundle exec pod trunk push Workflow.podspec --synchronous
     bundle exec pod trunk push WorkflowTesting.podspec  --synchronous
     bundle exec pod trunk push WorkflowReactiveSwift.podspec --synchronous
+    bundle exec pod trunk push ViewEnvironment.podspec --synchronous
     bundle exec pod trunk push WorkflowUI.podspec --synchronous
     bundle exec pod trunk push WorkflowRxSwift.podspec --synchronous
     bundle exec pod trunk push WorkflowReactiveSwiftTesting.podspec --synchronous

Samples/AlertContainer/AlertContainer.podspec

@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   # 1.7 is needed for `swift_versions` support
   s.cocoapods_version = '>= 1.7.0' 
 
-  s.swift_versions = ['5.0']
-  s.ios.deployment_target = '11.0'
+  s.swift_versions = [WORKFLOW_SWIFT_VERSION]
+  s.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET
 
   s.source_files = 'Sources/**/*.swift'
 

Samples/BackStackContainer/BackStackContainer.podspec

@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   # 1.7 is needed for `swift_versions` support
   s.cocoapods_version = '>= 1.7.0'
 
-  s.swift_versions = ['5.0']
-  s.ios.deployment_target = '11.0'
+  s.swift_versions = [WORKFLOW_SWIFT_VERSION]
+  s.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET
 
   s.source_files = 'Sources/**/*.{swift}'
 

Samples/ModalContainer/ModalContainer.podspec

@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   # 1.7 is needed for `swift_versions` support
   s.cocoapods_version = '>= 1.7.0' 
 
-  s.swift_versions = ['5.0']
-  s.ios.deployment_target = '11.0'
+  s.swift_versions = [WORKFLOW_SWIFT_VERSION]
+  s.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET
 
   s.source_files = 'Sources/**/*.swift'
 

Samples/ModalContainer/Sources/ModalContainerViewController.swift

@@ -162,10 +162,8 @@ internal final class ModalContainerViewController<ModalScreen: Screen>: ScreenVi
 
         setNeedsStatusBarAppearanceUpdate()
 
-        if #available(iOS 11.0, *) {
-            setNeedsUpdateOfHomeIndicatorAutoHidden()
-            setNeedsUpdateOfScreenEdgesDeferringSystemGestures()
-        }
+        setNeedsUpdateOfHomeIndicatorAutoHidden()
+        setNeedsUpdateOfScreenEdgesDeferringSystemGestures()
 
         // Set the topmost screen to be the accessibility modal
         presentedScreens.last?.viewController.view.accessibilityViewIsModal = true