From ef12050a8c013eb1b0f20c890398fb3cec594f99 Mon Sep 17 00:00:00 2001
From: Emil Lundberg <emil@yubico.com>
Date: Mon, 3 Jun 2024 15:42:40 +0200
Subject: [PATCH] Fix scalafix errors

(git cherry-pick 3a67ec4a1b2d6588e5161fc24de6ae28544ddd88)

The `ignoreSourceSets` config is needed to fix errors like this:

```
Execution failed for task ':yubico-util:configSemanticDBMain'.
> Failed to calculate the value of task ':yubico-util:configSemanticDBMain' property 'scalaVersion'.
> Unable to detect the Scala version for the 'main' source set. Please ensure it declares dependency to scala-library or consider adding it to 'ignoreSourceSets'
```

The change to `project-convention-code-formatting-internal.gradle` is needed to fix this error:

```
Execution failed for task ':yubico-util-scala:compileScala'.
> Could not resolve all files for configuration ':yubico-util-scala:detachedConfiguration1'.
   > Could not find org.scalameta:semanticdb-scalac_2.13.13:4.5.5.
     Searched in the following locations:
       - https://repo.maven.apache.org/maven2/org/scalameta/semanticdb-scalac_2.13.13/4.5.5/semanticdb-scalac_2.13.13-4.5.5.pom
     If the artifact you are trying to retrieve can be found in the repository but without metadata in 'Maven POM' format, you need to adjust the 'metadataSources { ... }' of the re
pository declaration.
     Required by:
         project :yubico-util-scala
```
---
 buildSrc/build.gradle.kts                                     | 4 ++--
 .../groovy/project-convention-code-formatting-internal.gradle | 4 ----
 webauthn-server-attestation/build.gradle.kts                  | 4 ++++
 webauthn-server-core/build.gradle.kts                         | 4 ++++
 webauthn-server-demo/build.gradle.kts                         | 4 ++++
 yubico-util/build.gradle.kts                                  | 4 ++++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 8e2ebbf9b..3accd9ee0 100644
--- 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:6.19.0")
-    implementation("io.github.cosmicsilence:gradle-scalafix:0.1.14")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
+    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
index 29e7800f9..5da3528c4 100644
--- a/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
+++ b/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
@@ -12,10 +12,6 @@ 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")
 }
 
 project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")
diff --git a/webauthn-server-attestation/build.gradle.kts b/webauthn-server-attestation/build.gradle.kts
index 1748835d2..1b331539e 100644
--- a/webauthn-server-attestation/build.gradle.kts
+++ b/webauthn-server-attestation/build.gradle.kts
@@ -86,3 +86,7 @@ tasks.javadoc.configure {
   // Use this instead for local testing
   //(options as StandardJavadocDocletOptions).linksOffline("file://${coreJavadoc.destinationDir}", "${coreJavadoc.destinationDir}")
 }
+
+scalafix {
+  ignoreSourceSets.add("main")
+}
diff --git a/webauthn-server-core/build.gradle.kts b/webauthn-server-core/build.gradle.kts
index 9bbd2bda8..cc1d311e3 100644
--- a/webauthn-server-core/build.gradle.kts
+++ b/webauthn-server-core/build.gradle.kts
@@ -68,3 +68,7 @@ tasks.withType(Jar::class) {
     ))
   }
 }
+
+scalafix {
+  ignoreSourceSets.add("main")
+}
diff --git a/webauthn-server-demo/build.gradle.kts b/webauthn-server-demo/build.gradle.kts
index 82830c46e..c0fb5f773 100644
--- a/webauthn-server-demo/build.gradle.kts
+++ b/webauthn-server-demo/build.gradle.kts
@@ -71,3 +71,7 @@ for (task in listOf(tasks.installDist, tasks.distZip, tasks.distTar)) {
     }
   }
 }
+
+scalafix {
+  ignoreSourceSets.add("main")
+}
diff --git a/yubico-util/build.gradle.kts b/yubico-util/build.gradle.kts
index e8319c120..4d503d950 100644
--- a/yubico-util/build.gradle.kts
+++ b/yubico-util/build.gradle.kts
@@ -49,3 +49,7 @@ tasks.jar {
     ))
   }
 }
+
+scalafix {
+  ignoreSourceSets.add("main")
+}