diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1222896..a8e40ab 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -6,7 +6,7 @@ on: jobs: build: # runs-on: macOS-latest - runs-on: macos-13 + runs-on: macos-14 timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -20,7 +20,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} run: ./.github/scripts/signing.sh - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app + run: sudo xcrun xcode-select -s /Applications/Xcode_15.4.app - name: Update Build Number env: RUN_ID: ${{ github.run_id }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d55fef..a135203 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: test: # runs-on: macOS-latest - runs-on: macos-13 + runs-on: macos-14 timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -21,7 +21,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} run: ./.github/scripts/signing.sh - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app + run: sudo xcrun xcode-select -s /Applications/Xcode_15.4.app - name: Test run: | pushd Sources/Packages @@ -29,7 +29,7 @@ jobs: popd build: # runs-on: macOS-latest - runs-on: macos-13 + runs-on: macos-14 timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} run: ./.github/scripts/signing.sh - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app + run: sudo xcrun xcode-select -s /Applications/Xcode_15.4.app - name: Update Build Number env: TAG_NAME: ${{ github.ref }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82d5a14..74bc066 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,12 +4,12 @@ on: [push, pull_request] jobs: test: # runs-on: macOS-latest - runs-on: macos-13 + runs-on: macos-14 timeout-minutes: 10 steps: - uses: actions/checkout@v4 - name: Set Environment - run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app + run: sudo xcrun xcode-select -s /Applications/Xcode_15.4.app - name: Test run: | pushd Sources/Packages diff --git a/Sources/Packages/Package.swift b/Sources/Packages/Package.swift index 2e57cb5..9fa196a 100644 --- a/Sources/Packages/Package.swift +++ b/Sources/Packages/Package.swift @@ -34,7 +34,7 @@ let package = Package( .target( name: "SecretKit", dependencies: [], - swiftSettings: [.enableExperimentalFeature("StrictConcurrency"), .unsafeFlags(["-warnings-as-errors"])] + swiftSettings: [.unsafeFlags(["-warnings-as-errors"])] ), .testTarget( name: "SecretKitTests", diff --git a/Sources/Packages/Sources/SecretAgentKit/Agent.swift b/Sources/Packages/Sources/SecretAgentKit/Agent.swift index ed1654b..7209635 100644 --- a/Sources/Packages/Sources/SecretAgentKit/Agent.swift +++ b/Sources/Packages/Sources/SecretAgentKit/Agent.swift @@ -35,7 +35,7 @@ extension Agent { /// - writer: A ``FileHandleWriter`` to write the response to. /// - Return value: /// - Boolean if data could be read - @discardableResult @Sendable public func handle(reader: FileHandleReader, writer: FileHandleWriter) async -> Bool { + @discardableResult public func handle(reader: FileHandleReader, writer: FileHandleWriter) async -> Bool { logger.debug("Agent handling new data") let data = Data(reader.availableData) guard data.count > 4 else { return false} diff --git a/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift b/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift index d079bf3..19b6168 100644 --- a/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift +++ b/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift @@ -211,7 +211,7 @@ extension SecureEnclave.Store { /// Reloads all secrets from the store. /// - Parameter notifyAgent: A boolean indicating whether a distributed notification should be posted, notifying other processes (ie, the SecretAgent) to reload their stores as well. - @Sendable private func reloadSecretsInternal(notifyAgent: Bool = true) { + private func reloadSecretsInternal(notifyAgent: Bool = true) { let before = secrets secrets.removeAll() loadSecrets() diff --git a/Sources/Packages/Sources/SmartCardSecretKit/SmartCardStore.swift b/Sources/Packages/Sources/SmartCardSecretKit/SmartCardStore.swift index f6f83c8..c8c3281 100644 --- a/Sources/Packages/Sources/SmartCardSecretKit/SmartCardStore.swift +++ b/Sources/Packages/Sources/SmartCardSecretKit/SmartCardStore.swift @@ -117,7 +117,7 @@ extension SmartCard { extension SmartCard.Store { - @Sendable private func reloadSecretsInternal() { + private func reloadSecretsInternal() { self.isAvailable = self.tokenID != nil let before = self.secrets self.secrets.removeAll() diff --git a/Sources/Secretive.xcodeproj/project.pbxproj b/Sources/Secretive.xcodeproj/project.pbxproj index 2edcc53..1edd651 100644 --- a/Sources/Secretive.xcodeproj/project.pbxproj +++ b/Sources/Secretive.xcodeproj/project.pbxproj @@ -621,7 +621,6 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_STRICT_CONCURRENCY = targeted; }; name = Debug; }; @@ -681,7 +680,6 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_STRICT_CONCURRENCY = targeted; }; name = Release; }; @@ -709,7 +707,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Debug; @@ -738,7 +735,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Secretive - Host"; - SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Release; @@ -848,7 +844,6 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_STRICT_CONCURRENCY = targeted; }; name = Test; }; @@ -872,7 +867,6 @@ MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Test; @@ -917,7 +911,6 @@ MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Test; @@ -942,7 +935,6 @@ MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Debug; @@ -969,7 +961,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Secretive - Secret Agent"; - SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Release;