Skip to content

Updated for Swift 6. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dave-kr merged 2 commits into from
Jan 9, 2025
Merged

Updated for Swift 6. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f499d
Updated for Swift 6.
dave-kr Jan 8, 2025
caba462
Updated CI
dave-kr Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DemoApp/DemoApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version: 6.0

import PackageDescription

Expand Down
2 changes: 2 additions & 0 deletions Tests/TelemetryTests/Relay/PublisherRelayTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Combine
import Telemetry
import XCTest

@MainActor
final class PublisherRelayTestCase: XCTestCase {
func testPublisher() throws {
// Given
Expand All @@ -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()
Expand Down
1 change: 1 addition & 0 deletions Tests/TelemetryTests/Telemeter/StandardTelemeterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import Foundation
import Gauntlet
import XCTest

@MainActor
class StandardTelemeterTestCase: XCTestCase {

func testInitialization() {
Expand Down
1 change: 1 addition & 0 deletions Tests/TelemetryTests/Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).")
Expand Down
Loading