Trying to keep up with forked one

.circleci/config.yml

@@ -4,53 +4,56 @@
 version: 2.1
 
 anchors: 
-  - &test_device "iPhone Xs"
+  - &test_device "iPhone 16"
+  - &test_device_os "18.0"
   - &clean_before_build true
   - &test_output_folder test_output
   - &default_executor
     macos:
-      xcode: "11.4.0"
+      xcode: "16.0.0"
 
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
 
 commands:
-  fetch-pod-specs:
-    steps:
-      - run:
-          name: Fetch CocoaPods Specs
-          command: |
-            curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
-
   pod-install:
     parameters:
       path:
         type: string
     steps:
-      - fetch-pod-specs # Fetch the podspec repo changes first to be sure to always get the latest pods
       - run:
           command: | 
             cd <<parameters.path>>
             pod install --verbose
 
-  carthage-update:
-    steps:
-      - run: carthage update Flow --cache-builds
-
   test_main_project:
+    parameters:
+      simulator:
+        type: string
+        default: *test_device
+      os_version:
+        type: string
+        default: *test_device_os
     steps:
       - checkout
-      - carthage-update
       - test_project_and_store_results:
           project: "Presentation.xcodeproj"
           scheme: "Presentation"
+          simulator: <<parameters.simulator>>
+          os_version: <<parameters.os_version>>
 
   test_example_project:
     parameters:
       path: # We need to pass a path here because the example projects are in a sub folder of the project
         type: string
+      simulator:
+        type: string
+        default: *test_device
+      os_version:
+        type: string
+        default: *test_device_os
     steps:
       - checkout
       - pod-install:
@@ -60,6 +63,8 @@ commands:
           scheme: "Example"
           path: <<parameters.path>>
           test_output_folder: *test_output_folder
+          simulator: <<parameters.simulator>>
+          os_version: <<parameters.os_version>>
 
   # We introduced two separate commands for projects and workspaces because we didnt find a generic and non-confusing way to introduce 
   # a condition to only pass either the project or the workspace environment argument to the fastlane scan
@@ -70,14 +75,21 @@ commands:
         type: string
       scheme:
         type: string
+      simulator:
+        type: string
+        default: *test_device
+      os_version:
+        type: string
+        default: *test_device_os
     steps:
       - run:
-          command: fastlane scan
-          environment:
-              SCAN_PROJECT: <<parameters.project>>
-              SCAN_SCHEME: <<parameters.scheme>>
-              SCAN_DEVICE: *test_device
-              SCAN_CLEAN: *clean_before_build
+          name: Run tests on iOS <<parameters.os_version>>
+          command: |
+            xcodebuild -scheme <<parameters.scheme>> \
+                        -project <<parameters.project>> \
+                        -destination "platform=iOS Simulator,OS=<<parameters.os_version>>,name=<<parameters.simulator>>" \
+                        clean build test \
+                        | xcpretty --report junit --output 'test_output/report.junit'
       - store_artifacts: # This will by default store an html and junit file as artifacts (See "Artifacts" tab in CircleCI report)
           path: *test_output_folder # test_output is the default temporary folder for fastlane scan output
           destination: *test_output_folder # This will create a sub structure in the artifacts section in CircleCI
@@ -95,66 +107,95 @@ commands:
         type: string
       test_output_folder:
         type: string
+      simulator:
+        type: string
+        default: *test_device
+      os_version:
+        type: string
+        default: *test_device_os
     steps:
       - run:
-          command:  |
+          name: Run tests on iOS <<parameters.os_version>>
+          command: |
             cd <<parameters.path>>
