Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 30443186 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #1623 from nextcloud/spotlessFix

Fix spotless
parents eeff7237 c6a41f2b
Loading
Loading
Loading
Loading
+109 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@
      </trusted-artifacts>
      <ignored-keys>
         <ignored-key id="31D2D79DF7E85DD3" reason="Key couldn't be downloaded from any key server"/>
         <ignored-key id="479D601F3A7B5C1A" reason="Key couldn't be downloaded from any key server"/>
      </ignored-keys>
      <trusted-keys>
         <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/>
@@ -78,7 +79,10 @@
            <trusting group="org.slf4j"/>
         </trusted-key>
         <trusted-key id="4797B4F5DCC46CEA61059071A1AE06236CA2BA62" group="^com[.]diffplug($|([.].*))" regex="true"/>
         <trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5" group="io.github.oshai" name="kotlin-logging-jvm" version="5.1.4"/>
         <trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5">
            <trusting group="io.github.oshai" name="kotlin-logging-jvm" version="5.1.4"/>
            <trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.3"/>
         </trusted-key>
         <trusted-key id="48B086A7D843CFA258E83286928FBF39003C0425" group="org.springframework"/>
         <trusted-key id="4BF79B8259007B566D2FCE82296CD27F60EED12C" group="com.google.crypto.tink" name="tink" version="1.7.0"/>
         <trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
@@ -3802,6 +3806,110 @@
            <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.clikt" name="clikt" version="5.0.2">
         <artifact name="clikt-5.0.2.module">
            <sha256 value="471ce7619c63102f7dfcc0336ca43ed7da5916460b71d0060caddef90b5053ce" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.clikt" name="clikt-core" version="5.0.2">
         <artifact name="clikt-core-5.0.2.module">
            <sha256 value="c1ac6535f361e6cb80510b2fcf37cc8f54a48911522ae9ec62cef71dc2021af9" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.clikt" name="clikt-core-jvm" version="5.0.2">
         <artifact name="clikt-core-jvm-5.0.2.module">
            <sha256 value="2016cc15ab9bbf50ab36a60f481973535523ebd32cd1bae103998a60d9b19c38" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="clikt-jvm.jar">
            <sha256 value="18b2df30a3395a37823ec432375a15b485d292b6575e30ef184cc9e7c07d8b87" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.clikt" name="clikt-jvm" version="5.0.2">
         <artifact name="clikt-jvm-5.0.2.module">
            <sha256 value="5cfdf05d50da81661b104bb983ed16cd8c90fa0be2a1dfe4fb8b4136d1a47ffe" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="clikt-mordant-jvm.jar">
            <sha256 value="0835107b51d57214d5a2e15d4b214fdd66b3eee5bb3acf96ff35b23bd4a36cde" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.colormath" name="colormath" version="3.6.0">
         <artifact name="colormath-3.6.0.module">
            <sha256 value="6907aa497adb9af63812c75366389ced3e6bb8bee80e7b239adb4c53673f8884" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.colormath" name="colormath-jvm" version="3.6.0">
         <artifact name="colormath-jvm-3.6.0.module">
            <sha256 value="3fa76730f989e0284df182fcec85620d9b48ae3221398841ac6caf88462f62f8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="colormath-jvm.jar">
            <sha256 value="59f741adfe62053066782d8b1a45afd06685a4bc64b33277e54876b993ed885c" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant" version="3.0.1">
         <artifact name="mordant-3.0.1.module">
            <sha256 value="9492dc7f636026df2e9429229b9d807b5774d2e641510d90bf829bd2acb3b615" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-core" version="3.0.1">
         <artifact name="mordant-core-3.0.1.module">
            <sha256 value="05697ac5c055f14876709fd4e9fd5e8c3d15a61ac77ac572f916449932a08c2f" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-core-jvm" version="3.0.1">
         <artifact name="mordant-core-jvm-3.0.1.module">
            <sha256 value="e4744c471074e5ecd4161f7070b4594df00ef178af044265905e5ed1ceb5ac92" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="mordant-jvm.jar">
            <sha256 value="9cf9b46d1f49f2d6cf2635462b29dc59e0c29b1fb2f085b3312888bbe9c7cd31" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm" version="3.0.1">
         <artifact name="mordant-jvm-3.0.1.module">
            <sha256 value="a5e4f2312b7af420c6d832c303891c1a0d8637ccfa5a94d89f1146c4866980ba" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="mordant-omnibus-jvm.jar">
            <sha256 value="9ed3b976fcccc78da746d49866fa8ebb8f10530a93c544ea0420259a607dd95e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm-ffm" version="3.0.1">
         <artifact name="mordant-jvm-ffm-3.0.1.module">
            <sha256 value="d85ae0fb49fb6d714789b43f31b567528c9b8adf86d0ebb98694a41a91e09a67" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm-ffm-jvm" version="3.0.1">
         <artifact name="mordant-jvm-ffm-jvm-3.0.1.module">
            <sha256 value="884d71fcb7c1010ae6d75aa891ae54a989861154b07f1215cd545f0e4837e15d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="mordant-jvm-ffm-jvm.jar">
            <sha256 value="2041c2f5f7b87095b115cb19155ee9257451854d08e5b8671165b43bc7e114cf" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm-graal-ffi" version="3.0.1">
         <artifact name="mordant-jvm-graal-ffi-3.0.1.module">
            <sha256 value="aaefda20672483b3b0b260dd1ef1342ce6b34ece88bad6df39ae1b26050c8c0a" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm-graal-ffi-jvm" version="3.0.1">
         <artifact name="mordant-jvm-graal-ffi-jvm-3.0.1.module">
            <sha256 value="0d819b6bfbbca4ee97b33078668129690766aff948fc1c831788f4e034853ac3" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="mordant-jvm-graal-ffi-jvm.jar">
            <sha256 value="6dd4bebc164aeacddacc8f98e8f871e00fd21ce7bc2eb0d18230ea83bddfc86a" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm-jna" version="3.0.1">
         <artifact name="mordant-jvm-jna-3.0.1.module">
            <sha256 value="727fb516234e8bafc92795e2ecbd0da3854d723a16c69842ac61920bf58879b9" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.ajalt.mordant" name="mordant-jvm-jna-jvm" version="3.0.1">
         <artifact name="mordant-jvm-jna-jvm-3.0.1.module">
            <sha256 value="78170d925d3baa758662f97633616390de90d42a2c94e3763eaa590576378e1e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
         <artifact name="mordant-jvm-jna-jvm.jar">
            <sha256 value="41063442c8891b2774536a9b87a5062a7fd20e6f1949974c6da72f49472d6f4d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
         </artifact>
      </component>
      <component group="com.github.bitfireAT" name="dav4jvm" version="2.2.1">
         <artifact name="dav4jvm-2.2.1.jar">
            <sha256 value="5ce40389fc7ba0b630f07cbd2a573a507db616aed0ffdc744fb78000d8835815" origin="Generated by Gradle" reason="Artifact is not signed">
