Skip to content

Commit 33f31b3

Browse files
authored
Merge pull request #360 from Yubico/fix-build
Bump test dependency versions
2 parents 63366e1 + 0d5b5ef commit 33f31b3

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ dependencies {
1616
// Spotless dropped Java 8 support in version 2.33.0
1717
if (JavaVersion.current().isJava11Compatible) {
1818
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
19-
implementation("io.github.cosmicsilence:gradle-scalafix:0.1.15")
19+
implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")
2020
}
2121
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ spotless {
1313
scalafix {
1414
configFile.set(project.rootProject.file("scalafix.conf"))
1515

16-
// Work around dependency resolution issues in April 2022
17-
semanticdb.autoConfigure.set(true)
18-
semanticdb.version.set("4.5.5")
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+
}
1920
}
2021

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

test-platform/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ dependencies {
99
api("junit:junit:4.13.2")
1010
api("org.bouncycastle:bcpkix-jdk18on:[1.62,2)")
1111
api("org.bouncycastle:bcprov-jdk18on:[1.62,2)")
12-
api("org.mockito:mockito-core:4.7.0")
13-
api("org.scalacheck:scalacheck_2.13:1.16.0")
14-
api("org.scalatest:scalatest_2.13:3.2.13")
15-
api("org.scalatestplus:junit-4-13_2.13:3.2.13.0")
16-
api("org.scalatestplus:scalacheck-1-16_2.13:3.2.13.0")
17-
api("org.slf4j:slf4j-nop:2.0.3")
12+
api("org.mockito:mockito-core:4.11.0")
13+
api("org.scalacheck:scalacheck_2.13:1.18.0")
14+
api("org.scalatest:scalatest_2.13:3.2.18")
15+
api("org.scalatestplus:junit-4-13_2.13:3.2.18.0")
16+
api("org.scalatestplus:scalacheck-1-16_2.13:3.2.14.0")
17+
api("org.slf4j:slf4j-nop:2.0.13")
1818
api("uk.org.lidalia:slf4j-test:1.2.0")
1919
}
2020
}

0 commit comments

Comments
 (0)