Skip to content

Commit 2d3b0ce

Browse files
authored
Merge branch 'main' into philprime/objc-wrapper-sdk-6342
2 parents beb048f + 8d9e501 commit 2d3b0ce

File tree

57 files changed

+296
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+296
-124
lines changed

.github/workflows/auto-update-tools.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,17 @@ jobs:
6161
needs: files-changed
6262
runs-on: macos-15
6363
steps:
64+
- name: Generate GitHub App Token
65+
id: app_token
66+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
67+
with:
68+
app-id: ${{ vars.SENTRY_DEPENDENCY_UPDATER_GITHUB_APP_ID }}
69+
private-key: ${{ secrets.SENTRY_DEPENDENCY_UPDATER_GITHUB_APP_PRIVATE_KEY }}
70+
owner: ${{ github.repository_owner }}
6471
- name: Checkout Repository
6572
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
73+
with:
74+
token: ${{ steps.app_token.outputs.token }}
6675
- name: Update Homebrew
6776
run: brew update
6877

@@ -84,6 +93,7 @@ jobs:
8493
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
8594
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
8695
with:
96+
token: ${{ steps.app_token.outputs.token }}
8797
add-paths: scripts/.clang-format-version
8898
branch: github-actions/auto-update-tools-clang-format
8999
commit-message: "chore(deps): Update clang-format version"
@@ -96,6 +106,7 @@ jobs:
96106
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
97107
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
98108
with:
109+
token: ${{ steps.app_token.outputs.token }}
99110
add-paths: scripts/.swiftlint-version
100111
branch: github-actions/auto-update-tools-swiftlint
101112
commit-message: "chore(deps): Update swiftlint version"

Plans/iOS-ObjectiveC_Base.xctestplan

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
{
1717
"target" : {
1818
"containerPath" : "container:iOS-ObjectiveC.xcodeproj",
19-
"identifier" : "BFA60B1095A1E96F17C564C6",
20-
"name" : "UITests"
19+
"identifier" : "943D6C233ABD091EE39BDE11",
20+
"name" : "iOS-ObjectiveC-UITests"
2121
}
2222
}
2323
],

Plans/iOS-SwiftUI_Base.xctestplan

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"codeCoverage" : true,
1313
"targetForVariableExpansion" : {
1414
"containerPath" : "container:iOS-SwiftUI.xcodeproj",
15-
"identifier" : "7BB6224826A56C4E00D0E75E",
15+
"identifier" : "FB95644029830B90C1A178C7",
1616
"name" : "iOS-SwiftUI"
1717
},
1818
"uiTestingScreenshotsLifetime" : "keepAlways"
@@ -21,7 +21,7 @@
2121
{
2222
"target" : {
2323
"containerPath" : "container:iOS-SwiftUI.xcodeproj",
24-
"identifier" : "4EE8FE57D6CE25066F588D60",
24+
"identifier" : "3838200E5DA5CA71C22D95E8",
2525
"name" : "iOS-SwiftUI-UITests"
2626
}
2727
}

Samples/DistributionSample/DistributionSample.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages:
1313
Sentry:
1414
path: ../../
1515
targets:
16-
App:
16+
DistributionSample:
1717
type: application
1818
platform: auto
1919
sources:
@@ -52,4 +52,4 @@ schemes:
5252
- SampleAppScheme
5353
build:
5454
targets:
55-
App: all
55+
DistributionSample: all

Samples/SDK-Size/SDK-Size.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ options:
1313
bundleIdPrefix: io.sentry
1414
defaultSourceDirectoryType: syncedFolder
1515
targets:
16-
App:
16+
SDK-Size:
1717
type: application
1818
platform: auto
1919
sources:
@@ -56,4 +56,4 @@ schemes:
5656
- SampleAppScheme
5757
build:
5858
targets:
59-
App: all
59+
SDK-Size: all

Samples/SPM/SPM.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages:
1313
Sentry:
1414
path: ../../
1515
targets:
16-
App:
16+
SPM:
1717
type: application
1818
platform: auto
1919
sources:
@@ -52,4 +52,4 @@ schemes:
5252
- SampleAppScheme
5353
build:
5454
targets:
55-
App: all
55+
SPM: all

Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ options:
1414
bundleIdPrefix: io.sentry
1515
defaultSourceDirectoryType: syncedFolder
1616
targets:
17-
App:
17+
SessionReplay-CameraTest:
1818
type: application
1919
platform: iOS
2020
sources:
@@ -66,4 +66,4 @@ schemes:
6666
- SampleAppScheme
6767
build:
6868
targets:
69-
App: all
69+
SessionReplay-CameraTest: all

Samples/iOS-ObjectiveC/App/Configurations/iOS-ObjectiveC.xcconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "../../../Shared/Config/_Common.xcconfig"
22

3-
PRODUCT_NAME = App
43
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-ObjectiveC
54
INFOPLIST_FILE = App/Configurations/Info.plist
65
CODE_SIGN_ENTITLEMENTS = App/Configurations/iOS-ObjectiveC.entitlements

Samples/iOS-ObjectiveC/UITests/Configurations/iOS-ObjectiveC-UITests.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ INFOPLIST_FILE = UITests/Configurations/Info.plist
55

66
SUPPORTED_PLATFORMS = iphoneos iphonesimulator
77

8-
TEST_TARGET_NAME = App
8+
TEST_TARGET_NAME = iOS-ObjectiveC

Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ options:
1919
bundleIdPrefix: io.sentry
2020
defaultSourceDirectoryType: syncedFolder
2121
targets:
22-
App:
22+
iOS-ObjectiveC:
2323
type: application
2424
platform: auto
2525
sources:
@@ -73,7 +73,7 @@ targets:
7373
- script: ../Shared/reset-git-info.sh
7474
name: Reset Git Fields in Info.plist
7575
basedOnDependencyAnalysis: false
76-
UITests:
76+
iOS-ObjectiveC-UITests:
7777
type: bundle.ui-testing
7878
platform: auto
7979
dependencies:
@@ -117,8 +117,8 @@ schemes:
117117
- SampleAppScheme
118118
build:
119119
targets:
120-
App: all
121-
UITests: test
120+
iOS-ObjectiveC: all
121+
iOS-ObjectiveC-UITests: test
122122
test:
123123
config: Test
124124
testPlans:

0 commit comments

Comments
 (0)