Skip to content

Commit a9a2aad

Browse files
committed
Revert "Apply spotless plugin declaratively"
This reverts commit ebfeb62.
1 parent 09bc235 commit a9a2aad

File tree

6 files changed

+3
-7
lines changed

6 files changed

+3
-7
lines changed

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ subprojects {
9494
mavenCentral()
9595
}
9696

97-
if (project.plugins.hasPlugin('com.diffplug.spotless')) {
97+
if (project !== project(':test-platform')) {
98+
apply plugin: 'com.diffplug.spotless'
9899
spotless {
99100
java {
100101
googleJavaFormat()
@@ -125,7 +126,7 @@ task collectSignatures(type: Sync) {
125126

126127
subprojects { project ->
127128

128-
if (project.plugins.hasPlugin('scala') && project.plugins.hasPlugin('com.diffplug.spotless')) {
129+
if (project.plugins.hasPlugin('scala')) {
129130
project.scalafix {
130131
configFile = rootProject.file('scalafix.conf')
131132

webauthn-server-attestation/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ plugins {
44
scala
55
`maven-publish`
66
signing
7-
id("com.diffplug.spotless")
87
id("info.solidsoft.pitest")
98
id("io.github.cosmicsilence.scalafix")
109
}

webauthn-server-core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ plugins {
44
scala
55
`maven-publish`
66
signing
7-
id("com.diffplug.spotless")
87
id("info.solidsoft.pitest")
98
id("io.github.cosmicsilence.scalafix")
109
}

webauthn-server-demo/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
war
44
application
55
scala
6-
id("com.diffplug.spotless")
76
id("io.github.cosmicsilence.scalafix")
87
}
98

yubico-util-scala/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
scala
3-
id("com.diffplug.spotless")
43
id("io.github.cosmicsilence.scalafix")
54
}
65

yubico-util/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
scala
44
`maven-publish`
55
signing
6-
id("com.diffplug.spotless")
76
id("info.solidsoft.pitest")
87
id("io.github.cosmicsilence.scalafix")
98
}

0 commit comments

Comments
 (0)