-            fastlane scan
-          environment:
-              SCAN_WORKSPACE: <<parameters.workspace>>
-              SCAN_SCHEME: <<parameters.scheme>>
-              SCAN_DEVICE: *test_device
-              SCAN_CLEAN: *clean_before_build
+            xcodebuild -scheme <<parameters.scheme>> \
+                        -workspace <<parameters.workspace>> \
+                        -destination "platform=iOS Simulator,OS=<<parameters.os_version>>,name=<<parameters.simulator>>" \
+                        clean build test \
+                        | xcpretty --report junit --output '<<parameters.path>>/<<parameters.test_output_folder>>/report.junit'
       - store_artifacts: # This will by default store an html and junit file as artifacts (See "Artifacts" tab in CircleCI report)
           path: <<parameters.path>>/<<parameters.test_output_folder>> # test_output is the default temporary folder for fastlane scan output
           destination: <<parameters.test_output_folder>> # This will create a sub structure in the artifacts section in CircleCI
       - store_test_results: # This will store the test results so you can then see them in the "Test Summary" tab in CircleCI report
           path: <<parameters.path>>/<<parameters.test_output_folder>>
 
 jobs:
-  swiftlint: # This is a job and not a command to be able to add it as a work flow step
+  swiftlint:
+    parameters:
+      version:
+        type: string
     <<: *default_executor
     steps:
+      - attach_workspace:
+          at: .
       - checkout
       - run:
-          name: Install swiftlint(0.35.0)
+          name: Install SwiftLint(<< parameters.version >>)
+          command: |
+            curl -L -k -o /Users/distiller/Downloads/SwiftLint.pkg https://github.com/realm/SwiftLint/releases/download/<< parameters.version >>/SwiftLint.pkg
+            sudo installer -pkg /Users/distiller/Downloads/SwiftLint.pkg -target /
+      # Run SwiftLint.
+      - run:
+          name: Lint Codebase
           command: |
-            brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/ab64b13d26a3f8617689e3bc7e73a209d11f1bc8/Formula/swiftlint.rb
-      - run: swiftlint version && swiftlint --strict --reporter html > swiftlint.html
+            swiftlint version && swiftlint --strict --reporter html > swiftlint.html
       - store_artifacts:
           path: swiftlint.html
           destination: swiftlint.html
+      - store_test_results:
+          path: swiftlint.html
 
-  test-xcode10-ios12:
-    macos:
-      xcode: "10.3.0"
-    steps:
-      - test_main_project
-
-  test-xcode11-ios13:
+  test-xcode16-ios18:
     <<: *default_executor
     steps:
       - test_main_project
 
+  test-xcode15-ios17:
+    macos:
+      xcode: "15.4.0"
+    steps:
+      - test_main_project:
+          simulator: "iPhone 15"
+          os_version: "17.5"
+
   test-example-messages:
-    <<: *default_executor
+    macos:
+      xcode: "16.0.0"
     steps:
       - test_example_project:
           path: Examples/Messages
+          simulator: "iPhone 16"
+          os_version: "18.0"
 
   test-example-styles-and-options:
-    <<: *default_executor
+    macos:
+      xcode: "16.0.0"
     steps:
       - test_example_project:
           path: Examples/StylesAndOptions
+          simulator: "iPhone 16"
+          os_version: "18.0"
 
 workflows:
   version: 2.1
   build-and-test:
     jobs:
-      - swiftlint
-      - test-xcode10-ios12
-      - test-xcode11-ios13
+      - swiftlint:
+          version: 0.52.2
+      - test-xcode16-ios18
+      - test-xcode15-ios17
       - test-example-messages
-      - test-example-styles-and-options
+      # Temporary disabled need to be addressed, there are issues in Flow that might fix this thouh example failiure bellow
+      # https://app.circleci.com/pipelines/github/iZettle/Presentation/312/workflows/f408abd8-d1ec-46d9-af4d-63f2eb794869/jobs/1195
+      # - test-example-styles-and-options
 

.swiftlint.yml

@@ -14,6 +14,8 @@ disabled_rules:
   - vertical_whitespace
   - identifier_name
 
+  - inclusive_language
+
 included:
   - Presentation
   - PresentationTests

CHANGELOG.md

