From d9b02a6111a10518a68b9d8afd954275186778fb Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Wed, 18 Sep 2024 18:26:46 +0200 Subject: [PATCH 1/3] Enabled Strict Concurrency Checking --- Package.swift | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 572bc96..99dc923 100644 --- a/Package.swift +++ b/Package.swift @@ -17,12 +17,19 @@ let package = Package( targets: [ .target( name: "YMFF", - dependencies: ["YMFFProtocols"] + dependencies: ["YMFFProtocols"], + swiftSettings: swiftSettings ), - .target(name: "YMFFProtocols"), + .target(name: "YMFFProtocols", swiftSettings: swiftSettings), .testTarget( name: "YMFFTests", - dependencies: ["YMFF"] + dependencies: ["YMFF"], + swiftSettings: swiftSettings ), ] ) + +fileprivate let swiftSettings: [SwiftSetting] = [ + .enableExperimentalFeature("StrictConcurrency"), + .enableUpcomingFeature("StrictConcurrency"), +] From 9d3ab59d95a4a5e640d44c70d1ab23021c24de58 Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Wed, 18 Sep 2024 18:28:31 +0200 Subject: [PATCH 2/3] Changed Default Xcode Path in GHA Workflows --- .github/workflows/Common.yml | 2 +- .github/workflows/Release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Common.yml b/.github/workflows/Common.yml index 11b69d8..0bdfcb3 100644 --- a/.github/workflows/Common.yml +++ b/.github/workflows/Common.yml @@ -16,7 +16,7 @@ on: type: boolean required: true env: - XCODE_PATH: "/Applications/Xcode_15.3.app" + XCODE_PATH: "/Applications/Xcode_16.0.app" jobs: spm_tests_macos: name: SPM Tests (Swift ${{ matrix.SWIFT_VERSION }} on macOS) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 791cde1..1802b44 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -3,7 +3,7 @@ on: release: types: [published] env: - XCODE_PATH: "/Applications/Xcode_15.3.app" + XCODE_PATH: "/Applications/Xcode_16.0.app" jobs: run_common_checks: uses: ./.github/workflows/Common.yml From b5019a24612111681792c2f71e6df2577b2a1b16 Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Wed, 18 Sep 2024 18:28:39 +0200 Subject: [PATCH 3/3] Added Swift 6 to GHA Workflow --- .github/workflows/Common.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Common.yml b/.github/workflows/Common.yml index 0bdfcb3..3950ddf 100644 --- a/.github/workflows/Common.yml +++ b/.github/workflows/Common.yml @@ -23,8 +23,11 @@ jobs: runs-on: ${{ matrix.OS }} strategy: matrix: - SWIFT_VERSION: ["5.10", "5.9"] + SWIFT_VERSION: ["6.0", "5.10", "5.9"] include: + - SWIFT_VERSION: "6.0" + OS: macos-14 + XCODE_APP_NAME: "Xcode_16.0" - SWIFT_VERSION: "5.10" OS: macos-14 XCODE_APP_NAME: "Xcode_15.3"