Merge pull request #360 from Yubico/fix-build

Bump test dependency versions
Yubico · Jun 4, 2024 · 33f31b3 · 33f31b3 · github-actions · Jun 4, 2024
2 parents 63366e1 + 0d5b5ef
commit 33f31b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -16,6 +16,6 @@ dependencies {
   // Spotless dropped Java 8 support in version 2.33.0
   if (JavaVersion.current().isJava11Compatible) {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
-    implementation("io.github.cosmicsilence:gradle-scalafix:0.1.15")
+    implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")
   }
 }
diff --git a/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle b/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
@@ -13,9 +13,10 @@ spotless {
 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")
+    if (project.name != "yubico-util-scala") {
+        // yubico-util-scala is the only subproject with Scala sources in the "main" source set
+        ignoreSourceSets.add("main")
+    }
 }
 
 project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")

diff --git a/test-platform/build.gradle.kts b/test-platform/build.gradle.kts
@@ -9,12 +9,12 @@ dependencies {
     api("junit:junit:4.13.2")
     api("org.bouncycastle:bcpkix-jdk18on:[1.62,2)")
     api("org.bouncycastle:bcprov-jdk18on:[1.62,2)")
-    api("org.mockito:mockito-core:4.7.0")
-    api("org.scalacheck:scalacheck_2.13:1.16.0")
-    api("org.scalatest:scalatest_2.13:3.2.13")
-    api("org.scalatestplus:junit-4-13_2.13:3.2.13.0")
-    api("org.scalatestplus:scalacheck-1-16_2.13:3.2.13.0")
-    api("org.slf4j:slf4j-nop:2.0.3")
+    api("org.mockito:mockito-core:4.11.0")
+    api("org.scalacheck:scalacheck_2.13:1.18.0")
+    api("org.scalatest:scalatest_2.13:3.2.18")
+    api("org.scalatestplus:junit-4-13_2.13:3.2.18.0")
+    api("org.scalatestplus:scalacheck-1-16_2.13:3.2.14.0")
+    api("org.slf4j:slf4j-nop:2.0.13")
     api("uk.org.lidalia:slf4j-test:1.2.0")
   }
 }
Package	Coverage	Stats	Prev	Prev
Overall	83 % 🟢	1387 🔺 / 1669 🔹	81 %	1365 / 1669
`com.yubico.fido.metadata`	74 % 🟢	242 🔺 / 323 🔹	68 %	220 / 323
`com.yubico.internal.util`	46 % 🔹	57 🔹 / 123 🔹	46 %	57 / 123
`com.yubico.webauthn`	88 % 🔹	647 🔹 / 733 🔹	88 %	647 / 733
`com.yubico.webauthn.attestation`	92 % 🔹	13 🔹 / 14 🔹	92 %	13 / 14
`com.yubico.webauthn.data`	93 % 🔹	403 🔹 / 429 🔹	93 %	403 / 429
`com.yubico.webauthn.extension.appid`	100 % 🏆	13 🔹 / 13 🔹	100 %	13 / 13
`com.yubico.webauthn.extension.uvm`	50 % 🔹	12 🔹 / 24 🔹	50 %	12 / 24
`com.yubico.webauthn.meta`	0 % 🔹	0 🔹 / 10 🔹	0 %	0 / 10