Apply spotless plugin declaratively

emlun · emlun · commit ebfeb623b795 · 2022-09-05T17:50:08.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -91,8 +91,7 @@ subprojects {
     mavenCentral()
   }
 
-  if (project !== project(':test-platform')) {
-    apply plugin: 'com.diffplug.spotless'
+  if (project.plugins.hasPlugin('com.diffplug.spotless')) {
     spotless {
       java {
         googleJavaFormat()
@@ -130,7 +129,7 @@ String getGitCommitOrUnknown() {
 
 subprojects { project ->
 
-  if (project.plugins.hasPlugin('scala')) {
+  if (project.plugins.hasPlugin('scala') && project.plugins.hasPlugin('com.diffplug.spotless')) {
     project.scalafix {
       configFile = rootProject.file('scalafix.conf')
 
diff --git a/webauthn-server-attestation/build.gradle b/webauthn-server-attestation/build.gradle
@@ -3,6 +3,7 @@ plugins {
   id 'scala'
   id 'maven-publish'
   id 'signing'
+  id 'com.diffplug.spotless'
   id 'info.solidsoft.pitest'
   id 'io.github.cosmicsilence.scalafix'
 }
diff --git a/webauthn-server-core/build.gradle b/webauthn-server-core/build.gradle
@@ -3,6 +3,7 @@ plugins {
   id 'scala'
   id 'maven-publish'
   id 'signing'
+  id 'com.diffplug.spotless'
   id 'info.solidsoft.pitest'
   id 'io.github.cosmicsilence.scalafix'
 }
diff --git a/webauthn-server-demo/build.gradle b/webauthn-server-demo/build.gradle
@@ -3,6 +3,7 @@ plugins {
   id 'war'
   id 'application'
   id 'scala'
+  id 'com.diffplug.spotless'
   id 'io.github.cosmicsilence.scalafix'
 }
 
diff --git a/yubico-util-scala/build.gradle.kts b/yubico-util-scala/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   scala
+  id("com.diffplug.spotless")
   id("io.github.cosmicsilence.scalafix")
 }
 
diff --git a/yubico-util/build.gradle.kts b/yubico-util/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
   scala
   `maven-publish`
   signing
+  id("com.diffplug.spotless")
   id("info.solidsoft.pitest")
   id("io.github.cosmicsilence.scalafix")
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`id 'scala'`
`4`	`4`	`id 'maven-publish'`
`5`	`5`	`id 'signing'`
	`6`	`+ id 'com.diffplug.spotless'`
`6`	`7`	`id 'info.solidsoft.pitest'`
`7`	`8`	`id 'io.github.cosmicsilence.scalafix'`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`id 'war'`
`4`	`4`	`id 'application'`
`5`	`5`	`id 'scala'`
	`6`	`+ id 'com.diffplug.spotless'`
`6`	`7`	`id 'io.github.cosmicsilence.scalafix'`
`7`	`8`	`}`
`8`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`scala`
	`3`	`+ id("com.diffplug.spotless")`
`3`	`4`	`id("io.github.cosmicsilence.scalafix")`
`4`	`5`	`}`
`5`	`6`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`scala`
`4`	`4`	`maven-publish`
`5`	`5`	`signing`
	`6`	`+ id("com.diffplug.spotless")`
`6`	`7`	`id("info.solidsoft.pitest")`
`7`	`8`	`id("io.github.cosmicsilence.scalafix")`
`8`	`9`	`}`