Skip to content

Commit 58551ca

Browse files
renovate[bot]tobiasKaminsky
renovate[bot]
authored and
tobiasKaminsky
committed
chore(deps): update plugin com.diffplug.spotless to v8.2.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 340aa39 commit 58551ca

3 files changed

Lines changed: 112 additions & 69 deletions

File tree

‎gradle/verification-metadata.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,10 @@
213213
<trusting group="com.github.spotbugs.snom" name="spotbugs-gradle-plugin" version="6.1.6"/>
214214
<trusting group="com.github.spotbugs.snom" name="spotbugs-gradle-plugin" version="6.1.7"/>
215215
</trusted-key>
216-
<trusted-key id="9E3044071B758EBCB7E45673700E4F39BC05364B" group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
216+
<trusted-key id="9E3044071B758EBCB7E45673700E4F39BC05364B">
217+
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
218+
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
219+
</trusted-key>
217220
<trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
218221
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="com.google.code.findbugs" name="jsr305" version="2.0.2"/>
219222
<trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8" name="kubernetes-client-bom" version="5.12.4"/>
@@ -7563,6 +7566,11 @@
75637566
<sha256 value="58b0b4ed49b3b19072b55c7111c0991a07f9b6d20709af8aa470c714114afbfb" origin="Generated by Gradle" reason="Artifact is not signed"/>
75647567
</artifact>
75657568
</component>
7569+
<component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.2.1">
7570+
<artifact name="com.diffplug.spotless.gradle.plugin-8.2.1.pom">
7571+
<sha256 value="306b777dc39f44fec62b50bdefe41b716beb0fd7cd3f81572273a134c2e155b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
7572+
</artifact>
7573+
</component>
75667574
<component group="com.fasterxml" name="oss-parent" version="56">
75677575
<artifact name="oss-parent-56.pom">
75687576
<sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -11674,11 +11682,24 @@
1167411682
<sha256 value="5f0c0e2cdbd6d788302fa84b28d0c538a06334ba0812fc64252050907222d30b" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
1167511683
</artifact>
1167611684
</component>
11685+
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="7.5.0.202512021534-r">
11686+
<artifact name="org.eclipse.jgit-7.5.0.202512021534-r.jar">
11687+
<sha256 value="1597bc78a8d8c0116976d46a94872a2cc2865670eba4db0b9f51811b34936d72" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
11688+
</artifact>
11689+
<artifact name="org.eclipse.jgit-7.5.0.202512021534-r.pom">
11690+
<sha256 value="6c954dfc10f1c301bdba25d3d6309f77479804363cf7556e51e8bb3714555c64" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
11691+
</artifact>
11692+
</component>
1167711693
<component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="7.4.0.202509020913-r">
1167811694
<artifact name="org.eclipse.jgit-parent-7.4.0.202509020913-r.pom">
1167911695
<sha256 value="d53714ed2649b8173288f65405e54fbef751656b91480c5459f4dc0192002472" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
1168011696
</artifact>
1168111697
</component>
11698+
<component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="7.5.0.202512021534-r">
11699+
<artifact name="org.eclipse.jgit-parent-7.5.0.202512021534-r.pom">
11700+
<sha256 value="7e38806a853691a49db16eac836fe6b626276943b108b67754a3d5c740fbbc0e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
11701+
</artifact>
11702+
</component>
1168211703
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200">
1168311704
<artifact name="org.eclipse.osgi-3.23.200.jar">
1168411705
<sha256 value="8d94058ead3f4651900166924a677c3beb6e996f072fabf385ffdd70510bc493" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -11687,6 +11708,14 @@
1168711708
<sha256 value="a72da35afde481cda10e9d94b31a54c1b90a7b6850aade4c9ad9e956d7485ad0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
1168811709
</artifact>
1168911710
</component>
11711+
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0">
11712+
<artifact name="org.eclipse.osgi-3.24.0.jar">
11713+
<sha256 value="789454014c150f2adf681cd80f8ecf49817d93ed790f3659b362dca07ade87b8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
11714+
</artifact>
11715+
<artifact name="org.eclipse.osgi-3.24.0.pom">
11716+
<sha256 value="a24d9d906a478e126b219a9d24518b833b66da4b103f963e20b9050bebe2ae15" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
11717+
</artifact>
11718+
</component>
1169011719
<component group="org.glassfish.jaxb" name="jaxb-bom" version="2.3.2">
1169111720
<artifact name="jaxb-bom-2.3.2.pom">
1169211721
<sha256 value="a1018bb54678ed9f5acb2f7a4084e385ff510201f4e9dbf5f75dc6a675f66be7" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>

‎lib/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
}
2222

2323
plugins {
24-
id "com.diffplug.spotless" version "8.1.0"
24+
id "com.diffplug.spotless" version "8.2.1"
2525
}
2626

2727
apply plugin: "kotlin-android"

‎lib/src/test/java/com/nextcloud/android/sso/helper/Retrofit2HelperTest.kt‎

Lines changed: 81 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.junit.Test
1515

