From 8d3bb4b2d267dc2b80188177f53b2183ad2f3d45 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 11 Mar 2024 13:58:47 -0700 Subject: [PATCH 1/7] fix: Default cocoapods to use Swift 5.10 (#159) * Update ParseSwiftOG.podspec * Update ParseSwiftOG.podtemplate * Update ci.yml * Update release.yml --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- ParseSwiftOG.podspec | 2 +- ParseSwiftOG.podtemplate | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4581cbabd..a91922aea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -176,4 +176,4 @@ jobs: - name: CocoaPods run: pod lib lint --allow-warnings env: - DEVELOPER_DIR: ${{ env.CI_XCODE_14 }} + DEVELOPER_DIR: ${{ env.CI_XCODE_LATEST }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2fcab53f7..92d38ffaf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: run: set -o pipefail && env NSUnbufferedIO=YES pod trunk push ParseSwiftOG.podspec --allow-warnings --verbose env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} - DEVELOPER_DIR: ${{ env.CI_XCODE_14 }} + DEVELOPER_DIR: ${{ env.CI_XCODE_LATEST }} docs: runs-on: macos-14 diff --git a/ParseSwiftOG.podspec b/ParseSwiftOG.podspec index fbfd23767..dc9a2f128 100644 --- a/ParseSwiftOG.podspec +++ b/ParseSwiftOG.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.15" s.tvos.deployment_target = "13.0" s.watchos.deployment_target = "6.0" - s.swift_versions = ['5.5', '5.6', '5.7', '5.8', '5.9'] + s.swift_versions = ['5.5', '5.6', '5.7', '5.8', '5.9', '5.10'] s.source_files = "Sources/ParseSwift/**/*.swift" s.license = { :type => "Apache 2.0", diff --git a/ParseSwiftOG.podtemplate b/ParseSwiftOG.podtemplate index e2a0ab724..084a14806 100644 --- a/ParseSwiftOG.podtemplate +++ b/ParseSwiftOG.podtemplate @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.15" s.tvos.deployment_target = "13.0" s.watchos.deployment_target = "6.0" - s.swift_versions = ['5.5', '5.6', '5.7', '5.8', '5.9'] + s.swift_versions = ['5.5', '5.6', '5.7', '5.8', '5.9', '5.10'] s.source_files = "Sources/ParseSwift/**/*.swift" s.license = { :type => "Apache 2.0", From 7b52e79f032cf11b7a862507e90c8d747d6607da Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 11 Mar 2024 17:59:53 -0700 Subject: [PATCH 2/7] fix: Build for visionOS (#160) * fix: Build for visionOS when adding in Xcode workspace * Update changelog * fix build constant --- CHANGELOG.md | 14 +++++++++++--- ParseSwift.xcodeproj/project.pbxproj | 10 ++++++---- Sources/ParseSwift/ParseConstants.swift | 4 +++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1b4b7f6e..f4bbce182 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,17 @@ # Parse-Swift Changelog ### main -[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.0...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift) +[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.1...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift) * _Contributing to this repo? Add info about your change here to be included in the next release_ + +### 5.9.1 +[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.0...5.9.1), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.1/documentation/parseswift) + +__Fixes__ +* Build for visionOS properly ([#160](https://github.com/netreconlab/Parse-Swift/pull/160)), thanks to [Corey Baker](https://github.com/cbaker6). +* Cocoapods now defaults to Swift 5.10 ([#159](https://github.com/netreconlab/Parse-Swift/pull/159)), thanks to [Corey Baker](https://github.com/cbaker6). + ### 5.9.0 [Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.8.2...5.9.0), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.0/documentation/parseswift) @@ -14,8 +22,8 @@ __New features__ * Add fetchAll method to array of Parse Pointer Object's ([#141](https://github.com/netreconlab/Parse-Swift/pull/141)), thanks to [Corey Baker](https://github.com/cbaker6). __Fixes__ -* Improve mutiple types conformance to Equatable and Hashable ([#148](https://github.com/netreconlab/Parse-Swift/pull/147)), thanks to [Corey Baker](https://github.com/cbaker6). -* Updates to ParseUser password now persist the updated sessionToken from the server to the client Keychain ([#147](https://github.com/netreconlab/Parse-Swift/pull/148)), thanks to [Corey Baker](https://github.com/cbaker6). +* Improve mutiple types conformance to Equatable and Hashable ([#148](https://github.com/netreconlab/Parse-Swift/pull/148)), thanks to [Corey Baker](https://github.com/cbaker6). +* Updates to ParseUser password now persist the updated sessionToken from the server to the client Keychain ([#147](https://github.com/netreconlab/Parse-Swift/pull/147)), thanks to [Corey Baker](https://github.com/cbaker6). ### 5.8.2 [Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.8.1...5.8.2), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.8.2/documentation/parseswift) diff --git a/ParseSwift.xcodeproj/project.pbxproj b/ParseSwift.xcodeproj/project.pbxproj index 401e246f9..d529806d3 100644 --- a/ParseSwift.xcodeproj/project.pbxproj +++ b/ParseSwift.xcodeproj/project.pbxproj @@ -1923,6 +1923,7 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 6.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; }; @@ -1987,6 +1988,7 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 6.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; }; @@ -2014,7 +2016,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.ParseSwift; PRODUCT_NAME = ParseSwift; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -2049,7 +2051,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.ParseSwift; PRODUCT_NAME = ParseSwift; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -2080,7 +2082,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xrsimulator xros"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; @@ -2109,7 +2111,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xrsimulator xros"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift index 3ce48003d..133c1cab3 100644 --- a/Sources/ParseSwift/ParseConstants.swift +++ b/Sources/ParseSwift/ParseConstants.swift @@ -10,7 +10,7 @@ import Foundation enum ParseConstants { static let sdk = "swift" - static let version = "5.9.0" + static let version = "5.9.1" static let fileManagementDirectory = "parse/" static let fileManagementPrivateDocumentsDirectory = "Private Documents/" static let fileManagementLibraryDirectory = "Library/" @@ -26,6 +26,8 @@ enum ParseConstants { static let deviceType = "tvos" #elseif os(watchOS) static let deviceType = "applewatch" + #elseif os(visionOS) + static let deviceType = "visionos" #elseif os(Linux) static let deviceType = "linux" #elseif os(Android) From 0485a6b67f8d5604bef76849d17152fab31b2497 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 11 Mar 2024 18:29:51 -0700 Subject: [PATCH 3/7] ci: fix repo documentation deployment (#161) --- Scripts/generate-documentation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/generate-documentation b/Scripts/generate-documentation index 6fb6435b2..38e777b9b 100755 --- a/Scripts/generate-documentation +++ b/Scripts/generate-documentation @@ -102,7 +102,7 @@ cd "$PROJECT_ROOT" mkdir "$TEMP_WORKSPACE_DIR" mv Parse.xcworkspace "$TEMP_WORKSPACE_DIR/Parse.xcworkspace" -xcodebuild clean build -scheme ParseSwift\ \(iOS\) \ +xcodebuild clean build -scheme ParseSwift \ -destination generic/platform=iOS \ OTHER_SWIFT_FLAGS="-emit-symbol-graph -emit-symbol-graph-dir '$SGFS_DIR'" | xcpretty From 702ca34b47a9512d39cc24d4b5b540391bcafea5 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 11 Mar 2024 23:06:50 -0700 Subject: [PATCH 4/7] fix: Querying using findAll may return inacurrate results (#162) * fix: Querying using findAll may return inacurrate results * nit * try watchOS test * revert --- CHANGELOG.md | 8 +++++++- Sources/ParseSwift/ParseConstants.swift | 2 +- Sources/ParseSwift/Types/Query.swift | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4bbce182..b4fbf3faf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ # Parse-Swift Changelog ### main -[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.1...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift) +[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.2...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift) * _Contributing to this repo? Add info about your change here to be included in the next release_ +### 5.9.2 +[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.1...5.9.2), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.2/documentation/parseswift) + +__Fixes__ +* Querying using findAll may be inacurrate when results are greater than the batch limit ([#161](https://github.com/netreconlab/Parse-Swift/pull/161)), thanks to [Corey Baker](https://github.com/cbaker6). + ### 5.9.1 [Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.0...5.9.1), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.1/documentation/parseswift) diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift index 133c1cab3..608421dd7 100644 --- a/Sources/ParseSwift/ParseConstants.swift +++ b/Sources/ParseSwift/ParseConstants.swift @@ -10,7 +10,7 @@ import Foundation enum ParseConstants { static let sdk = "swift" - static let version = "5.9.1" + static let version = "5.9.2" static let fileManagementDirectory = "parse/" static let fileManagementPrivateDocumentsDirectory = "Private Documents/" static let fileManagementLibraryDirectory = "Library/" diff --git a/Sources/ParseSwift/Types/Query.swift b/Sources/ParseSwift/Types/Query.swift index eaba88c44..07cdac0f0 100644 --- a/Sources/ParseSwift/Types/Query.swift +++ b/Sources/ParseSwift/Types/Query.swift @@ -584,6 +584,7 @@ extension Query: Queryable { var query = self .order([.ascending("objectId")]) query.limit = limit ?? ParseConstants.batchLimit + let originalQueryWhere = query.where var results = [ResultType]() var finished = false while !finished { @@ -593,8 +594,9 @@ extension Query: Queryable { results.append(contentsOf: currentResults) if currentResults.count >= query.limit { guard let lastObjectId = results[results.count - 1].objectId else { - throw ParseError(code: .otherCause, message: "Last object should have an id.") + throw ParseError(code: .otherCause, message: "Last object should have an objectId.") } + query.where = originalQueryWhere query.where.add("objectId" > lastObjectId) } else { finished = true From 9b7a9602f8a90538639f5e55116c35b4dbeb10dc Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 1 Apr 2024 08:52:48 -0700 Subject: [PATCH 5/7] fix: SDK does not properly wait for initialization (#168) * fix: SDK does not properly wait for initialization * add a change log entry * lint --- CHANGELOG.md | 8 ++++++- .../Protocols/ParseAuthentication.swift | 1 + .../Objects/ParseInstallation.swift | 21 ++++++++++++++++--- Sources/ParseSwift/Objects/ParseUser.swift | 14 +++++++++++++ Sources/ParseSwift/ParseConstants.swift | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4fbf3faf..299cdc265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ # Parse-Swift Changelog ### main -[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.2...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift) +[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.3...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift) * _Contributing to this repo? Add info about your change here to be included in the next release_ +### 5.9.3 +[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.2...5.9.3), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.3/documentation/parseswift) + +__Fixes__ +* Certain calls to the user or installation did not wait for the SDK to initialize causing a crash ([#163](https://github.com/netreconlab/Parse-Swift/pull/163)), thanks to [Corey Baker](https://github.com/cbaker6). + ### 5.9.2 [Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/5.9.1...5.9.2), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/5.9.2/documentation/parseswift) diff --git a/Sources/ParseSwift/Authentication/Protocols/ParseAuthentication.swift b/Sources/ParseSwift/Authentication/Protocols/ParseAuthentication.swift index 1d49181ec..698a3ad0f 100644 --- a/Sources/ParseSwift/Authentication/Protocols/ParseAuthentication.swift +++ b/Sources/ParseSwift/Authentication/Protocols/ParseAuthentication.swift @@ -420,6 +420,7 @@ public extension ParseUser { } internal func linkCommand(body: SignupLoginBody) async throws -> API.Command { + try await yieldIfNotInitialized() let currentStrippedUser = try await self.anonymous.strip() var body = body if var currentAuthData = currentStrippedUser.authData { diff --git a/Sources/ParseSwift/Objects/ParseInstallation.swift b/Sources/ParseSwift/Objects/ParseInstallation.swift index 00a95cd43..25a71f4cd 100644 --- a/Sources/ParseSwift/Objects/ParseInstallation.swift +++ b/Sources/ParseSwift/Objects/ParseInstallation.swift @@ -1230,10 +1230,25 @@ public extension ParseInstallation { - note: The default cache policy for this method is `.reloadIgnoringLocalCacheData`. If a developer desires a different policy, it should be inserted in `options`. */ - static func deleteObjCKeychain(options: API.Options = [], - callbackQueue: DispatchQueue = .main, - completion: @escaping (Result) -> Void) { + static func deleteObjCKeychain( // swiftlint:disable:this function_body_length + options: API.Options = [], + callbackQueue: DispatchQueue = .main, + completion: @escaping (Result) -> Void + ) { Task { + do { + try await yieldIfNotInitialized() + } catch { + let defaultError = ParseError( + code: .otherCause, + swift: error + ) + let parseError = error as? ParseError ?? defaultError + callbackQueue.async { + completion(.failure(parseError)) + } + return + } guard let objcParseKeychain = KeychainStore.objectiveC, // swiftlint:disable:next line_length let oldInstallationId: String = await objcParseKeychain.objectObjectiveC(forKey: "installationId") else { diff --git a/Sources/ParseSwift/Objects/ParseUser.swift b/Sources/ParseSwift/Objects/ParseUser.swift index 36588f118..882341fcd 100644 --- a/Sources/ParseSwift/Objects/ParseUser.swift +++ b/Sources/ParseSwift/Objects/ParseUser.swift @@ -186,6 +186,7 @@ public extension ParseUser { } internal static func setCurrent(_ newValue: Self?) async throws { + try await yieldIfNotInitialized() var currentContainer = await Self.currentContainer() if let newValue = newValue, let currentUser = currentContainer?.currentUser { @@ -438,6 +439,19 @@ extension ParseUser { callbackQueue: DispatchQueue = .main, completion: @escaping (Result) -> Void) { Task { + do { + try await yieldIfNotInitialized() + } catch { + let defaultError = ParseError( + code: .otherCause, + swift: error + ) + let parseError = error as? ParseError ?? defaultError + callbackQueue.async { + completion(.failure(parseError)) + } + return + } let objcParseKeychain = KeychainStore.objectiveC // swiftlint:disable:next line_length guard let objcParseUser: [String: String] = await objcParseKeychain?.objectObjectiveC(forKey: "currentUser"), diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift index 608421dd7..151ecf411 100644 --- a/Sources/ParseSwift/ParseConstants.swift +++ b/Sources/ParseSwift/ParseConstants.swift @@ -10,7 +10,7 @@ import Foundation enum ParseConstants { static let sdk = "swift" - static let version = "5.9.2" + static let version = "5.9.3" static let fileManagementDirectory = "parse/" static let fileManagementPrivateDocumentsDirectory = "Private Documents/" static let fileManagementLibraryDirectory = "Library/" From df1562915eb691fd153904033834b31808812232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 08:38:27 -0400 Subject: [PATCH 6/7] build(deps): bump compnerd/gha-setup-swift from 0.2.1 to 0.2.2 (#170) * build(deps): bump compnerd/gha-setup-swift from 0.2.1 to 0.2.2 Bumps [compnerd/gha-setup-swift](https://github.com/compnerd/gha-setup-swift) from 0.2.1 to 0.2.2. - [Release notes](https://github.com/compnerd/gha-setup-swift/releases) - [Commits](https://github.com/compnerd/gha-setup-swift/compare/v0.2.1...v0.2.2) --- updated-dependencies: - dependency-name: compnerd/gha-setup-swift dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update ci.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Corey --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a91922aea..ae065b157 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,14 +129,15 @@ jobs: uses: codecov/codecov-action@v3 with: env_vars: LINUX - fail_ci_if_error: true - + fail_ci_if_error: false + token: ${{ secrets.CODECOV_TOKEN }} + windows: timeout-minutes: 15 runs-on: windows-latest steps: - uses: actions/checkout@v4 - - uses: compnerd/gha-setup-swift@v0.2.1 + - uses: compnerd/gha-setup-swift@v0.2.2 with: branch: swift-5.10-release tag: 5.10-RELEASE From 077d4575b1328558eaad04518635ad244ca65e76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 10:20:20 -0400 Subject: [PATCH 7/7] build(deps): bump codecov/codecov-action from 3 to 4 (#158) * build(deps): bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update ci.yml * Update ci.yml * Update ci.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Corey --- .github/workflows/ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae065b157..a495d685b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,10 +58,11 @@ jobs: env: DEVELOPER_DIR: ${{ env.CI_XCODE_LATEST }} - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: ${{join(fromJSON(steps.coverage-files.outputs.files), ',')}} fail_ci_if_error: false + token: ${{ secrets.CODECOV_TOKEN }} env: DEVELOPER_DIR: ${{ env.CI_XCODE_LATEST }} @@ -91,11 +92,12 @@ jobs: env: DEVELOPER_DIR: ${{ env.CI_XCODE_LATEST }} - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: ${{join(fromJSON(steps.coverage-files.outputs.files), ',')}} env_vars: SPM fail_ci_if_error: false + token: ${{ secrets.CODECOV_TOKEN }} env: DEVELOPER_DIR: ${{ env.CI_XCODE_LATEST }} @@ -126,7 +128,7 @@ jobs: cat .codecov.yml | curl --data-binary @- https://codecov.io/validate llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/debug/ParseSwiftPackageTests.xctest -instr-profile .build/x86_64-unknown-linux-gnu/debug/codecov/default.profdata > info_linux.lcov - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: env_vars: LINUX fail_ci_if_error: false @@ -145,10 +147,11 @@ jobs: run: | swift build -v - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: env_vars: WINDOWSLATEST fail_ci_if_error: false + token: ${{ secrets.CODECOV_TOKEN }} docs: timeout-minutes: 10