Merge pull request #1420 from webauthn4j/update-gradle

ynojima · web-flow · commit ea456903ce20 · 2024-04-27T22:23:17.000+09:00
Update gradle to 8.7
diff --git a/build.gradle b/build.gradle
@@ -123,7 +123,7 @@ configure(webAuthn4JSpringSecurityLibraryProjects) {
 
     jacocoTestReport {
         reports {
-            xml.enabled true
+            xml.required = true
         }
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/fido-server-conformance-test-app/build.gradle b/samples/fido-server-conformance-test-app/build.gradle
@@ -20,8 +20,7 @@ group 'com.webauthn4j'
 description = "WebAuthn4J Spring Security Angular Sample"
 
 bootJar {
-    baseName = "webauthn4j-spring-security-sample-spa"
-    version = null
+    archiveFileName = "fido-server-conformance-test-app.jar"
 }
 
 dependencies {
diff --git a/samples/mpa/build.gradle b/samples/mpa/build.gradle
@@ -20,8 +20,7 @@ group 'com.webauthn4j'
 description = "WebAuthn4J Spring Security MPA Sample"
 
 bootJar {
-    baseName = "webauthn4j-spring-security-sample-mpa"
-    version = null
+    archiveFileName = "webauthn4j-spring-security-sample-mpa.jar"
 }
 
 dependencies {
diff --git a/samples/spa/build.gradle b/samples/spa/build.gradle
@@ -20,8 +20,7 @@ group 'com.webauthn4j'
 description = "WebAuthn4J Spring Security Angular Sample"
 
 bootJar {
-    baseName = "webauthn4j-spring-security-sample-spa"
-    version = null
+    archiveFileName = "webauthn4j-spring-security-sample-spa.jar"
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ configure(webAuthn4JSpringSecurityLibraryProjects) {`
`123`	`123`
`124`	`124`	`jacocoTestReport {`
`125`	`125`	`reports {`
`126`		`- xml.enabled true`
	`126`	`+ xml.required = true`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ group 'com.webauthn4j'`
`20`	`20`	`description = "WebAuthn4J Spring Security Angular Sample"`
`21`	`21`
`22`	`22`	`bootJar {`
`23`		`- baseName = "webauthn4j-spring-security-sample-spa"`
`24`		`- version = null`
	`23`	`+ archiveFileName = "fido-server-conformance-test-app.jar"`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`dependencies {`