Merge branch 'master' into dev

BFergerson · web-flow · commit b9ef3f155d85 · 2022-03-30T05:35:25.000-04:00
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
         id 'com.avast.gradle.docker-compose' version "0.15.2" apply false
         id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false
         id 'com.github.johnrengelman.shadow' version "7.1.2" apply false
-        id 'com.diffplug.spotless' version '6.3.0' apply false
+        id 'com.diffplug.spotless' version '6.4.0' apply false
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pluginManagement {`
`5`	`5`	`id 'com.avast.gradle.docker-compose' version "0.15.2" apply false`
`6`	`6`	`id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false`
`7`	`7`	`id 'com.github.johnrengelman.shadow' version "7.1.2" apply false`
`8`		`- id 'com.diffplug.spotless' version '6.3.0' apply false`
	`8`	`+ id 'com.diffplug.spotless' version '6.4.0' apply false`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`