Skip to content

Commit 16da8b8

Browse files
chore(deps): bump spotless from 7.0.4 to 8.4.0 (getsentry#5411)
* chore(deps): bump spotless from 7.0.4 to 8.4.0 Bumps `spotless` from 7.0.4 to 8.4.0. Updates `com.diffplug.spotless:com.diffplug.spotless.gradle.plugin` from 7.0.4 to 8.4.0 Updates `com.diffplug.spotless` from 7.0.4 to 8.4.0 --- updated-dependencies: - dependency-name: com.diffplug.spotless:com.diffplug.spotless.gradle.plugin dependency-version: 8.4.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: com.diffplug.spotless dependency-version: 8.4.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Format code --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io>
1 parent e0bd005 commit 16da8b8

17 files changed

Lines changed: 258 additions & 258 deletions

File tree

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ springboot4 = "4.0.0"
3737
targetSdk = "36"
3838
compileSdk = "36"
3939
minSdk = "21"
40-
spotless = "7.0.4"
40+
spotless = "8.4.0"
4141
gummyBears = "0.12.0"
4242
camerax = "1.4.0"
4343
openfeature = "1.18.2"

sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -56,65 +56,65 @@ class AnrV2IntegrationTest : ApplicationExitIntegrationTestBase<AnrV2Hint>() {
5656
whenever(mock.traceInputStream)
5757
.thenReturn(
5858
"""
59-
Subject: Input dispatching timed out (7985007 com.example.app/com.example.app.ui.MainActivity (server) is not responding. Waited 5000ms for FocusEvent(hasFocus=false))
60-
Here are no Binder-related exception messages available.
61-
Pid(12233) have D state thread(tid:12236 name:Signal Catcher)
59+
Subject: Input dispatching timed out (7985007 com.example.app/com.example.app.ui.MainActivity (server) is not responding. Waited 5000ms for FocusEvent(hasFocus=false))
60+
Here are no Binder-related exception messages available.
61+
Pid(12233) have D state thread(tid:12236 name:Signal Catcher)
6262
6363
64-
RssHwmKb: 823716
65-
RssKb: 548348
66-
RssAnonKb: 382156
67-
RssShmemKb: 13304
68-
VmSwapKb: 82484
64+
RssHwmKb: 823716
65+
RssKb: 548348
66+
RssAnonKb: 382156
67+
RssShmemKb: 13304
68+
VmSwapKb: 82484
6969
7070
71-
--- CriticalEventLog ---
72-
capacity: 20
73-
timestamp_ms: 1731507490032
74-
window_ms: 300000
71+
--- CriticalEventLog ---
72+
capacity: 20
73+
timestamp_ms: 1731507490032
74+
window_ms: 300000
7575
76-
----- dumping pid: 12233 at 313446151
77-
libdebuggerd_client: unexpected registration response: 0
76+
----- dumping pid: 12233 at 313446151
77+
libdebuggerd_client: unexpected registration response: 0
7878
79-
----- Waiting Channels: pid 12233 at 2024-11-13 19:48:09.980104540+0530 -----
80-
Cmd line: com.example.app:mainProcess
81-
"""
79+
----- Waiting Channels: pid 12233 at 2024-11-13 19:48:09.980104540+0530 -----
80+
Cmd line: com.example.app:mainProcess
81+
"""
8282
.trimIndent()
8383
.byteInputStream()
8484
)
8585
} else {
8686
whenever(mock.traceInputStream)
8787
.thenReturn(
8888
"""
89-
"main" prio=5 tid=1 Blocked
90-
| group="main" sCount=1 ucsCount=0 flags=1 obj=0x72a985e0 self=0xb400007cabc57380
91-
| sysTid=28941 nice=-10 cgrp=top-app sched=0/0 handle=0x7deceb74f8
92-
| state=S schedstat=( 324804784 183300334 997 ) utm=23 stm=8 core=3 HZ=100
93-
| stack=0x7ff93a9000-0x7ff93ab000 stackSize=8188KB
94-
| held mutexes=
95-
at io.sentry.samples.android.MainActivity${'$'}2.run(MainActivity.java:177)
96-
- waiting to lock <0x0d3a2f0a> (a java.lang.Object) held by thread 5
97-
at android.os.Handler.handleCallback(Handler.java:942)
98-
at android.os.Handler.dispatchMessage(Handler.java:99)
99-
at android.os.Looper.loopOnce(Looper.java:201)
100-
at android.os.Looper.loop(Looper.java:288)
101-
at android.app.ActivityThread.main(ActivityThread.java:7872)
102-
at java.lang.reflect.Method.invoke(Native method)
103-
at com.android.internal.os.RuntimeInit${'$'}MethodAndArgsCaller.run(RuntimeInit.java:548)
104-
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936)
105-
106-
"perfetto_hprof_listener" prio=10 tid=7 Native (still starting up)
107-
| group="" sCount=1 ucsCount=0 flags=1 obj=0x0 self=0xb400007cabc5ab20
108-
| sysTid=28959 nice=-20 cgrp=top-app sched=0/0 handle=0x7b2021bcb0
109-
| state=S schedstat=( 72750 1679167 1 ) utm=0 stm=0 core=3 HZ=100
110-
| stack=0x7b20124000-0x7b20126000 stackSize=991KB
111-
| held mutexes=
112-
native: #00 pc 00000000000a20f4 /apex/com.android.runtime/lib64/bionic/libc.so (read+4) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
113-
native: #01 pc 000000000001d840 /apex/com.android.art/lib64/libperfetto_hprof.so (void* std::__1::__thread_proxy<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, ArtPlugin_Initialize::${'$'}_34> >(void*)+260) (BuildId: 525cc92a7dc49130157aeb74f6870364)
114-
native: #02 pc 00000000000b63b0 /apex/com.android.runtime/lib64/bionic/libc.so (__pthread_start(void*)+208) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
115-
native: #03 pc 00000000000530b8 /apex/com.android.runtime/lib64/bionic/libc.so (__start_thread+64) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
116-
(no managed stack frames)
117-
"""
89+
"main" prio=5 tid=1 Blocked
90+
| group="main" sCount=1 ucsCount=0 flags=1 obj=0x72a985e0 self=0xb400007cabc57380
91+
| sysTid=28941 nice=-10 cgrp=top-app sched=0/0 handle=0x7deceb74f8
92+
| state=S schedstat=( 324804784 183300334 997 ) utm=23 stm=8 core=3 HZ=100
93+
| stack=0x7ff93a9000-0x7ff93ab000 stackSize=8188KB
94+
| held mutexes=
95+
at io.sentry.samples.android.MainActivity${'$'}2.run(MainActivity.java:177)
96+
- waiting to lock <0x0d3a2f0a> (a java.lang.Object) held by thread 5
97+
at android.os.Handler.handleCallback(Handler.java:942)
98+
at android.os.Handler.dispatchMessage(Handler.java:99)
99+
at android.os.Looper.loopOnce(Looper.java:201)
100+
at android.os.Looper.loop(Looper.java:288)
101+
at android.app.ActivityThread.main(ActivityThread.java:7872)
102+
at java.lang.reflect.Method.invoke(Native method)
103+
at com.android.internal.os.RuntimeInit${'$'}MethodAndArgsCaller.run(RuntimeInit.java:548)
104+
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936)
105+
106+
"perfetto_hprof_listener" prio=10 tid=7 Native (still starting up)
107+
| group="" sCount=1 ucsCount=0 flags=1 obj=0x0 self=0xb400007cabc5ab20
108+
| sysTid=28959 nice=-20 cgrp=top-app sched=0/0 handle=0x7b2021bcb0
109+
| state=S schedstat=( 72750 1679167 1 ) utm=0 stm=0 core=3 HZ=100
110+
| stack=0x7b20124000-0x7b20126000 stackSize=991KB
111+
| held mutexes=
112+
native: #00 pc 00000000000a20f4 /apex/com.android.runtime/lib64/bionic/libc.so (read+4) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
113+
native: #01 pc 000000000001d840 /apex/com.android.art/lib64/libperfetto_hprof.so (void* std::__1::__thread_proxy<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, ArtPlugin_Initialize::${'$'}_34> >(void*)+260) (BuildId: 525cc92a7dc49130157aeb74f6870364)
114+
native: #02 pc 00000000000b63b0 /apex/com.android.runtime/lib64/bionic/libc.so (__pthread_start(void*)+208) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
115+
native: #03 pc 00000000000530b8 /apex/com.android.runtime/lib64/bionic/libc.so (__start_thread+64) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
116+
(no managed stack frames)
117+
"""
118118
.trimIndent()
119119
.byteInputStream()
120120
)

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -132,35 +132,35 @@ class SentryAndroidTest {
132132
whenever(mock.traceInputStream)
133133
.thenReturn(
134134
"""
135-
"main" prio=5 tid=1 Blocked
136-
| group="main" sCount=1 ucsCount=0 flags=1 obj=0x72a985e0 self=0xb400007cabc57380
137-
| sysTid=28941 nice=-10 cgrp=top-app sched=0/0 handle=0x7deceb74f8
138-
| state=S schedstat=( 324804784 183300334 997 ) utm=23 stm=8 core=3 HZ=100
139-
| stack=0x7ff93a9000-0x7ff93ab000 stackSize=8188KB
140-
| held mutexes=
141-
at io.sentry.samples.android.MainActivity${'$'}2.run(MainActivity.java:177)
142-
- waiting to lock <0x0d3a2f0a> (a java.lang.Object) held by thread 5
143-
at android.os.Handler.handleCallback(Handler.java:942)
144-
at android.os.Handler.dispatchMessage(Handler.java:99)
145-
at android.os.Looper.loopOnce(Looper.java:201)
146-
at android.os.Looper.loop(Looper.java:288)
147-
at android.app.ActivityThread.main(ActivityThread.java:7872)
148-
at java.lang.reflect.Method.invoke(Native method)
149-
at com.android.internal.os.RuntimeInit${'$'}MethodAndArgsCaller.run(RuntimeInit.java:548)
150-
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936)
151-
152-
"perfetto_hprof_listener" prio=10 tid=7 Native (still starting up)
153-
| group="" sCount=1 ucsCount=0 flags=1 obj=0x0 self=0xb400007cabc5ab20
154-
| sysTid=28959 nice=-20 cgrp=top-app sched=0/0 handle=0x7b2021bcb0
155-
| state=S schedstat=( 72750 1679167 1 ) utm=0 stm=0 core=3 HZ=100
156-
| stack=0x7b20124000-0x7b20126000 stackSize=991KB
157-
| held mutexes=
158-
native: #00 pc 00000000000a20f4 /apex/com.android.runtime/lib64/bionic/libc.so (read+4) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
159-
native: #01 pc 000000000001d840 /apex/com.android.art/lib64/libperfetto_hprof.so (void* std::__1::__thread_proxy<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, ArtPlugin_Initialize::${'$'}_34> >(void*)+260) (BuildId: 525cc92a7dc49130157aeb74f6870364)
160-
native: #02 pc 00000000000b63b0 /apex/com.android.runtime/lib64/bionic/libc.so (__pthread_start(void*)+208) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
161-
native: #03 pc 00000000000530b8 /apex/com.android.runtime/lib64/bionic/libc.so (__start_thread+64) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
162-
(no managed stack frames)
163-
"""
135+
"main" prio=5 tid=1 Blocked
136+
| group="main" sCount=1 ucsCount=0 flags=1 obj=0x72a985e0 self=0xb400007cabc57380
137+
| sysTid=28941 nice=-10 cgrp=top-app sched=0/0 handle=0x7deceb74f8
138+
| state=S schedstat=( 324804784 183300334 997 ) utm=23 stm=8 core=3 HZ=100
139+
| stack=0x7ff93a9000-0x7ff93ab000 stackSize=8188KB
140+
| held mutexes=
141+
at io.sentry.samples.android.MainActivity${'$'}2.run(MainActivity.java:177)
142+
- waiting to lock <0x0d3a2f0a> (a java.lang.Object) held by thread 5
143+
at android.os.Handler.handleCallback(Handler.java:942)
144+
at android.os.Handler.dispatchMessage(Handler.java:99)
145+
at android.os.Looper.loopOnce(Looper.java:201)
146+
at android.os.Looper.loop(Looper.java:288)
147+
at android.app.ActivityThread.main(ActivityThread.java:7872)
148+
at java.lang.reflect.Method.invoke(Native method)
149+
at com.android.internal.os.RuntimeInit${'$'}MethodAndArgsCaller.run(RuntimeInit.java:548)
150+
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936)
151+
152+
"perfetto_hprof_listener" prio=10 tid=7 Native (still starting up)
153+
| group="" sCount=1 ucsCount=0 flags=1 obj=0x0 self=0xb400007cabc5ab20
154+
| sysTid=28959 nice=-20 cgrp=top-app sched=0/0 handle=0x7b2021bcb0
155+
| state=S schedstat=( 72750 1679167 1 ) utm=0 stm=0 core=3 HZ=100
156+
| stack=0x7b20124000-0x7b20126000 stackSize=991KB
157+
| held mutexes=
158+
native: #00 pc 00000000000a20f4 /apex/com.android.runtime/lib64/bionic/libc.so (read+4) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
159+
native: #01 pc 000000000001d840 /apex/com.android.art/lib64/libperfetto_hprof.so (void* std::__1::__thread_proxy<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, ArtPlugin_Initialize::${'$'}_34> >(void*)+260) (BuildId: 525cc92a7dc49130157aeb74f6870364)
160+
native: #02 pc 00000000000b63b0 /apex/com.android.runtime/lib64/bionic/libc.so (__pthread_start(void*)+208) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
161+
native: #03 pc 00000000000530b8 /apex/com.android.runtime/lib64/bionic/libc.so (__start_thread+64) (BuildId: 01331f74b0bb2cb958bdc15282b8ec7b)
162+
(no managed stack frames)
163+
"""
164164
.trimIndent()
165165
.byteInputStream()
166166
)

sentry-android-core/src/test/java/io/sentry/android/core/internal/debugmeta/AssetsDebugMetaLoaderTest.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ class AssetsDebugMetaLoaderTest {
4545
fixture.getSut(
4646
content =
4747
"""
48-
#Generated by sentry-maven-plugin
49-
#Wed May 17 15:33:34 CEST 2023
50-
io.sentry.ProguardUuids=34077988-a0e5-4839-9618-7400e1616d1b
51-
io.sentry.bundle-ids=88ba82db-cd26-4c09-8b31-21461d286b68
52-
io.sentry.build-tool=maven
53-
"""
48+
#Generated by sentry-maven-plugin
49+
#Wed May 17 15:33:34 CEST 2023
50+
io.sentry.ProguardUuids=34077988-a0e5-4839-9618-7400e1616d1b
51+
io.sentry.bundle-ids=88ba82db-cd26-4c09-8b31-21461d286b68
52+
io.sentry.build-tool=maven
53+
"""
5454
.trimIndent()
5555
)
5656

@@ -68,12 +68,12 @@ class AssetsDebugMetaLoaderTest {
6868
fixture.getSut(
6969
content =
7070
"""
71-
#Generated by sentry-maven-plugin
72-
#Wed May 17 15:33:34 CEST 2023
73-
io.sentry.ProguardUuids=34077988-a0e5-4839-9618-7400e1616d1b
74-
io.sentry.bundle-ids=88ba82db-cd26-4c09-8b31-21461d286b68,8d11a44a-facd-46c1-a49b-87d256227101
75-
io.sentry.build-tool=maven
76-
"""
71+
#Generated by sentry-maven-plugin
72+
#Wed May 17 15:33:34 CEST 2023
73+
io.sentry.ProguardUuids=34077988-a0e5-4839-9618-7400e1616d1b
74+
io.sentry.bundle-ids=88ba82db-cd26-4c09-8b31-21461d286b68,8d11a44a-facd-46c1-a49b-87d256227101
75+
io.sentry.build-tool=maven
76+
"""
7777
.trimIndent()
7878
)
7979

sentry-android-core/src/test/java/io/sentry/android/core/internal/modules/AssetsModulesLoaderTest.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class AssetsModulesLoaderTest {
4444
fixture.getSut(
4545
content =
4646
"""
47-
com.squareup.okhttp3:okhttp:3.14.9
48-
com.squareup.okio:okio:1.17.2
49-
"""
47+
com.squareup.okhttp3:okhttp:3.14.9
48+
com.squareup.okio:okio:1.17.2
49+
"""
5050
.trimIndent()
5151
)
5252

@@ -62,9 +62,9 @@ class AssetsModulesLoaderTest {
6262
fixture.getSut(
6363
content =
6464
"""
65-
com.squareup.okhttp3:okhttp:3.14.9
66-
com.squareup.okio:okio:1.17.2
67-
"""
65+
com.squareup.okhttp3:okhttp:3.14.9
66+
com.squareup.okio:okio:1.17.2
67+
"""
6868
.trimIndent()
6969
)
7070

@@ -93,8 +93,8 @@ class AssetsModulesLoaderTest {
9393
fixture.getSut(
9494
content =
9595
"""
96-
com.squareup.okhttp3;3.14.9
97-
"""
96+
com.squareup.okhttp3;3.14.9
97+
"""
9898
.trimIndent()
9999
)
100100

sentry-android-distribution/src/test/java/io/sentry/android/distribution/UpdateResponseParserTest.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class UpdateResponseParserTest {
3737
},
3838
"current": null
3939
}
40-
"""
40+
"""
4141
.trimIndent()
4242

4343
val result = parser.parseResponse(200, responseBody)
@@ -68,7 +68,7 @@ class UpdateResponseParserTest {
6868
"created_date": "2023-09-01T00:00:00Z"
6969
}
7070
}
71-
"""
71+
"""
7272
.trimIndent()
7373

7474
val result = parser.parseResponse(200, responseBody)
@@ -90,7 +90,7 @@ class UpdateResponseParserTest {
9090
"created_date": "2023-09-01T00:00:00Z"
9191
}
9292
}
93-
"""
93+
"""
9494
.trimIndent()
9595

