Merge branch 'main' into cose-alg-id

fdennis · fdennis · commit 05fcfab80ea4 · 2025-09-22T13:07:07.000+02:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 
   // Spotless dropped Java 8 support in version 2.33.0
   if (JavaVersion.current().isJava11Compatible) {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.1")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
     implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")
   }
 }
diff --git a/webauthn-server-core/src/test/scala/com/yubico/webauthn/RegistrationTestData.scala b/webauthn-server-core/src/test/scala/com/yubico/webauthn/RegistrationTestData.scala
@@ -1092,7 +1092,7 @@ case class RegistrationTestData(
       val newValue =
         RegistrationTestData.from(credential, keypair, attestationCertChain)
       newValue.copy(
-        assertion = newValue.assertion.map(_.regenerate(newValue))
+        assertion = assertion.map(_.regenerate(newValue))
       )
     })
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies {`
`15`	`15`
`16`	`16`	`// Spotless dropped Java 8 support in version 2.33.0`
`17`	`17`	`if (JavaVersion.current().isJava11Compatible) {`
`18`		`- implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.1")`
	`18`	`+ implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")`
`19`	`19`	`implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1092,7 +1092,7 @@ case class RegistrationTestData(`
`1092`	`1092`	`val newValue =`
`1093`	`1093`	`RegistrationTestData.from(credential, keypair, attestationCertChain)`
`1094`	`1094`	`newValue.copy(`
`1095`		`- assertion = newValue.assertion.map(_.regenerate(newValue))`
	`1095`	`+ assertion = assertion.map(_.regenerate(newValue))`
`1096`	`1096`	`)`
`1097`	`1097`	`})`
`1098`	`1098`