Merge pull request #127 from iZettle/update-to-run-with-xcode-15

Update CI config files to run on `Xcode 15`
iZettle · Dec 21, 2023 · 7ca2833 · 7ca2833
2 parents e3e935a + b102177
commit 7ca2833
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,8 @@ anchors:
   - &clean_before_build true
   - &default_executor
     macos:
-      xcode: "15.0.0"
+      xcode: "15.1.0"
+    resource_class: macos.m1.large.gen1
 
 env:
   global:
@@ -177,7 +178,6 @@ workflows:
       - swiftlint:
           version: 0.49.1
       - test-xcode14-ios16
-      # Disable untill we fix test for Xcode 15
-      # - test-xcode15-ios17
+      - test-xcode15-ios17
       - test-example-login
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
+# 1.11.1
+- Xcode 15.1 compatibility
+
 # 1.11.0
 - Add Compose and SwiftUI bridging functions
 
+# 1.10.3
+- Xcode 14.0 compatibility
+
 # 1.10.2
 - Specify type of the library for `spm` builds as `dynamic`
 

diff --git a/Flow.xcodeproj/project.pbxproj b/Flow.xcodeproj/project.pbxproj
@@ -638,7 +638,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -694,7 +694,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -718,7 +718,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 1.10.3;
+				MARKETING_VERSION = 1.11.1;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=300";
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Flow;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -746,7 +746,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 1.10.3;
+				MARKETING_VERSION = 1.11.1;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=300";
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Flow;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/FlowTests/SignalProviderTests.swift b/FlowTests/SignalProviderTests.swift
@@ -2530,23 +2530,23 @@ class SignalProviderStressTests: XCTestCase {
     }
 
     func testDebounce() {
-        runTest(timeout: 2) { bag in
+        runTest(timeout: 20) { bag in
             let signal = ReadWriteSignal(1)
 
             var result = [Int]()
-            bag += signal.debounce(0.2).atOnce().onValue {
+            bag += signal.debounce(2).atOnce().onValue {
                 result.append($0)
             }
 
             signal.value = 2
 
             let signals: [(TimeInterval, Int)] = [
-                (0.1, 3),
-                (0.2, 4),
-                (0.5, 5),
-                (0.6, 6),
-                (0.7, 7),
-                (1.0, 8),
+                (1, 3),
+                (2, 4),
+                (5, 5),
+                (6, 6),
+                (7, 7),
+                (10, 8),
                 ]
 
             for (time, value) in signals {
@@ -2556,7 +2556,7 @@ class SignalProviderStressTests: XCTestCase {
             }
 
             let e = expectation(description: "done")
-            Scheduler.main.async(after: 1.5) {
+            Scheduler.main.async(after: 15) {
                 e.fulfill()
                 XCTAssertEqual(result, [1, 4, 7, 8])
             }
@@ -2623,24 +2623,24 @@ class SignalProviderStressTests: XCTestCase {
     #endif
 
     func testThrottle() {
-        runTest(timeout: 2) { bag in
+        runTest(timeout: 20) { bag in
             let signal = ReadWriteSignal(1)
 
             var result = [Int]()
-            bag += signal.throttle(0.2).onValue {
+            bag += signal.throttle(2).onValue {
                 result.append($0)
             }
 
             signal.value = 2
 
             let signals: [(TimeInterval, Int)] = [
-                (0.1, 3),
-                (0.15, 4),
-                (0.3, 5),
-                (0.5, 6),
-                (0.55, 7),
-                (0.9, 8),
-                (0.95, 9),
+                (1, 3),
+                (1.5, 4),
+                (3, 5),
+                (5, 6),
+                (5.5, 7),
+                (9.0, 8),
+                (9.5, 9),
             ]
 
             for (time, value) in signals {
@@ -2650,7 +2650,7 @@ class SignalProviderStressTests: XCTestCase {
             }
 
             let e = expectation(description: "done")
-            Scheduler.main.async(after: 1.5) {
+            Scheduler.main.async(after: 15) {
                 e.fulfill()
                 XCTAssertEqual(result, [2, 4, 5, 7, 8, 9])
             }

diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 <img src="https://github.com/iZettle/Flow/blob/master/flow-logo.png?raw=true" height="140px" />
 
-[![Build Status](https://travis-ci.org/iZettle/Flow.svg?branch=master)](https://travis-ci.org/iZettle/Flow)
 [![Platforms](https://img.shields.io/badge/platform-%20iOS%20|%20macOS%20|%20tvOS%20|%20linux-gray.svg)](https://img.shields.io/badge/platform-%20iOS%20|%20macOS%20|%20tvOS%20|%20linux-gray.svg)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Swift Package Manager Compatible](https://img.shields.io/badge/SwiftPM-Compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
-![Xcode version](https://img.shields.io/badge/Xcode-13.2.0-green)
+![Xcode version](https://img.shields.io/badge/Xcode-15.1.0-green)
 
 Modern applications often contain complex asynchronous flows and life cycles. Flow is a Swift library aiming to simplify building these by solving three main problems: