Skip to content

Commit 3920803

Browse files
committed
Bump Gradle scripts to current state on main
``` git checkout 240b8d9 -- build.gradle settings.gradle.kts buildSrc/ */build.gradle.kts ```
1 parent ef12050 commit 3920803

File tree

7 files changed

+7
-18
lines changed

7 files changed

+7
-18
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111

1212
dependencies {
13-
implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11")
13+
implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0")
1414
implementation("io.franzbecker:gradle-lombok:5.0.0")
1515

1616
// Spotless dropped Java 8 support in version 2.33.0

buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spotless {
1212

1313
scalafix {
1414
configFile.set(project.rootProject.file("scalafix.conf"))
15+
16+
if (project.name != "yubico-util-scala") {
17+
// yubico-util-scala is the only subproject with Scala sources in the "main" source set
18+
ignoreSourceSets.add("main")
19+
}
1520
}
1621

1722
project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")

buildSrc/src/main/kotlin/project-convention-pitest.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
pitest {
7-
pitestVersion.set("1.9.5")
7+
pitestVersion.set("1.15.0")
88
timestampedReports.set(false)
99

1010
outputFormats.set(listOf("XML", "HTML"))

webauthn-server-attestation/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,3 @@ tasks.javadoc.configure {
8686
// Use this instead for local testing
8787
//(options as StandardJavadocDocletOptions).linksOffline("file://${coreJavadoc.destinationDir}", "${coreJavadoc.destinationDir}")
8888
}
89-
90-
scalafix {
91-
ignoreSourceSets.add("main")
92-
}

webauthn-server-core/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,3 @@ tasks.withType(Jar::class) {
6868
))
6969
}
7070
}
71-
72-
scalafix {
73-
ignoreSourceSets.add("main")
74-
}

webauthn-server-demo/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,3 @@ for (task in listOf(tasks.installDist, tasks.distZip, tasks.distTar)) {
7171
}
7272
}
7373
}
74-
75-
scalafix {
76-
ignoreSourceSets.add("main")
77-
}

yubico-util/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,3 @@ tasks.jar {
4949
))
5050
}
5151
}
52-
53-
scalafix {
54-
ignoreSourceSets.add("main")
55-
}

0 commit comments

Comments
 (0)