1616
@Suppress("MagicNumber", "TooManyFunctions")
1717
class Retrofit2HelperTest {
18-
1918
@Test
2019
fun testBuildHeadersWhenGivenNullHeadersShouldReturnEmptyHeaders() {
2120
val headers = buildHeaders(null)
@@ -30,9 +29,10 @@ class Retrofit2HelperTest {
3029

3130
@Test
3231
fun testBuildHeadersWhenGivenSingleHeaderShouldReturnThatHeader() {
33-
val plainHeaders = listOf(
34-
createPlainHeader("Content-Type", "application/json")
35-
)
32+
val plainHeaders =
33+
listOf(
34+
createPlainHeader("Content-Type", "application/json")
35+
)
3636

3737
val headers = buildHeaders(plainHeaders)
3838

@@ -42,11 +42,12 @@ class Retrofit2HelperTest {
4242

4343
@Test
4444
fun testBuildHeadersWhenGivenDuplicateHeadersShouldRemoveDuplicates() {
45-
val plainHeaders = listOf(
46-
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
47-
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
48-
createPlainHeader("X-Robots-Tag", "noindex, nofollow")
49-
)
45+
val plainHeaders =
46+
listOf(
47+
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
48+
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
49+
createPlainHeader("X-Robots-Tag", "noindex, nofollow")
50+
)
5051

5152
val headers = buildHeaders(plainHeaders)
5253

@@ -56,11 +57,12 @@ class Retrofit2HelperTest {
5657

5758
@Test
5859
fun testBuildHeadersWhenGivenMultipleDistinctValuesShouldKeepAllValues() {
59-
val plainHeaders = listOf(
60-
createPlainHeader("Set-Cookie", "session=abc123"),
61-
createPlainHeader("Set-Cookie", "token=xyz789"),
62-
createPlainHeader("Set-Cookie", "user=john")
63-
)
60+
val plainHeaders =
61+
listOf(
62+
createPlainHeader("Set-Cookie", "session=abc123"),
63+
createPlainHeader("Set-Cookie", "token=xyz789"),
64+
createPlainHeader("Set-Cookie", "user=john")
65+
)
6466

6567
val headers = buildHeaders(plainHeaders)
6668

@@ -74,13 +76,14 @@ class Retrofit2HelperTest {
7476

7577
@Test
7678
fun testBuildHeadersWhenGivenMixedDuplicateAndDistinctValuesShouldHandleCorrectly() {
77-
val plainHeaders = listOf(
78-
createPlainHeader("Set-Cookie", "session=abc"),
79-
createPlainHeader("Set-Cookie", "session=abc"),
80-
createPlainHeader("Set-Cookie", "token=xyz"),
81-
createPlainHeader("X-Robots-Tag", "noindex"),
82-
createPlainHeader("X-Robots-Tag", "noindex")
83-
)
79+
val plainHeaders =
80+
listOf(
81+
createPlainHeader("Set-Cookie", "session=abc"),
82+
createPlainHeader("Set-Cookie", "session=abc"),
83+
createPlainHeader("Set-Cookie", "token=xyz"),
84+
createPlainHeader("X-Robots-Tag", "noindex"),
85+
createPlainHeader("X-Robots-Tag", "noindex")
86+
)
8487

8588
val headers = buildHeaders(plainHeaders)
8689

@@ -96,11 +99,12 @@ class Retrofit2HelperTest {
9699

97100
@Test
98101
fun testBuildHeadersWhenGivenCaseInsensitiveHeaderNamesShouldTreatAsSame() {
99-
val plainHeaders = listOf(
100-
createPlainHeader("Content-Type", "application/json"),
101-
createPlainHeader("content-type", "application/json"),
102-
createPlainHeader("CONTENT-TYPE", "application/json")
103-
)
102+
val plainHeaders =
103+
listOf(
104+
createPlainHeader("Content-Type", "application/json"),
105+
createPlainHeader("content-type", "application/json"),
106+
createPlainHeader("CONTENT-TYPE", "application/json")
107+
)
104108

105109
val headers = buildHeaders(plainHeaders)
106110

@@ -110,11 +114,12 @@ class Retrofit2HelperTest {
110114

111115
@Test
112116
fun testBuildHeadersWhenGivenCaseInsensitiveHeaderNamesWithDifferentValuesShouldKeepAll() {
113-
val plainHeaders = listOf(
114-
createPlainHeader("Content-Type", "application/json"),
115-
createPlainHeader("content-type", "text/html"),
116-
createPlainHeader("CONTENT-TYPE", "application/xml")
117-
)
117+
val plainHeaders =
118+
listOf(
119+
createPlainHeader("Content-Type", "application/json"),
120+
createPlainHeader("content-type", "text/html"),
121+
createPlainHeader("CONTENT-TYPE", "application/xml")
122+
)
118123

119124
val headers = buildHeaders(plainHeaders)
120125

@@ -127,11 +132,12 @@ class Retrofit2HelperTest {
127132

128133
@Test
129134
fun testBuildHeadersWhenGivenSameNameDifferentValuesShouldKeepAll() {
130-
val plainHeaders = listOf(
131-
createPlainHeader("Accept", "text/html"),
132-
createPlainHeader("Accept", "application/json"),
133-
createPlainHeader("Accept", "text/plain")
134-
)
135+
val plainHeaders =
136+
listOf(
137+
createPlainHeader("Accept", "text/html"),
138+
createPlainHeader("Accept", "application/json"),
139+
createPlainHeader("Accept", "text/plain")
140+
)
135141

136142
val headers = buildHeaders(plainHeaders)
137143

@@ -145,18 +151,19 @@ class Retrofit2HelperTest {
145151

146152
@Test
147153
fun testBuildHeadersWhenGivenComplexScenarioShouldHandleAllCasesCorrectly() {
148-
val plainHeaders = listOf(
149-
createPlainHeader("Content-Type", "application/json"),
150-
createPlainHeader("Set-Cookie", "session=abc"),
151-
createPlainHeader("Set-Cookie", "token=xyz"),
152-
createPlainHeader("Set-Cookie", "session=abc"),
153-
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
154-
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
155-
createPlainHeader("Cache-Control", "no-cache"),
156-
createPlainHeader("cache-control", "no-cache"),
157-
createPlainHeader("Accept", "text/html"),
158-
createPlainHeader("Accept", "application/json")
159-
)
154+
val plainHeaders =
155+
listOf(
156+
createPlainHeader("Content-Type", "application/json"),
157+
createPlainHeader("Set-Cookie", "session=abc"),
158+
createPlainHeader("Set-Cookie", "token=xyz"),
159+
createPlainHeader("Set-Cookie", "session=abc"),
160+
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
161+
createPlainHeader("X-Robots-Tag", "noindex, nofollow"),
162+
createPlainHeader("Cache-Control", "no-cache"),
163+
createPlainHeader("cache-control", "no-cache"),
164+
createPlainHeader("Accept", "text/html"),
165+
createPlainHeader("Accept", "application/json")
166+
)
160167

161168
val headers = buildHeaders(plainHeaders)
162169

@@ -180,10 +187,11 @@ class Retrofit2HelperTest {
180187

181188
@Test
182189
fun testBuildHeadersWhenGivenHeadersWithWhitespaceShouldPreserveExactValue() {
183-
val plainHeaders = listOf(
184-
createPlainHeader("X-Custom", "value with spaces"),
185-
createPlainHeader("X-Custom", "value with spaces")
186-
)
190+
val plainHeaders =
191+
listOf(
192+
createPlainHeader("X-Custom", "value with spaces"),
193+
createPlainHeader("X-Custom", "value with spaces")
194+
)
187195

188196
val headers = buildHeaders(plainHeaders)
189197

@@ -193,10 +201,11 @@ class Retrofit2HelperTest {
193201

194202
@Test
195203
fun testBuildHeadersWhenGivenHeadersWithSpecialCharactersShouldPreserveExactValue() {
196-
val plainHeaders = listOf(
197-
createPlainHeader("Authorization", "Bearer eyJhbGc..."),
198-
createPlainHeader("X-Special", "value=test;path=/;secure")
199-
)
204+
val plainHeaders =
205+
listOf(
206+
createPlainHeader("Authorization", "Bearer eyJhbGc..."),
207+
createPlainHeader("X-Special", "value=test;path=/;secure")
208+
)
200209

201210
val headers = buildHeaders(plainHeaders)
202211

@@ -207,10 +216,11 @@ class Retrofit2HelperTest {
207216

208217
@Test
209218
fun testBuildHeadersWhenGivenEmptyHeaderValueShouldHandleCorrectly() {
210-
val plainHeaders = listOf(
211-
createPlainHeader("X-Empty", ""),
212-
createPlainHeader("X-Empty", "")
213-
)
219+
val plainHeaders =
220+
listOf(
221+
createPlainHeader("X-Empty", ""),
222+
createPlainHeader("X-Empty", "")
223+
)
214224

215225
val headers = buildHeaders(plainHeaders)
216226

@@ -220,12 +230,13 @@ class Retrofit2HelperTest {
220230

221231
@Test
222232
fun testBuildHeadersWhenGivenMultipleHeadersWithSomeEmptyValuesShouldHandleCorrectly() {
223-
val plainHeaders = listOf(
224-
createPlainHeader("X-Test", "value1"),
225-
createPlainHeader("X-Test", ""),
226-
createPlainHeader("X-Test", "value2"),
227-
createPlainHeader("X-Test", "")
228-
)
233+
val plainHeaders =
234+
listOf(
235+
createPlainHeader("X-Test", "value1"),
236+
createPlainHeader("X-Test", ""),
237+
createPlainHeader("X-Test", "value2"),
238+
createPlainHeader("X-Test", "")
239+
)
229240

230241
val headers = buildHeaders(plainHeaders)
231242

@@ -237,5 +248,8 @@ class Retrofit2HelperTest {
237248
assertTrue(values.contains("value2"))
238249
}
239250

240-
private fun createPlainHeader(name: String, value: String) = AidlNetworkRequest.PlainHeader(name, value)
251+
private fun createPlainHeader(
252+
name: String,
253+
value: String
254+
) = AidlNetworkRequest.PlainHeader(name, value)
241255
}

0 commit comments

Comments
 (0)