From 79f499dd8c67ef15d2a1877986b52d839946a290 Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Wed, 8 Jan 2025 10:22:47 -0800 Subject: [PATCH 1/2] Updated for Swift 6. --- CHANGELOG.md | 10 ++++++++++ DemoApp/DemoApp.xcodeproj/project.pbxproj | 4 ++-- Package.swift | 2 +- Tests/TelemetryTests/Relay/PublisherRelayTests.swift | 2 ++ .../Telemeter/StandardTelemeterTests.swift | 1 + Tests/TelemetryTests/Utils.swift | 1 + 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 567fc3b..1a3e943 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. `Telemetry` adheres to [Semantic Versioning](https://semver.org/). +## 1.3.0 + +### Added + +### Breaking Changes + +### Updated + +- Minor updates for Swift 6. + ## 1.2.0 ### Added diff --git a/DemoApp/DemoApp.xcodeproj/project.pbxproj b/DemoApp/DemoApp.xcodeproj/project.pbxproj index 3289b45..ec91ebe 100644 --- a/DemoApp/DemoApp.xcodeproj/project.pbxproj +++ b/DemoApp/DemoApp.xcodeproj/project.pbxproj @@ -332,7 +332,7 @@ RUN_DOCUMENTATION_COMPILER = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_STRICT_CONCURRENCY = complete; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -363,7 +363,7 @@ RUN_DOCUMENTATION_COMPILER = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_STRICT_CONCURRENCY = complete; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 1; }; name = Release; diff --git a/Package.swift b/Package.swift index 60cae43..6d46c24 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version: 6.0 import PackageDescription diff --git a/Tests/TelemetryTests/Relay/PublisherRelayTests.swift b/Tests/TelemetryTests/Relay/PublisherRelayTests.swift index 7638162..e90daf5 100644 --- a/Tests/TelemetryTests/Relay/PublisherRelayTests.swift +++ b/Tests/TelemetryTests/Relay/PublisherRelayTests.swift @@ -24,6 +24,7 @@ import Combine import Telemetry import XCTest +@MainActor final class PublisherRelayTestCase: XCTestCase { func testPublisher() throws { // Given @@ -36,6 +37,7 @@ final class PublisherRelayTestCase: XCTestCase { // When relay.publisher(of: SomeMetron.self) + .receive(on: DispatchQueue.main) .sink { value in receivedMetron = value expect.fulfill() diff --git a/Tests/TelemetryTests/Telemeter/StandardTelemeterTests.swift b/Tests/TelemetryTests/Telemeter/StandardTelemeterTests.swift index 746c212..1e9071d 100644 --- a/Tests/TelemetryTests/Telemeter/StandardTelemeterTests.swift +++ b/Tests/TelemetryTests/Telemeter/StandardTelemeterTests.swift @@ -25,6 +25,7 @@ import Foundation import Gauntlet import XCTest +@MainActor class StandardTelemeterTestCase: XCTestCase { func testInitialization() { diff --git a/Tests/TelemetryTests/Utils.swift b/Tests/TelemetryTests/Utils.swift index 7410081..8ae6dd9 100644 --- a/Tests/TelemetryTests/Utils.swift +++ b/Tests/TelemetryTests/Utils.swift @@ -26,6 +26,7 @@ import XCTest extension XCTestCase { /// Adds a work item to be invoked on the queue, then awaits until it is complete. + @MainActor func waitFor(queue: DispatchQueue, timeout: TimeInterval, function: StaticString = #function) { let expectation = expectation(description: "Expected \(queue.label) to complete in \(function).") From caba4620ebf2095c077283ddd81601e0e2ce449d Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Wed, 8 Jan 2025 12:57:38 -0800 Subject: [PATCH 2/2] Updated CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b70afd5..4a2dbdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,6 @@ on: jobs: build-and-test-ios: name: Build Telemetry iOS - uses: krogerco/Shared-CI-Workflow-iOS/.github/workflows/build.yml@v1.2.0 + uses: krogerco/Shared-CI-Workflow-iOS/.github/workflows/build.yml@v2 with: FILENAME: Telemetry.xcworkspace