9696
val result = parser.parseResponse(200, responseBody)
@@ -146,7 +146,7 @@ class UpdateResponseParserTest {
146146
"build_version": "2.0.0"
147147
}
148148
}
149-
"""
149+
"""
150150
.trimIndent()
151151

152152
val result = parser.parseResponse(200, responseBody)
@@ -173,7 +173,7 @@ class UpdateResponseParserTest {
173173
"created_date": ""
174174
}
175175
}
176-
"""
176+
"""
177177
.trimIndent()
178178

179179
val result = parser.parseResponse(200, responseBody)
@@ -214,7 +214,7 @@ class UpdateResponseParserTest {
214214
"created_date": "2023-10-01T00:00:00Z"
215215
}
216216
}
217-
"""
217+
"""
218218
.trimIndent()
219219

220220
val result = parser.parseResponse(200, responseBody)
@@ -240,7 +240,7 @@ class UpdateResponseParserTest {
240240
"created_date": "2023-10-01T00:00:00Z"
241241
}
242242
}
243-
"""
243+
"""
244244
.trimIndent()
245245

246246
val result = parser.parseResponse(200, responseBody)
@@ -266,7 +266,7 @@ class UpdateResponseParserTest {
266266
"created_date": "2023-10-01T00:00:00Z"
267267
}
268268
}
269-
"""
269+
"""
270270
.trimIndent()
271271

