Merge remote-tracking branch 'origin/main' into philprime/file-io-tra…

…cking-fix

.github/last-release-runid

@@ -1 +1 @@
-13055337413
+13310146035

.github/workflows/build.yml

@@ -213,7 +213,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Debug
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -231,7 +231,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Release
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -249,7 +249,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Debug
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -267,7 +267,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Release
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release ${{ github.event.inputs.version }}
 on:
   workflow_dispatch:
     inputs:
@@ -45,7 +45,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2
+        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/test.yml

@@ -15,7 +15,7 @@ on:
       - "fastlane/**"
       - "scripts/tests-with-thread-sanitizer.sh"
       - "scripts/ci-select-xcode.sh"
-      - "scripts/xcode-test.sh"
+      - "scripts/sentry-xcodebuild.sh"
       - ".codecov.yml"
       - Sentry.xcodeproj
 
@@ -186,7 +186,7 @@ jobs:
       - name: Build tests
         id: build_tests
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform ${{matrix.platform}} \
             --os ${{matrix.test-destination-os}} \
             --ref ${{ github.ref_name }} \
@@ -201,7 +201,7 @@ jobs:
         # because GitHub Actions don't provide an easy way of
         # manipulating string in expressions.
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform ${{matrix.platform}} \
             --os ${{matrix.test-destination-os}} \
             --ref ${{ github.ref_name }} \

.github/workflows/ui-tests-critical.yml

@@ -67,10 +67,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Create ${{matrix.device}} (${{matrix.os-version}}) Simulator using Xcode ${{matrix.xcode}}
         run: ./scripts/create-simulator.sh "${{matrix.xcode}}" "${{matrix.os-version}}" "${{matrix.device}}" "${{matrix.force-sim-runtime}}"
-      - name: Install Maestro
-        run: brew tap mobile-dev-inc/tap && brew install mobile-dev-inc/tap/[email protected]
-      - name: Install iDB Companion
-        run: brew tap facebook/fb && brew install facebook/fb/idb-companion
+      - name: Install tooling
+        run: make init-ci-test
 
       - uses: actions/download-artifact@v4
         with:

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

Brewfile

@@ -3,3 +3,4 @@ brew 'swiftlint'
 brew 'pre-commit'
 brew 'python3'
 brew 'xcbeautify'
+brew 'rbenv'

Brewfile-ci-deploy

@@ -0,0 +1 @@
+brew 'carthage'

Brewfile-ci → Brewfile-ci-test

@@ -2,5 +2,3 @@ tap 'facebook/fb'
 brew 'facebook/fb/idb-companion'
 tap 'mobile-dev-inc/tap'
 brew 'mobile-dev-inc/tap/maestro'
-brew 'carthage'
-brew 'rbenv'

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 8.45.0
 
 ### Features
 
@@ -22,6 +22,7 @@
 
 - Fix missing `sample_rate` in baggage (#4751)
 - Serializing SentryGeo with `nil` values (#4724)
+- Add type-safety for screenshots result array (#4843)
 
 ### Internal
 

Makefile

@@ -3,15 +3,21 @@ init:
 	which brew || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 	brew bundle
 	pre-commit install
-	clang-format --version | awk '{print $$3}' > scripts/.clang-format-version
-	swiftlint version > scripts/.swiftlint-version
-
-# installs the tools needed to test various CI tasks locally
-init-ci: init
-	brew bundle --file Brewfile-ci
 	rbenv install --skip-existing
 	rbenv exec gem update bundler
 	rbenv exec bundle install
+	clang-format --version | awk '{print $$3}' > scripts/.clang-format-version
+	swiftlint version > scripts/.swiftlint-version
+
+# installs the tools needed to run CI test tasks locally
+.PHONY: init-ci-test
+init-ci-test:
+	brew bundle --file Brewfile-ci-test
+
+# installs the tools needed to run CI deploy tasks locally (note that carthage is preinstalled in github actions)
+.PHONY: init-ci-deploy
+init-ci-deploy:
+	brew bundle --file Brewfile-ci-deploy
 
 .PHONY: check-versions
 check-versions:
@@ -41,7 +47,7 @@ GIT-REF := $(shell git rev-parse --abbrev-ref HEAD)
 
 test:
 	@echo "--> Running all tests"
-	./scripts/xcode-test.sh --platform iOS --os latest --ref $(GIT-REF) --command test --configuration Test
+	./scripts/sentry-xcodebuild.sh --platform iOS --os latest --ref $(GIT-REF) --command test --configuration Test
 	./scripts/xcode-slowest-tests.sh
 .PHONY: test
 

Package.swift

@@ -12,13 +12,13 @@ let package = Package(
     targets: [
         .binaryTarget(
                     name: "Sentry",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.44.0/Sentry.xcframework.zip",
-                    checksum: "78388f70054b713bf251ab6df61f2b7b900c093cbfb23c91cc91b52f26016a8b" //Sentry-Static
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.45.0/Sentry.xcframework.zip",
+                    checksum: "03789c7a610c4d9aebb36804a8d5521084cc7459e0333ff7be2d3c380b3d405a" //Sentry-Static
                 ),
         .binaryTarget(
                     name: "Sentry-Dynamic",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.44.0/Sentry-Dynamic.xcframework.zip",
-                    checksum: "28ece75e6a8e0e0f5ed00ff4b7ef3a7dcc379747239f9a1aded9838e6a0a0dc6" //Sentry-Dynamic
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.45.0/Sentry-Dynamic.xcframework.zip",
+                    checksum: "7bd0ec34705400853ceb99816a801b82251a18ea8f0ba5bce1366c7c2a61eacf" //Sentry-Dynamic
                 ),
         .target ( name: "SentrySwiftUI",
                   dependencies: ["Sentry", "SentryInternal"],

Samples/.swiftlint.yml

@@ -8,3 +8,8 @@ disabled_rules:
   - object_literal
   - private_outlet
   - unused_optional_binding
+
+  # This rule allows UIViewControllers to have only 250 lines of code. The argument is that you should
+  # extract business logic into extra classes. We deliberately turn this off because the extra classes
+  # could make our samples harder to read, and our business logic is simple.
+  - type_body_length