@@ -1,3 +1,42 @@
+# 1.18.0
+- Support `Xcode 16`
+
+# 1.17.0
+- Save `json` files with `UIViewController` memory leak name
+
+# 1.16.0
+- Fix split view crash for iOS 17
+
+# 1.15.3
+- Support Xcode 15
+
+# 1.15.2
+- Xcode 13.2 compatibility
+- [Change] Replace `Carthage` with `SPM`
+
+# 1.15.1
+- Move to xcframeworks
+
+# 1.15.0
+
+- Xcode 13.0 compatibility
+
+# 1.14.0
+
+- Xcode 12.4 compatibility
+
+# 1.13.4
+- [Bug fix] Fix bug introduced in 1.13.3 where a view controller might be configured with dismiss twice when passed to `modalPresentationDismissalSetup`.
+
+# 1.13.3
+- [Bug fix] Fix bug related to presenting a `UINavigationController` modally without an explicit root `UIViewController`, resulting in unexpected behaviour of `UITextField` input cursors.
+
+# 1.13.2
+- Update project settings for Xcode 12 and fix some deprecation warnings
+
+# 1.13.1
+- [Bug fix] Prevent a crash in sheet presentation style when a source view is not provided. 
+
 # 1.13.0
 - [Change] Move to Flow version 1.8.4
 - [Bugfix] Fix compile time error in `public extension SignalProvider where Value: Collection {` for swift 5.2

Examples/Messages/Example.xcodeproj/project.pbxproj

@@ -156,7 +156,7 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
 				LastUpgradeCheck = 0930;
-				ORGANIZATIONNAME = iZettle;
+				ORGANIZATIONNAME = "PayPal Inc.";
 				TargetAttributes = {
 					722481CA20D161C20038787C = {
 						CreatedOnToolsVersion = 9.3;

Examples/Messages/Example/AppDelegate.swift

@@ -3,7 +3,7 @@
 //  Messages
 //
 //  Created by Måns Bernhardt on 2018-04-17.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import UIKit

Examples/Messages/Example/ComposeMessage.swift

@@ -3,7 +3,7 @@
 //  Messages
 //
 //  Created by Måns Bernhardt on 2018-04-19.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import UIKit

Examples/Messages/Example/MessageDetails.swift

@@ -3,7 +3,7 @@
 //  Messages
 //
 //  Created by Måns Bernhardt on 2018-04-19.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import UIKit

Examples/Messages/Example/Messages.swift

@@ -3,7 +3,7 @@
 //  Messages
 //
 //  Created by Måns Bernhardt on 2018-04-19.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import UIKit

Examples/Messages/ExampleUITests/ExampleUITests.swift

@@ -3,7 +3,7 @@
 //  ExampleUITests
 //
 //  Created by Nataliya Patsovska on 2018-06-13.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import XCTest

Examples/StylesAndOptions/Example.xcodeproj/project.pbxproj

@@ -154,7 +154,7 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
 				LastUpgradeCheck = 0930;
-				ORGANIZATIONNAME = iZettle;
+				ORGANIZATIONNAME = "PayPal Inc.";
 				TargetAttributes = {
 					7224818B20D14EB60038787C = {
 						CreatedOnToolsVersion = 9.3;

Examples/StylesAndOptions/Example/AppDelegate.swift

@@ -3,7 +3,7 @@
 //  Example
 //
 //  Created by Nataliya Patsovska on 2018-06-05.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import UIKit

Examples/StylesAndOptions/Example/AppFlow.swift

@@ -3,7 +3,7 @@
 //  Example
 //
 //  Created by Nataliya Patsovska on 2018-06-05.
-//  Copyright © 2018 iZettle. All rights reserved.
+//  Copyright © 2018 PayPal Inc. All rights reserved.
 //
 
 import UIKit
@@ -63,6 +63,10 @@ extension AppFlow: Presentable {
                 return containerController.present(Presentation(TestNavigationBarHiding(), style: .modal)).toVoid()
             }
 
+            if options.contains(.modalNavigationControllerFlow) {
+                return containerController.present(Presentation(TestNavigationControllerFlow(), style: .modal, configure: withDismiss))
+            }
+
             if options.contains(.allowSwipeDismissAlways) {
                 struct NavigationStack: Presentable {
                     func materialize() -> (UIViewController, Disposable) {