272272
val result = parser.parseResponse(200, responseBody)
@@ -292,7 +292,7 @@ class UpdateResponseParserTest {
292292
"created_date": "2023-10-01T00:00:00Z"
293293
}
294294
}
295-
"""
295+
"""
296296
.trimIndent()
297297

298298
val result = parser.parseResponse(200, responseBody)
@@ -316,7 +316,7 @@ class UpdateResponseParserTest {
316316
"created_date": "2023-10-01T00:00:00Z"
317317
}
318318
}
319-
"""
319+
"""
320320
.trimIndent()
321321

322322
val result = parser.parseResponse(200, responseBody)
@@ -345,7 +345,7 @@ class UpdateResponseParserTest {
345345
"created_date": "2023-10-01T00:00:00Z"
346346
}
347347
}
348-
"""
348+
"""
349349
.trimIndent()
350350

351351
val result = parser.parseResponse(200, responseBody)
@@ -372,7 +372,7 @@ class UpdateResponseParserTest {
372372
"created_date": "2023-10-01T00:00:00Z"
373373
}
374374
}
375-
"""
375+
"""
376376
.trimIndent()
377377

378378
val result = parser.parseResponse(200, responseBody)
@@ -397,7 +397,7 @@ class UpdateResponseParserTest {
397397
"install_groups": []
398398
}
399399
}
400-
"""
400+
"""
401401
.trimIndent()
402402

403403
val result = parser.parseResponse(200, responseBody)
@@ -422,7 +422,7 @@ class UpdateResponseParserTest {
422422
"install_groups": null
423423
}
424424
}
425-
"""
425+
"""
426426
.trimIndent()
427427

428428
val result = parser.parseResponse(200, responseBody)
@@ -447,7 +447,7 @@ class UpdateResponseParserTest {
447447
"install_groups": ["beta-testers"]
448448
}
449449
}
450-
"""
450+
"""
451451
.trimIndent()
452452

453453
val result = parser.parseResponse(200, responseBody)

0 commit comments

Comments
 (0)