Merge branch 'master' into release-2.0

Yubico · May 2, 2022 · a849a70 · a849a70
2 parents a9479b9 + e95b7f6
commit a849a70
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -80,7 +80,7 @@ New features:
   attestation trust roots.
 
 
-== Version 1.12.4 (unreleased) ==
+== Version 1.12.4 ==
 
 Deprecated features:
 

diff --git a/README b/README
@@ -25,15 +25,15 @@ Maven:
 <dependency>
   <groupId>com.yubico</groupId>
   <artifactId>webauthn-server-core</artifactId>
-  <version>1.12.3</version>
+  <version>1.12.4</version>
   <scope>compile</scope>
 </dependency>
 ----------
 
 Gradle:
 
 ----------
-compile 'com.yubico:webauthn-server-core:1.12.3'
+compile 'com.yubico:webauthn-server-core:1.12.4'
 ----------
 
 NOTE: You may need additional dependencies with JCA providers to support some signature algorithms.

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
   dependencies {
     classpath 'com.cinnober.gradle:semver-git:2.5.0'
     classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
-    classpath 'io.github.cosmicsilence:gradle-scalafix:0.1.8'
+    classpath 'io.github.cosmicsilence:gradle-scalafix:0.1.13'
   }
 }
 plugins {
@@ -150,6 +150,12 @@ subprojects { project ->
   if (project.plugins.hasPlugin('scala')) {
     project.scalafix {
       configFile = rootProject.file('scalafix.conf')
+
+      // Work around dependency resolution issues in April 2022
+      semanticdb {
+        autoConfigure = true
+        version = '4.5.5'
+      }
     }
     dependencies.scalafix('com.github.liancheng:organize-imports_2.13:0.6.0')
     project.tasks.spotlessApply.dependsOn(project.tasks.scalafix)