Merge branch 'develop' into release/1.5.0

ww-tech · Jun 18, 2024 · 9391030 · 9391030
2 parents 8449118 + 1f3978d
commit 9391030
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 591 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -64,52 +64,50 @@ jobs:
         run: git clean -ffdxq
         if: always()
         continue-on-error: true
-
-  build-and-test-swiftpm:
-    runs-on: macos-latest
+
+  build-and-test-macOS-14:
+    runs-on: macos-14
+    strategy:
+      fail-fast: false
+      matrix:
+        xcode-version: [15.1,15.4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Install dependencies in Gemfile
         run: bundle install
+
+      - name: Install dependencies in Podfile
+        working-directory: Example
+        run: bundle exec pod update
 
       - name: Build and run tests
-        run: |
-          xcodebuild build \
-            -project "Example/SwiftPM/Lasso-SwiftPM/Lasso-SwiftPM.xcodeproj" \
-            -scheme "Lasso-SwiftPM" \
-            -destination "platform=iOS Simulator,name=iPhone 11"
+        working-directory: Example
+        run: bundle exec fastlane scan
+        env:
+          DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
 
       - name: Post job cleanup
         run: git clean -ffdxq
         if: always()
         continue-on-error: true
 
-  build-and-test-tuist:
-    runs-on: macos-latest
+  build-and-test-swiftpm:
+    runs-on: macos-14
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install tuist
-        run: curl -Ls https://install.tuist.io | bash
+        uses: actions/checkout@v2
 
-      - name: Clean
-        working-directory: Example
-        run: tuist clean
+      - name: Install dependencies in Gemfile
+        run: bundle install
 
-      - name: Fetch dependencies
-        working-directory: Example
-        run: tuist fetch
-
-      - name: Generate project
-        working-directory: Example
-        run: tuist generate --no-open
-
       - name: Build and run tests
-        working-directory: Example
-        run: tuist test
+        run: |
+          xcodebuild build \
+            -project "Example/SwiftPM/Lasso-SwiftPM/Lasso-SwiftPM.xcodeproj" \
+            -scheme "Lasso-SwiftPM" \
+            -destination "platform=iOS Simulator,name=iPhone 14,OS=17.4"
 
       - name: Post job cleanup
         run: git clean -ffdxq

diff --git a/Example/LassoTestUtilities_Tests/AssertionTimeoutTests.swift b/Example/LassoTestUtilities_Tests/AssertionTimeoutTests.swift
@@ -22,40 +22,6 @@ class AssertionTimeoutDefaultTests: XCTestCase {
 
     func test_default() throws {
         XCTAssertEqual(lassoAssertionTimeout, 5)
-
-        // given
-        let window = UIWindow()
-        window.makeKeyAndVisible()
-        let vc = LifeCycleController()
-        let nav = UINavigationController()
-        window.rootViewController = nav
-        waitForEvents(in: window)
-
-        assertThrowsError(
-            expr: {
-                // this should timeout
-                let _: LifeCycleController =
-                    try assertRoot(
-                        of: nav,
-                        when: {
-                            DispatchQueue.main.async {
-                                Thread.sleep(forTimeInterval: 5.5)
-                            }
-                            DispatchQueue.main.async {
-                                Thread.sleep(forTimeInterval: 1.1)
-                            }
-                            nav.viewControllers = [vc]
-                        },
-                        failTest: silent
-                    )
-            },
-            eval: {
-                switch $0 {
-                case WaitError.timedOut: ()
-                default: unexpectedErrorType()
-                }
-            }
-        )
     }
 
 }
@@ -66,30 +32,6 @@ class AssertionTimeoutOverrideTests: XCTestCase, AssertionTimeoutOverride {
 
     func test_override() throws {
         XCTAssertEqual(lassoAssertionTimeout, 2)
-
-        // given
-        let window = UIWindow()
-        window.makeKeyAndVisible()
-        let vc = LifeCycleController()
-        let nav = UINavigationController()
-        window.rootViewController = nav
-        waitForEvents(in: window)
-
-        // when / then
-        let result: LifeCycleController =
-            try assertRoot(
-                of: nav,
-                when: {
-                    DispatchQueue.main.async {
-                        Thread.sleep(forTimeInterval: 1.5)
-                    }
-                    DispatchQueue.main.async {
-                        Thread.sleep(forTimeInterval: 0.1)
-                    }
-                    nav.viewControllers = [vc]
-                }
-            )
-        XCTAssertTrue(result === vc)
     }
 
 }
diff --git a/Example/Podfile b/Example/Podfile
@@ -37,8 +37,8 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       version = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
-      unless version.nil? || Gem::Version.new(version) >= Gem::Version.new('11.0')
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      unless version.nil? || Gem::Version.new(version) >= Gem::Version.new('13.0')
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
       end
     end
   end

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,8 +1,8 @@
 PODS:
-  - Lasso (1.4.0)
-  - LassoTestUtilities (1.4.0):
+  - Lasso (1.5.0)
+  - LassoTestUtilities (1.5.0):
     - Lasso
-  - SwiftLint (0.52.3)
+  - SwiftLint (0.55.1)
   - WWLayout (0.8.2)
 
 DEPENDENCIES:
@@ -23,11 +23,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Lasso: 6b474b0ef75cddc0a13fd58b6a0b80386b927b57
-  LassoTestUtilities: 26c19996a1cf871a678a210b3c8520ac8149ced1
-  SwiftLint: 76ec9c62ad369cff2937474cb34c9af3fa270b7b
+  Lasso: b9ed367584003a27ba2d8bab3268ff5a8ba1df17
+  LassoTestUtilities: 1df51ebf37646e189f16a304380fe3bb247f3374
+  SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
   WWLayout: 0ff533a6b9d0ae2ca2bdf91b6aefc04234b61f1b
 
-PODFILE CHECKSUM: 74199a1e5c276947123fc892760201c84ae04d37
+PODFILE CHECKSUM: 154645a3c6e2d02a8b8f73a56d99eca0ebf3713c
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.15.2