Skip to content

Commit 5e44a23

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #1938 from nextcloud/renovate/com.diffplug.spotless-8.x
chore(deps): update plugin com.diffplug.spotless to v8.2.1
2 parents 85d95d5 + 0b5df3f commit 5e44a23

7 files changed

Lines changed: 67 additions & 16 deletions

File tree

‎gradle/verification-metadata.xml‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
<trusted-key id="4797B4F5DCC46CEA61059071A1AE06236CA2BA62" group="^com[.]diffplug($|([.].*))" regex="true"/>
113113
<trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5">
114114
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="5.1.4"/>
115+
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.13"/>
115116
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.3"/>
116117
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.7"/>
117118
</trusted-key>
@@ -192,6 +193,7 @@
192193
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.0"/>
193194
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.100"/>
194195
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
196+
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
195197
</trusted-key>
196198
<trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
197199
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA">
@@ -8080,6 +8082,11 @@
80808082
<sha256 value="58b0b4ed49b3b19072b55c7111c0991a07f9b6d20709af8aa470c714114afbfb" origin="Generated by Gradle" reason="Artifact is not signed"/>
80818083
</artifact>
80828084
</component>
8085+
<component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.2.1">
8086+
<artifact name="com.diffplug.spotless.gradle.plugin-8.2.1.pom">
8087+
<sha256 value="306b777dc39f44fec62b50bdefe41b716beb0fd7cd3f81572273a134c2e155b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
8088+
</artifact>
8089+
</component>
80838090
<component group="com.diffplug.spotless" name="spotless-lib" version="3.0.2">
80848091
<artifact name="spotless-lib-3.0.2.jar">
80858092
<sha256 value="3f9a7fdfc5b03ac20894834170910c15c4f2b84ed4ce3677898a307ad589837c" origin="Generated by Gradle"/>
@@ -8120,14 +8127,22 @@
81208127
<sha256 value="a4daac7a7bb8d826a807ce6277274ca461945aa29787d771e5392416593e2741" origin="Generated by Gradle"/>
81218128
</artifact>
81228129
</component>
8123-
<component group="com.diffplug.spotless" name="spotless-lib" version="4.1.0">
8124-
<artifact name="spotless-lib-4.1.0.jar">
8125-
<sha256 value="d9d5e5ce724a4071c3b6d96433744f3b69a27c66e0f2d7ed372b7a1df612c0a1" origin="Generated by Gradle"/>
8130+
<component group="com.diffplug.spotless" name="spotless-lib" version="4.3.0">
8131+
<artifact name="spotless-lib-4.3.0.jar">
8132+
<sha256 value="669f844ec0a974941c6da04b670748f43178239b6d99fddb5b062ce9d06d0939" origin="Generated by Gradle"/>
81268133
</artifact>
8127-
<artifact name="spotless-lib-4.1.0.module">
8128-
<sha256 value="4cb73d4d7bcd8c7b6bbf308f729d4cb79cccdcc6d7d37cc9379ac988707e1ad3" origin="Generated by Gradle"/>
8134+
<artifact name="spotless-lib-4.3.0.module">
8135+
<sha256 value="2351c080fe2455334602ffd0a821d88adf62a53e6ea184c4395f4f5505de3723" origin="Generated by Gradle"/>
81298136
</artifact>
81308137
</component>
8138+
<component group="com.diffplug.spotless" name="spotless-lib" version="4.1.0">
8139+
<artifact name="spotless-lib-4.1.0.jar">
8140+
<sha256 value="d9d5e5ce724a4071c3b6d96433744f3b69a27c66e0f2d7ed372b7a1df612c0a1" origin="Generated by Gradle"/>
8141+
</artifact>
8142+
<artifact name="spotless-lib-4.1.0.module">
8143+
<sha256 value="4cb73d4d7bcd8c7b6bbf308f729d4cb79cccdcc6d7d37cc9379ac988707e1ad3" origin="Generated by Gradle"/>
8144+
</artifact>
8145+
</component>
81318146
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.0.2">
81328147
<artifact name="spotless-lib-extra-3.0.2.jar">
81338148
<sha256 value="b0e77746d633d445e78489ac3d08ad2ea1b3537c4d064e4abe46cc42d62303eb" origin="Generated by Gradle"/>
@@ -8176,6 +8191,14 @@
81768191
<sha256 value="67b0257f31b9e1d5dd9a4169229f9997a99c72c1f940cfa8e53c072bb8ebccfd" origin="Generated by Gradle"/>
81778192
</artifact>
81788193
</component>
8194+
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="4.3.0">
8195+
<artifact name="spotless-lib-extra-4.3.0.jar">
8196+
<sha256 value="754f804c09dfa2eb8d53963311d2be68f1b4a5621011dcb550d702ead28651d9" origin="Generated by Gradle"/>
8197+
</artifact>
8198+
<artifact name="spotless-lib-extra-4.3.0.module">
8199+
<sha256 value="c8898905e692a7e08701357c3cad0d4fe26aa208cd7ab0ded8d70d3929cba112" origin="Generated by Gradle"/>
8200+
</artifact>
8201+
</component>
81798202
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.2">
81808203
<artifact name="spotless-plugin-gradle-7.0.2.jar">
81818204
<sha256 value="59a34c4f84a48d4c8d929e2f89906369e65476ec0499a43de87c3e4127977cd5" origin="Generated by Gradle"/>
@@ -8224,6 +8247,14 @@
82248247
<sha256 value="892bfb7c1e1af32ae3b458fda95389f564186b2d4ccd62097046fc690cd49a68" origin="Generated by Gradle"/>
82258248
</artifact>
82268249
</component>
8250+
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="8.2.1">
8251+
<artifact name="spotless-plugin-gradle-8.2.1.jar">
8252+
<sha256 value="dbf44f8df1832800241d4f135129fc921ba82fb22d72430cc42d4d3d5bbf9d3c" origin="Generated by Gradle"/>
8253+
</artifact>
8254+
<artifact name="spotless-plugin-gradle-8.2.1.module">
8255+
<sha256 value="38f6f6f24dd05a626c91cc163af4d3867abd50f086767aa64da25f320fa2939b" origin="Generated by Gradle"/>
8256+
</artifact>
8257+
</component>
82278258
<component group="com.fasterxml" name="oss-parent" version="56">
82288259
<artifact name="oss-parent-56.pom">
82298260
<sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>

