Skip to content

Commit 8db72ee

Browse files
authored
Merge branch 'main' into deps/upgrade-kotlin
2 parents ef0aa9c + 0e9c2c5 commit 8db72ee

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
### Dependencies
1010

11-
- Bump Java SDK from v8.8.0 to v8.11.1 ([#375](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/375), [#382](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/382))
12-
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8111)
13-
- [diff](https://github.com/getsentry/sentry-java/compare/8.8.0...8.11.1)
11+
- Bump Java SDK from v8.8.0 to v8.14.0 ([#375](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/375), [#382](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/382), [#387](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/387), [#402](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/402))
12+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8140)
13+
- [diff](https://github.com/getsentry/sentry-java/compare/8.8.0...8.14.0)
1414
- Bump Cocoa SDK from v8.49.0 to v8.49.1 ([#374](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/374))
1515
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8491)
1616
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.0...8.49.1)

buildSrc/src/main/java/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ object Config {
3333
object Libs {
3434
val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
3535

36-
val sentryJavaVersion = "8.11.1"
36+
val sentryJavaVersion = "8.14.0"
3737
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
3838
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
3939

sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class SentryE2ETest : BaseSentryTest() {
7474
var json = ""
7575
val result: SentryEventSerializable = withContext(Dispatchers.Default) {
7676
while (json.isEmpty() || json.contains("Event not found")) {
77-
delay(5000)
77+
delay(20000)
7878
json = fetchEvent(eventId)
7979
assertFalse(json.contains("Invalid token"), "Invalid auth token")
8080
}

0 commit comments

Comments
 (0)