Skip to content

Commit 1fa7dda

Browse files
philipphofmannphilipphofmann
authored
Merge branch '8.0.0' into feat/swift
2 parents 56c9730 + 7eee302 commit 1fa7dda

13 files changed

Lines changed: 19 additions & 10 deletions

File tree

‎.github/workflows/benchmarking.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
push:
66
branches:
77
- master
8+
- 8.0.0
89

910
pull_request:
1011
paths:
@@ -37,7 +38,7 @@ jobs:
3738
path: |
3839
DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
3940
DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
40-
key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}
41+
key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-${{ hashFiles('Sentry/Sources/**') }}
4142
- name: Cache iOS-Swift UI Test Runner App build product
4243
id: ios-swift-benchmark-runner-cache
4344
uses: actions/cache@v3

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- 8.0.0
67
- release/**
78

89
pull_request:

‎.github/workflows/integration-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- 8.0.0
67

78
pull_request:
89
paths:

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- 8.0.0
67
paths:
78
- 'Sources/**'
89
- 'Tests/**'

‎.github/workflows/profile-data-generator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
path: |
3131
DerivedData/Build/Products/Debug-iphoneos/TrendingMovies.app
3232
DerivedData/Build/Products/Debug-iphoneos/TrendingMovies.app.dSYM
33-
key: trendingmovies-app-cache-key-${{ hashFiles('Samples/TrendingMovies/TrendingMovies/**') }}
33+
key: trendingmovies-app-cache-key-${{ hashFiles('Samples/TrendingMovies/TrendingMovies/**') }}-${{ hashFiles('Sentry/Sources/**') }}
3434
- name: Cache ProfileDataGenerator UI Test Runner App build product
3535
id: cache-profiledatagenerator-test-runner-app
3636
uses: actions/cache@v3

‎.github/workflows/saucelabs-UI-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches:
99
- master
10+
- 8.0.0
1011

1112
pull_request:
1213
paths:
@@ -44,7 +45,7 @@ jobs:
4445
path: |
4546
DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
4647
DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
47-
key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}
48+
key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-Xcode-${{ matrix.xcode }}-${{ hashFiles('Sentry/Sources/**') }}
4849
- name: Cache iOS-Swift UI Test Runner App build product
4950
id: ios-swift-uitest-runner-cache
5051
uses: actions/cache@v3

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- 8.0.0
67
- release/**
78

89
pull_request:

‎.github/workflows/testflight.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- 8.0.0
67
paths:
78
- 'Sources/**'
89
- 'Samples/iOS-Swift/**'

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ This version introduces a dependency on Swift, which only impacts you if you don
88

99
- Properly demangle Swift class name (#2162)
1010

11+
## 7.31.2
12+
1113
### Fixes
1214

1315
- Crash in Client when reading integrations (#2398)

‎Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@
11111111
"$(inherited)",
11121112
"@executable_path/Frameworks",
11131113
);
1114-
MARKETING_VERSION = 7.31.1;
1114+
MARKETING_VERSION = 7.31.2;
11151115
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
11161116
PRODUCT_NAME = "$(TARGET_NAME)";
11171117
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1140,7 +1140,7 @@
11401140
"$(inherited)",
11411141
"@executable_path/Frameworks",
11421142
);
1143-
MARKETING_VERSION = 7.31.1;
1143+
MARKETING_VERSION = 7.31.2;
11441144
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
11451145
PRODUCT_NAME = "$(TARGET_NAME)";
11461146
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1785,7 +1785,7 @@
17851785
"$(inherited)",
17861786
"@executable_path/Frameworks",
17871787
);
1788-
MARKETING_VERSION = 7.31.1;
1788+
MARKETING_VERSION = 7.31.2;
17891789
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
17901790
PRODUCT_NAME = "$(TARGET_NAME)";
17911791
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1820,7 +1820,7 @@
18201820
"$(inherited)",
18211821
"@executable_path/Frameworks",
18221822
);
1823-
MARKETING_VERSION = 7.31.1;
1823+
MARKETING_VERSION = 7.31.2;
18241824
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
18251825
PRODUCT_NAME = "$(TARGET_NAME)";
18261826
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";

0 commit comments

Comments
 (0)