Upgrade Spotless 7.0.0.BETA4 to support configuration cache (#309)

SimonMarquis · Dec 17, 2024 · f7cc888 · f7cc888
1 parent 797cac8
commit f7cc888
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 12 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,4 +19,4 @@ dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
 jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
-spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
+spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA4" }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -427,6 +427,43 @@ Ett6PX9Hrvc1MTy/UUdb3s08C0wD0x+ZzFzqUXKTZg==
 =Yytq
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    CA85FFE638D4407A
+uid    Sebastiano Vigna <sebastiano.vigna@gmail.com>
+
+sub    17755EEA52A858CE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBF+oUkoBDADeE9IXjwvW9HlfIYhQfTlJ29cReMfOM0UW3dAn3XJduUcnYKoc
+3dKGCcsanzIELL6QuapXYAlq2WWlP1oC2IEbYyilKs/ocv2gc6/GQFKBAEqHKVXH
+Vsircl1EWjap18Rp9JedCdLuyW48/l65/Jz7Hrg7KvdRCAz/81Tca3xk+mmH3AuN
+XThDYh6Ys6ejyX/4cZpZv1sc4k/+GeseU0broLkT8CCg9cE0bYnkaX7nJyDgA6Wu
+knIzCZ3X+Km6TpEKPD23um5ilDM7YynZ4o4rW55XblMlcXnusjtF7jDHqRLqIoYh
+FENj/FqtFqEob1u5d8KPdO7Ds6wcttYUZD4kvznedYn0gbJfXqTq3l2oxY5waj49
+FbPY5R3j4Zm/TYIHpKme/95Lbk7Ys36kAIUr6xY41R9VWRnQLvD+2iFWYdaufgVB
+OdSq9B6whHec166Cf+L4pourUyRm7xKJdfTExAZCtSwY61nood3rS36D3lThuC2h
+8Ea29lI1cYRpYpEAEQEAAbQtU2ViYXN0aWFubyBWaWduYSA8c2ViYXN0aWFuby52
+aWduYUBnbWFpbC5jb20+uQGNBF+oUkoBDADGDC5J4xxm6pb5oHwZLATzRAZLWUTP
++nlrvqJ1m8wH67bCuakjBYi8YvaUIZxR9+1AwYsdH38aUAhECoouLg1gwEX4+AcU
+9APo0uJ6sZ/3KJyBX+Emxt7Y+7tMVAEh+5XO3bYRzAbdQrW/ylFf8QXdw2uBiR8U
+tCnhG3D2hPOS1HfrhqSHcE4ggrBoYfwm3zz3jZhwLAVDRpVn0WhLdIdEaP39/Qxb
+urt9biaWMFbftqLc+Kq7voGAQvG9XV1t+/oRTnm0JZx5TTEi5MfnfSArDmiFXoG4
+hAaftjlfCrVZs7ZDsvL8Jmjzg2maq/1lcmx44w8ASSikPzjAFxslPISd2H1AIZYN
+RXE8t8ezyrS7+ZGs7yUXIRxkMgCeDApdXSsvsbelAu5Zk+tIe+cOJBOhDIBvmMUK
+of2wmyZapyJOwPLYPaWisZSHrOTkilBb7N3ZQ5shwu4iR+fDo5/u6sEk7fLm5JQW
+HCKsrgkFKUcFJDKLpEtMxd1Z3n4wjMabFnEAEQEAAYkBvAQYAQgAJhYhBAy1hx+3
+vzs1FhS79sqF/+Y41EB6BQJfqFJKAhsMBQkDwmcAAAoJEMqF/+Y41EB6u64L/R78
+FrFfLkjkvDI1/mlSv1hOhSS2iLO0KiKRDVPNAYDPe4N6chpHtKE7kaQmEN1TzmNT
+O2QERGQ5C9FsoKS0RJ8cVPJYHgOXBvF75NUKPcCysU1zeZiMRSsN9ctZ8hWbWdo3
+NA25G+wiBXfXHYSdmZ7R9hHrP42WY33o2MBy6w4isH1hvilglkNIfvoKDz9mK8UA
++PEJpr22m0y252I3uMJ/OMCTvqCSKVFjeODsPGznfjnk2eRKf43AoqoTx0Kh97k8
+5XasFVVSILXEdb8KCHAdc4YOsxT6HMeEjuwdab3BzAdswNIgfPPR6p9QHfJ9jrli
+THogPiD3QC9yUn4DhY29kWSgkwzHv1kPoy153PY4zh8aCkR6r/b4oMFb9l+MqGlm
+oKP8gDYvsHgzt8wiirZi463cNzpJ4X7GTAzyGIfVhv3E0t2VxOF6H3Zkq/bGt7kC
+U5Ox+ofx2IJKMWGZcjKdEom1sO3BnXQgpbBHsEkh+TJcWoMFNxiiIVXcI0zn0A==
+=H5Yi
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    E3822B59020A349D
 uid    Kotlin Libraries Release <kt-libraries@jetbrains.com>
 
@@ -981,6 +1018,51 @@ Qc4ZDKq+ywOElvONMnX4oaQ1
 =f1ra
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    15C71C0A4E0B8EDD
+uid    Matthias Bl?sing <mblaesing@doppel-helix.eu>
+
+sub    891E4C2D471515FE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+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
+LDL7A4GNor2DcqTyOw3cjy0=
+=pzVO
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    1939A2520BAB1D90
 uid    Daniel Dekany <ddekany@apache.org>
 
@@ -1314,6 +1396,35 @@ Tovwvq8=
 =TWPb
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    479D601F3A7B5C1A
+uid    AJ Alt <ajalt@users.noreply.github.com>
+
+sub    868FF6CCEF26A83C
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBF5CDMYBCADC1/aWU6ZbGZEphRbmjUPNfqh3N5goSnDCou97mmQ9Uq8iBuKS
+UXJnGSOHudXK56f+Drx5lGZdLAzveZdqaqb1o3yLFO3PJxwj3Ulhab3O3uTG2eR0
+2Xo7GKjRW13kEfphJrfVIaQq/TiyIG8IQ1dbm9Vuzc5NLDIeC4jxYD2S3hUqCLGQ
+BiZAEH9un2cPax+hiT+9MGzdfQwdVrSQ9aEA9mtMhEGsk80XtxXJnd+hw2va6l5s
+lSErmH5nMtyKh/n9uo/ap1CfPl98n5VUI8dDtUfWVrqRrkyHgdX+MII0t0nABV5X
+rJLneg4dVy5Yw/+FVbLWB1Ta21reyytcIYQXABEBAAG0J0FKIEFsdCA8YWphbHRA
+dXNlcnMubm9yZXBseS5naXRodWIuY29tPrkBDQReQgzGAQgA1oQHEM6wP40xPfpa
+YBBRAWVoEj/CbAV6BooApSqQkV0cocM9wK905az2FmlKn4WTZyNwiA2eHjHlevsI
+jKuHJWhSDVhulcKDi0cD6wTcjctcDWm7M3tvaICbieZQXPH7lju5Ct80kBo5ojdJ
+oXGD72kVhSuiF8vOrAOiLOXP8+bpCpY4+LZ4qt3XjSnrkZq+h/vcy9crwuzuFlSL
+wMRltOvfirrK/CSQZZtqG2PbT30CWFQ61DLo4DkXeNG1fKpnOaDAMaCedt+pNCAQ
+1Vdzy1vT9b85LtOH/CmhumjM3S6x/VWwWZVBXi2xVLFCkm3LlWioSvVs6Na0Vvaq
+0WDsbwARAQABiQE2BBgBCAAgFiEEA8EjA4wgqunihshXR51gHzp7XBoFAl5CDMYC
+GwwACgkQR51gHzp7XBpoYQgAjnYuxyXaFSbCc2EFWDrBA8+OnlbSgJ3etaIOoLQH
++Czv6+wLYc9snZDBm+IvbzEi3tXfi1TKcRI5ii9wDkti0KcVFrR2tpuXDLWYIF92
+cSC7VyBiyT/aZpm0zX8qP8tjRZvy7mewbnoit1R6ea5UifSLvO0bHqNoswfgv90s
+rnuUYMY8tv1sSo4j0f0zre/k4QT8sCTeMDsLsviMIvy1Wls1IPRo1SW1euGGGvCo
+bxgke8Dw5QgumudwPqehOZVOkIbuddgcur55ZFFeitMOqdRoXkrGod9v6hYY1Jz8
+W/Y2tzZmWsedFIc4ahuAeZG6cH6Ac8prHrQEz6lSbZ0flg==
+=td3S
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    56028DF552BA32E2
 uid    Dokka Release <dokka@jetbrains.com>
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -4,10 +4,10 @@
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
       <keyring-format>armored</keyring-format>
-       <key-servers enabled="false">
-           <key-server uri="https://keyserver.ubuntu.com"/>
-           <key-server uri="https://keys.openpgp.org"/>
-       </key-servers>
+      <key-servers enabled="false">
+         <key-server uri="https://keyserver.ubuntu.com"/>
+         <key-server uri="https://keys.openpgp.org"/>
+      </key-servers>
       <ignored-keys>
          <ignored-key id="0374CF2E8DD1BDFD" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="2C7B12F2A511E325" reason="Key couldn't be downloaded from any key server"/>
@@ -22,7 +22,9 @@
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH"/>
+         <trusted-key id="03C123038C20AAE9E286C857479D601F3A7B5C1A" group="^com[.]github[.]ajalt($|([.].*))" regex="true"/>
          <trusted-key id="09939C73246B4BA7444CAA453D002DBC5EA9615F" group="dev.drewhamilton.poko"/>
+         <trusted-key id="0CB5871FB7BF3B351614BBF6CA85FFE638D4407A" group="it.unimi.dsi" name="fastutil-core" version="8.5.12"/>
          <trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90" group="org.freemarker" name="freemarker"/>
          <trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A" group="com.soywiz.korlibs.korte" name="korte-jvm"/>
          <trusted-key id="1D2C7EF8ADA0F794B58C7C63436902AF59EDF60E" group="dev.equo.ide" name="solstice"/>
@@ -60,6 +62,7 @@
          <trusted-key id="DBD744ACE7ADE6AA50DD591F66B50994442D2D40" group="^com[.]squareup($|([.].*))" regex="true"/>
          <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="^org[.]jetbrains[.]kotlinx($|([.].*))" regex="true"/>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup" name="jsoup"/>
+         <trusted-key id="FA7929F83AD44C4590F6CC6815C71C0A4E0B8EDD" group="net.java.dev.jna" name="jna" version="5.14.0"/>
          <trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/>
          <trusted-key id="FF6E2C001948C5F2F38B0CC385911F425EC61B51">
             <trusting group="junit"/>
@@ -77,6 +80,11 @@
             <sha256 value="f45c82b12faacd85acd474eba699322fa5dea88408b247d0e4bde9412908223a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="7.0.0.BETA4">
+         <artifact name="com.diffplug.spotless.gradle.plugin-7.0.0.BETA4.pom">
+            <sha256 value="8a881efb3a105d33e1fabcf3649d7859350d08d11283d7283ab1ba2ed36eb2b5" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml" name="oss-parent" version="38">
          <artifact name="oss-parent-38.pom">
             <pgp value="6214760097DC5CFAD0175AC2C9FBAA83A8753994"/>
@@ -121,6 +129,14 @@
             <sha256 value="6cb5957819df393956fd311a3a0c3f5eec1ebc49ba5b2d09f3f44e6167fa3e74" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="commons-codec" name="commons-codec" version="1.17.0">
+         <artifact name="commons-codec-1.17.0.jar">
+            <sha256 value="f700de80ac270d0344fdea7468201d8b9c805e5c648331c3619f2ee067ccfc59" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="commons-codec-1.17.0.pom">
+            <sha256 value="c01c4cda5e408f41ed1d83e4a0a170cf53801b6338aba49f0f904786bc1214fc" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="dev.zacsweers.kctfork" name="core" version="0.7.0">
          <artifact name="core-0.7.0.jar">
             <sha256 value="6a041ab8c336c242b5d0835ced9b3d8de656b9a06fb99fe25b48b59e35352724" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -155,11 +171,21 @@
             <pgp value="84789D24DF77A32433CE1F079EB80E92EB2135B1"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="31">
+         <artifact name="apache-31.pom">
+            <pgp value="84789D24DF77A32433CE1F079EB80E92EB2135B1"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="58">
          <artifact name="commons-parent-58.pom">
             <sha256 value="2d4b12e18899063abd7c75278b5fa97a3729d80878ceecb6a40d946e9c0d5590" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="69">
+         <artifact name="commons-parent-69.pom">
+            <sha256 value="d50da9c39bdca823d618d1b4a03b73f196497fcb8616fd0da727c8623592a9bb" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.hamcrest" name="hamcrest-core" version="1.3">
          <artifact name="hamcrest-core-1.3.jar">
             <sha256 value="66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>

diff --git a/processor/src/main/kotlin/fr/smarquis/sealed/SealedObjectInstances.kt b/processor/src/main/kotlin/fr/smarquis/sealed/SealedObjectInstances.kt
@@ -49,10 +49,7 @@ annotation class SealedObjectInstances(
     val returnType: Boolean = true,
 ) {
 
-    enum class RawType(
-        internal val kClass: KClass<*>,
-        internal val builder: KFunction1<kotlin.Array<out Any>, Any>,
-    ) {
+    enum class RawType(internal val kClass: KClass<*>, internal val builder: KFunction1<kotlin.Array<out Any>, Any>) {
         Array(kotlin.Array::class, ::arrayOf),
         List(kotlin.collections.List::class, ::listOf),
         Set(kotlin.collections.Set::class, ::setOf),

diff --git a/processor/src/main/kotlin/fr/smarquis/sealed/SealedObjectInstancesProcessor.kt b/processor/src/main/kotlin/fr/smarquis/sealed/SealedObjectInstancesProcessor.kt
@@ -46,9 +46,7 @@ import java.io.OutputStreamWriter
 import kotlin.reflect.KClass
 import kotlin.text.Typography.ellipsis
 
-internal class SealedObjectInstancesProcessor(
-    private val environment: SymbolProcessorEnvironment,
-) : SymbolProcessor {
+internal class SealedObjectInstancesProcessor(private val environment: SymbolProcessorEnvironment) : SymbolProcessor {
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
         resolver.getSymbolsWithAnnotation(SealedObjectInstances::class.qualifiedName!!)