Skip to content

Commit 32932d5

Browse files
authored
Merge branch 'main' into fix/def-release
2 parents 5e8aeac + ff8969f commit 32932d5

File tree

85 files changed

+67
-1964
lines changed

Some content is hidden

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

85 files changed

+67
-1964
lines changed

.github/workflows/analyze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121

2222
- name: JDK setup
23-
uses: actions/setup-java@v3
23+
uses: actions/setup-java@v4
2424
with:
2525
java-version: 17
2626
distribution: temurin

.github/workflows/generate-dokka.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v3
2222

2323
- name: set up JDK 11
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
distribution: "adopt"
2727
java-version: "11"

.github/workflows/kotlin-multiplatform-gradle-plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222

2323
- name: JDK setup
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: 17
2727
distribution: temurin

.github/workflows/kotlin-multiplatform.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919

2020
- name: JDK setup
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2222
with:
2323
java-version: 17
2424
distribution: temurin
@@ -46,7 +46,7 @@ jobs:
4646
- uses: actions/checkout@v4
4747

4848
- name: JDK setup
49-
uses: actions/setup-java@v3
49+
uses: actions/setup-java@v4
5050
with:
5151
java-version: 17
5252
distribution: temurin
@@ -72,7 +72,7 @@ jobs:
7272
- uses: actions/checkout@v4
7373

7474
- name: JDK setup
75-
uses: actions/setup-java@v3
75+
uses: actions/setup-java@v4
7676
with:
7777
java-version: 17
7878
distribution: temurin
@@ -102,7 +102,7 @@ jobs:
102102
- uses: actions/checkout@v4
103103

104104
- name: JDK setup
105-
uses: actions/setup-java@v3
105+
uses: actions/setup-java@v4
106106
with:
107107
java-version: 17
108108
distribution: temurin

.github/workflows/upload-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717

1818
- name: JDK setup
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: 17
2222
distribution: temurin

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,26 @@
22

33
## Unreleased
44

5+
### Features
6+
7+
- Add `sendDefaultPii` option ([#377](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/377))
8+
59
### Fixes
610

711
- `beforeSend` overriding default values even if they were not set explicitly ([#376](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/376))
812

13+
### Dependencies
14+
15+
- Bump Java SDK from v8.8.0 to v8.9.0 ([#375](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/375))
16+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#890)
17+
- [diff](https://github.com/getsentry/sentry-java/compare/8.8.0...8.9.0)
18+
- Bump Cocoa SDK from v8.49.0 to v8.49.1 ([#374](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/374))
19+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8491)
20+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.0...8.49.1)
21+
922
## 0.12.0
1023

11-
### Feature
24+
### Features
1225

1326
- Move replay options out of experimental ([#367](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/367))
1427
- You can now access the replay options via `options.sessionReplay`

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Use the Kotlin Multiplatform and Cocoa SDK combinations listed in the table belo
4545
| 0.8.0, 0.9.0 | 8.36.0 |
4646
| 0.10.0 | 8.38.0 |
4747
| 0.11.0 | 8.44.0 |
48+
| 0.12.0 | 8.49.0 (Xcode 16.3 compatible) |
4849

4950
## Usage
5051

buildSrc/src/main/java/Config.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ object Config {
3232
object Libs {
3333
val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
3434

35-
val sentryJavaVersion = "8.8.0"
35+
val sentryJavaVersion = "8.9.0"
3636
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
3737
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
3838

39-
val sentryCocoaVersion = "8.49.0"
39+
val sentryCocoaVersion = "8.49.1"
4040
val sentryCocoa = "Sentry"
4141

4242
object Samples {

sentry-kotlin-multiplatform-gradle-plugin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ id=io.sentry.kotlin.multiplatform.gradle
22
implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
33
versionName=0.12.0
44
group=io.sentry
5-
sentryCocoaVersion=8.49.0
5+
sentryCocoaVersion=8.49.1
66

77
# publication pom properties
88
POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin

sentry-kotlin-multiplatform/api/android/sentry-kotlin-multiplatform.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ public class io/sentry/kotlin/multiplatform/SentryOptions {
185185
public final fun getRelease ()Ljava/lang/String;
186186
public final fun getSampleRate ()Ljava/lang/Double;
187187
public final fun getSdk ()Lio/sentry/kotlin/multiplatform/protocol/SdkVersion;
188+
public final fun getSendDefaultPii ()Z
188189
public final fun getSessionReplay ()Lio/sentry/kotlin/multiplatform/SentryReplayOptions;
189190
public final fun getSessionTrackingIntervalMillis ()J
190191
public final fun getTracesSampleRate ()Ljava/lang/Double;
@@ -214,6 +215,7 @@ public class io/sentry/kotlin/multiplatform/SentryOptions {
214215
public final fun setRelease (Ljava/lang/String;)V
215216
public final fun setSampleRate (Ljava/lang/Double;)V
216217
public final fun setSdk (Lio/sentry/kotlin/multiplatform/protocol/SdkVersion;)V
218+
public final fun setSendDefaultPii (Z)V
217219
public final fun setSessionReplay (Lio/sentry/kotlin/multiplatform/SentryReplayOptions;)V
218220
public final fun setSessionTrackingIntervalMillis (J)V
219221
public final fun setTracesSampleRate (Ljava/lang/Double;)V

0 commit comments

Comments
 (0)