+6 −1
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ class DashboardListWidgetsRemoteOperationIT : AbstractIT() {
        assertTrue(result.resultData["recommendations"]?.buttons?.getOrNull(0) == null)

        assertEquals(1, result.resultData["activity"]?.buttons?.size)
        assertTrue(result.resultData["activity"]?.buttons?.getOrNull(0)?.type == DashBoardButtonType.MORE)
        assertTrue(
            result.resultData["activity"]
                ?.buttons
                ?.getOrNull(0)
                ?.type == DashBoardButtonType.MORE
        )
        assertTrue(result.resultData["activity"]?.roundIcons == false)

        assertTrue(result.resultData["user_status"]?.roundIcons == true)
+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ class ToggleFileLockRemoteOperationIT : AbstractIT() {
        assertTrue(
            @Suppress("Detekt.MagicNumber")
            UploadFileRemoteOperation(filePath, remotePath, "text/markdown", 1464818400)
                .execute(client).isSuccess
                .execute(client)
                .isSuccess
        )
        val initialFile =
            ReadFileRemoteOperation(remotePath).execute(client).singleData as RemoteFile
+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ class SearchProvidersRemoteOperationIT : AbstractIT() {
        // only on < NC20
        val ocCapability =
            GetCapabilitiesRemoteOperation()
                .execute(nextcloudClient).singleData as OCCapability
                .execute(nextcloudClient)
                .singleData as OCCapability
        assumeTrue(
            ocCapability.version.isOlderThan(OwnCloudVersion.nextcloud_20)
        )
+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() {
        assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess)
        val remoteFile =
            ReadFileRemoteOperation(remotePath)
                .execute(client).data[0] as RemoteFile
                .execute(client)
                .data[0] as RemoteFile
        val fileId = remoteFile.localId

        val result = UnifiedSearchRemoteOperation("files", "test").execute(nextcloudClient)
Loading