diff --git a/.github/workflows/build-xcframework-variant-slices.yml b/.github/workflows/build-xcframework-variant-slices.yml index 5f7fc21c2ee..c4f695e045d 100644 --- a/.github/workflows/build-xcframework-variant-slices.yml +++ b/.github/workflows/build-xcframework-variant-slices.yml @@ -67,12 +67,8 @@ jobs: steps: - uses: actions/checkout@v4 - # We have to compile on Xcode 15.2 because compiling on Xcode 15.4 fails with - # Data+SentryTracing.swift:21:62: error: 'ReadingOptions' aliases 'Foundation.ReadingOptions' - # and cannot be used here because C++ types from imported module 'Foundation' do not support - # library evolution; this is an error in the Swift 6 language mode - # We also can't use Xcode 16.x because validating the XCFramework then fails with Xcode 15.x. - - run: ./scripts/ci-select-xcode.sh 15.2 + # We can't use Xcode 16.x because validating the XCFramework then fails with Xcode 15.x. + - run: ./scripts/ci-select-xcode.sh 15.4 shell: bash - name: Get version @@ -98,9 +94,7 @@ jobs: - name: Bump version if: steps.cache-xcarchive.outputs.cache-hit != 'true' - run: | - ./scripts/ci-select-xcode.sh 15.2 - make bump-version TO=${{ env.VERSION }} + run: make bump-version TO=${{ env.VERSION }} - name: Build ${{inputs.name}}${{inputs.suffix}} XCFramework slice for ${{matrix.sdk}} if: steps.cache-xcarchive.outputs.cache-hit != 'true' diff --git a/Sources/Swift/Integrations/Performance/IO/Data+SentryTracing.swift b/Sources/Swift/Integrations/Performance/IO/Data+SentryTracing.swift index c72a764bdf8..94325fabfc0 100644 --- a/Sources/Swift/Integrations/Performance/IO/Data+SentryTracing.swift +++ b/Sources/Swift/Integrations/Performance/IO/Data+SentryTracing.swift @@ -18,7 +18,7 @@ public extension Data { /// - url: The location on disk of the data to read. /// - options: The mask specifying the options to use when reading the data. For more information, see ``NSData.ReadingOptions``. /// - Note: See ``Data.init(contentsOf:options:)`` for more information. - init(contentsOfWithSentryTracing url: URL, options: Data.ReadingOptions = []) throws { + init(contentsOfWithSentryTracing url: URL, options: Foundation.Data.ReadingOptions = []) throws { // Gets a tracker instance if the SDK is enabled, otherwise uses the original method. let method = { (url: URL, options: Data.ReadingOptions) throws -> Data in try Data(contentsOf: url, options: options) @@ -49,7 +49,7 @@ public extension Data { /// - url: The location to write the data into. /// - options: Options for writing the data. Default value is `[]`. /// - Note: See ``Data.write(to:options:)`` for more information. - func writeWithSentryTracing(to url: URL, options: Data.WritingOptions = []) throws { + func writeWithSentryTracing(to url: URL, options: Foundation.Data.WritingOptions = []) throws { // Gets a tracker instance if the SDK is enabled, otherwise uses the original method. let method = { (data: Data, url: URL, options: Data.WritingOptions) throws in try data.write(to: url, options: options)