Merge pull request #283 from Yubico/dependabot/gradle/com.diffplug.spotless-spotless-plugin-gradle-6.18.0

emlun · web-flow · commit e266bad5b266 · 2023-05-17T15:49:56.000+02:00
Bump com.diffplug.spotless:spotless-plugin-gradle from 6.13.0 to 6.18.0
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,8 +10,12 @@ repositories {
 }
 
 dependencies {
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.13.0")
   implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11")
   implementation("io.franzbecker:gradle-lombok:5.0.0")
-  implementation("io.github.cosmicsilence:gradle-scalafix:0.1.14")
+
+  // Spotless dropped Java 8 support in version 2.33.0
+  if (JavaVersion.current().isJava11Compatible) {
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
+    implementation("io.github.cosmicsilence:gradle-scalafix:0.1.14")
+  }
 }
diff --git a/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle b/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
@@ -0,0 +1,33 @@
+project.apply(plugin: "com.diffplug.spotless")
+project.apply(plugin: "io.github.cosmicsilence.scalafix")
+
+spotless {
+    java {
+        googleJavaFormat()
+    }
+    scala {
+        scalafmt("2.6.3").configFile(project.rootProject.file("scalafmt.conf"))
+    }
+}
+
+scalafix {
+    configFile.set(project.rootProject.file("scalafix.conf"))
+
+    // Work around dependency resolution issues in April 2022
+    semanticdb.autoConfigure.set(true)
+    semanticdb.version.set("4.5.5")
+}
+
+project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")
+
+
+project.afterEvaluate {
+    // These need to be in afterEvaluate due to this plugin
+    // being conditionally applied for Java 11+ only
+    project.tasks.spotlessApply.configure { dependsOn(project.tasks.scalafix) }
+    project.tasks.spotlessCheck.configure { dependsOn(project.tasks.checkScalafix) }
+
+    // Scalafix adds tasks in afterEvaluate, so their configuration must be deferred
+    project.tasks.scalafix.finalizedBy(project.tasks.spotlessApply)
+    project.tasks.checkScalafix.finalizedBy(project.tasks.spotlessCheck)
+}
diff --git a/buildSrc/src/main/kotlin/project-convention-code-formatting.gradle.kts b/buildSrc/src/main/kotlin/project-convention-code-formatting.gradle.kts
@@ -1,32 +1,4 @@
-plugins {
-    id("com.diffplug.spotless")
-    id("io.github.cosmicsilence.scalafix")
-}
-
-spotless {
-    java {
-        googleJavaFormat()
-    }
-    scala {
-        scalafmt("2.6.3").configFile(project.rootProject.file("scalafmt.conf"))
-    }
-}
-
-scalafix {
-    configFile.set(project.rootProject.file("scalafix.conf"))
-
-    // Work around dependency resolution issues in April 2022
-    semanticdb.autoConfigure.set(true)
-    semanticdb.version.set("4.5.5")
-}
-
-project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")
-
-project.tasks.spotlessApply.configure { dependsOn(project.tasks["scalafix"]) }
-project.tasks.spotlessCheck.configure { dependsOn(project.tasks["checkScalafix"]) }
-
-// Scalafix adds tasks in afterEvaluate, so their configuration must be deferred
-project.afterEvaluate {
-    project.tasks["scalafix"].finalizedBy(project.tasks.spotlessApply)
-    project.tasks["checkScalafix"].finalizedBy(project.tasks.spotlessCheck)
+// Spotless dropped Java 8 support in version 2.33.0
+if (JavaVersion.current().isJava11Compatible) {
+    apply(plugin = "project-convention-code-formatting-internal")
 }
diff --git a/webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataDownloader.java b/webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataDownloader.java
@@ -677,9 +677,16 @@ public FidoMetadataDownloaderBuilder trustHttpsCerts(@NonNull X509Certificate...
    *     written to cache in this case.
    */
   public MetadataBLOB loadCachedBlob()
-      throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
-          CertificateException, IOException, NoSuchAlgorithmException, SignatureException,
-          InvalidKeyException, UnexpectedLegalHeader, DigestException,
+      throws CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          CertificateException,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
+          InvalidKeyException,
+          UnexpectedLegalHeader,
+          DigestException,
           FidoMetadataDownloaderException {
     final X509Certificate trustRoot = retrieveTrustRootCert();
 
@@ -773,9 +780,16 @@ public MetadataBLOB loadCachedBlob()
    *     written to cache in this case.
    */
   public MetadataBLOB refreshBlob()
-      throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
-          CertificateException, IOException, NoSuchAlgorithmException, SignatureException,
-          InvalidKeyException, UnexpectedLegalHeader, DigestException,
+      throws CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          CertificateException,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
+          InvalidKeyException,
+          UnexpectedLegalHeader,
+          DigestException,
           FidoMetadataDownloaderException {
     final X509Certificate trustRoot = retrieveTrustRootCert();
 
@@ -797,9 +811,16 @@ public MetadataBLOB refreshBlob()
 
   private Optional<MetadataBLOB> refreshBlobInternal(
       @NonNull X509Certificate trustRoot, @NonNull Optional<MetadataBLOB> cached)
-      throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
-          CertificateException, IOException, NoSuchAlgorithmException, SignatureException,
-          InvalidKeyException, UnexpectedLegalHeader, FidoMetadataDownloaderException {
+      throws CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          CertificateException,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
+          InvalidKeyException,
+          UnexpectedLegalHeader,
+          FidoMetadataDownloaderException {
 
     try {
       log.debug("Attempting to download new BLOB...");
@@ -928,9 +949,15 @@ private X509Certificate retrieveTrustRootCert()
    *     signature.
    */
   private Optional<MetadataBLOB> loadExplicitBlobOnly(X509Certificate trustRootCertificate)
-      throws Base64UrlException, CertPathValidatorException, CertificateException, IOException,
-          InvalidAlgorithmParameterException, InvalidKeyException, NoSuchAlgorithmException,
-          SignatureException, FidoMetadataDownloaderException {
+      throws Base64UrlException,
+          CertPathValidatorException,
+          CertificateException,
+          IOException,
+          InvalidAlgorithmParameterException,
+          InvalidKeyException,
+          NoSuchAlgorithmException,
+          SignatureException,
+          FidoMetadataDownloaderException {
     if (blobJwt != null) {
       return Optional.of(
           parseAndVerifyBlob(
@@ -1008,9 +1035,15 @@ private ByteArray download(URL url) throws IOException {
   }
 
   private MetadataBLOB parseAndVerifyBlob(ByteArray jwt, X509Certificate trustRootCertificate)
-      throws CertPathValidatorException, InvalidAlgorithmParameterException, CertificateException,
-          IOException, NoSuchAlgorithmException, SignatureException, InvalidKeyException,
-          Base64UrlException, FidoMetadataDownloaderException {
+      throws CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          CertificateException,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
+          InvalidKeyException,
+          Base64UrlException,
+          FidoMetadataDownloaderException {
     Scanner s = new Scanner(new ByteArrayInputStream(jwt.getBytes())).useDelimiter("\\.");
     final ByteArray header = ByteArray.fromBase64Url(s.next());
     final ByteArray payload = ByteArray.fromBase64Url(s.next());
@@ -1023,8 +1056,13 @@ private MetadataBLOB verifyBlob(
       ByteArray jwtPayload,
       ByteArray jwtSignature,
       X509Certificate trustRootCertificate)
-      throws IOException, CertificateException, NoSuchAlgorithmException, InvalidKeyException,
-          SignatureException, CertPathValidatorException, InvalidAlgorithmParameterException,
+      throws IOException,
+          CertificateException,
+          NoSuchAlgorithmException,
+          InvalidKeyException,
+          SignatureException,
+          CertPathValidatorException,
+          InvalidAlgorithmParameterException,
           FidoMetadataDownloaderException {
     final ObjectMapper headerJsonMapper =
         com.yubico.internal.util.JacksonCodecs.json()
diff --git a/webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataService.java b/webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataService.java
@@ -325,9 +325,16 @@ public FidoMetadataServiceBuilder certStore(@NonNull CertStore certStore) {
     }
 
     public FidoMetadataService build()
-        throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
-            DigestException, FidoMetadataDownloaderException, CertificateException,
-            UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
+        throws CertPathValidatorException,
+            InvalidAlgorithmParameterException,
+            Base64UrlException,
+            DigestException,
+            FidoMetadataDownloaderException,
+            CertificateException,
+            UnexpectedLegalHeader,
+            IOException,
+            NoSuchAlgorithmException,
+            SignatureException,
             InvalidKeyException {
       return new FidoMetadataService(blob, prefilter, filter, certStore);
     }
diff --git a/webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnRestResource.java b/webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnRestResource.java
@@ -84,10 +84,18 @@ public class WebAuthnRestResource {
   private final JsonNodeFactory jsonFactory = JsonNodeFactory.instance;
 
   public WebAuthnRestResource()
-      throws InvalidAppIdException, CertificateException, CertPathValidatorException,
-          InvalidAlgorithmParameterException, Base64UrlException, DigestException,
-          FidoMetadataDownloaderException, UnexpectedLegalHeader, IOException,
-          NoSuchAlgorithmException, SignatureException, InvalidKeyException {
+      throws InvalidAppIdException,
+          CertificateException,
+          CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          DigestException,
+          FidoMetadataDownloaderException,
+          UnexpectedLegalHeader,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
+          InvalidKeyException {
     this(new WebAuthnServer());
   }
 
diff --git a/webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnServer.java b/webauthn-server-demo/src/main/java/demo/webauthn/WebAuthnServer.java
@@ -105,9 +105,16 @@ public class WebAuthnServer {
   private final MetadataService metadataService = getMetadataService();
 
   private static MetadataService getMetadataService()
-      throws CertPathValidatorException, InvalidAlgorithmParameterException, Base64UrlException,
-          DigestException, FidoMetadataDownloaderException, CertificateException,
-          UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
+      throws CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          DigestException,
+          FidoMetadataDownloaderException,
+          CertificateException,
+          UnexpectedLegalHeader,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
           InvalidKeyException {
     if (Config.useFidoMds()) {
       logger.info("Using combination of Yubico JSON file and FIDO MDS for attestation metadata.");
@@ -140,9 +147,16 @@ private static MetadataService getMetadataService()
   private final RelyingParty rp;
 
   public WebAuthnServer()
-      throws CertificateException, CertPathValidatorException, InvalidAlgorithmParameterException,
-          Base64UrlException, DigestException, FidoMetadataDownloaderException,
-          UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
+      throws CertificateException,
+          CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          DigestException,
+          FidoMetadataDownloaderException,
+          UnexpectedLegalHeader,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
           InvalidKeyException {
     this(
         new InMemoryRegistrationStorage(),
@@ -158,9 +172,16 @@ public WebAuthnServer(
       Cache<ByteArray, AssertionRequestWrapper> assertRequestStorage,
       RelyingPartyIdentity rpIdentity,
       Set<String> origins)
-      throws CertificateException, CertPathValidatorException, InvalidAlgorithmParameterException,
-          Base64UrlException, DigestException, FidoMetadataDownloaderException,
-          UnexpectedLegalHeader, IOException, NoSuchAlgorithmException, SignatureException,
+      throws CertificateException,
+          CertPathValidatorException,
+          InvalidAlgorithmParameterException,
+          Base64UrlException,
+          DigestException,
+          FidoMetadataDownloaderException,
+          UnexpectedLegalHeader,
+          IOException,
+          NoSuchAlgorithmException,
+          SignatureException,
           InvalidKeyException {
     this.userStorage = userStorage;
     this.registerRequestStorage = registerRequestStorage;

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,12 @@ repositories {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- implementation("com.diffplug.spotless:spotless-plugin-gradle:6.13.0")`
`14`	`13`	`implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11")`
`15`	`14`	`implementation("io.franzbecker:gradle-lombok:5.0.0")`
`16`		`- implementation("io.github.cosmicsilence:gradle-scalafix:0.1.14")`
	`15`	`+`
	`16`	`+ // Spotless dropped Java 8 support in version 2.33.0`
	`17`	`+ if (JavaVersion.current().isJava11Compatible) {`
	`18`	`+ implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")`
	`19`	`+ implementation("io.github.cosmicsilence:gradle-scalafix:0.1.14")`
	`20`	`+ }`
`17`	`21`	`}`