‎library/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
}
3030

3131
plugins {
32-
id "com.diffplug.spotless" version "8.1.0"
32+
id "com.diffplug.spotless" version "8.2.1"
3333
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.10'
3434
}
3535

‎library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,11 @@ class UpdateShareRemoteOperationIT : AbstractIT() {
197197
result.message
198198
)
199199
}
200+
200201
capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_21) -> {
201202
assertEquals("Password needs to be at least 8 characters long.", result.message)
202203
}
204+
203205
else -> {
204206
assertEquals("Password needs to be at least 8 characters long", result.message)
205207
}

‎library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,25 @@ class ElementTypeAdapter :
4545
val prefix = "com.nextcloud.android.lib.resources.clientintegration"
4646
val cls: Class<out Element> =
4747
when (typeName) {
48-
"Button" ->
48+
"Button" -> {
4949
Class.forName("$prefix.LayoutButton") as Class<out Element>
50+
}
5051

51-
"Text" ->
52+
"Text" -> {
5253
Class.forName("$prefix.LayoutText") as Class<out Element>
54+
}
5355

54-
"Image" ->
56+
"Image" -> {
5557
Class.forName("$prefix.LayoutImage") as Class<out Element>
58+
}
5659

57-
"URL" ->
60+
"URL" -> {
5861
Class.forName("$prefix.LayoutURL") as Class<out Element>
62+
}
5963

60-
else -> return null
64+
else -> {
65+
return null
66+
}
6167
}
6268

6369
return Gson().fromJson(json, cls)

‎library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,13 @@ class ToggleFileLockRemoteOperation(
6060
private fun isSuccess(status: Int): Boolean =
6161
when (status) {
6262
HttpStatus.SC_OK -> true
63-
HttpStatus.SC_LOCKED -> toLock // treat "already locked" as success when trying to lock
64-
HttpStatus.SC_PRECONDITION_FAILED -> !toLock // used for "already unlocked" when trying to unlock
63+
64+
HttpStatus.SC_LOCKED -> toLock
65+
66+
// treat "already locked" as success when trying to lock
67+
HttpStatus.SC_PRECONDITION_FAILED -> !toLock
68+
69+
// used for "already unlocked" when trying to unlock
6570
else -> false
6671
}
6772

‎library/src/main/java/com/nextcloud/extensions/ArrayListExtensions.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ inline fun <reified T> ArrayList<*>.processXmlData(tagName: String): T? {
2020
Float::class -> {
2121
textContent.toFloatOrNull() as? T
2222
}
23+
2324
Double::class -> {
2425
textContent.toDoubleOrNull() as? T
2526
}
26-
else -> textContent as? T
27+
28+
else -> {
29+
textContent as? T
30+
}
2731
}
2832
}
2933
}

‎library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,19 +393,22 @@ class WebdavEntry constructor(
393393
if (prop?.value != null) {
394394
tags =
395395
when (prop.value) {
396-
is ArrayList<*> ->
396+
is ArrayList<*> -> {
397397
(prop.value as ArrayList<*>)
398398
.filterIsInstance<Element>()
399399
.map { parseTag(it) }
400400
.toTypedArray()
401+
}
401402

402403
is Element -> {
403404
val element = (prop.value as Element)
404405
val tag = parseTag(element)
405406
arrayOf(tag)
406407
}
407408

408-
else -> emptyArray()
409+
else -> {
410+
emptyArray()
411+
}
409412
}
410413
}
411414

0 commit comments

Comments
 (0)