Skip to content

Commit 8262e80

Browse files
authored
Merge branch 'main' into feat/replay-custom-masking-integration
2 parents 50a7d51 + c9f9d33 commit 8262e80

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v2
39+
uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v2
4040
with:
4141
languages: 'java'
4242

@@ -45,4 +45,4 @@ jobs:
4545
./gradlew buildForCodeQL --no-build-cache
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v2
48+
uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # pin@v2

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
- Add `installGroupsOverride` parameter to Build Distribution SDK for programmatic filtering, with support for configuration via properties file using `io.sentry.distribution.install-groups-override` ([#5066](https://github.com/getsentry/sentry-java/pull/5066))
88

9+
### Dependencies
10+
11+
- Bump Native SDK from v0.12.4 to v0.12.6 ([#5071](https://github.com/getsentry/sentry-java/pull/5071))
12+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0126)
13+
- [diff](https://github.com/getsentry/sentry-native/compare/0.12.4...0.12.6)
14+
915
### Internal
1016

1117
- Add integration to track session replay custom masking ([#5070](https://github.com/getsentry/sentry-java/pull/5070))

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
149149
reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
150150
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
151151
retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
152-
sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.4" }
152+
sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.6" }
153153
servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
154154
servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
155155
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

0 commit comments

Comments
 (0)