Skip to content

Bump test dependency versions #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 4, 2024
Merged

Bump test dependency versions #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a62d4c8
Bump org.scalatestplus:junit dependency version
emlun Jun 3, 2024
f242370
Bump test dependency versions
emlun Jun 3, 2024
3a67ec4
Fix scalafix errors
emlun Jun 3, 2024
48d9688
Apply scalafix settings conditionally
emlun Jun 3, 2024
0d5b5ef
Add comment why yubico-util-scala is the exception to scalafix.ignore…
emlun Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ dependencies {
// Spotless dropped Java 8 support in version 2.33.0
if (JavaVersion.current().isJava11Compatible) {
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
implementation("io.github.cosmicsilence:gradle-scalafix:0.1.15")
implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")
}
}
7 changes: 4 additions & 3 deletions buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ spotless {
scalafix {
configFile.set(project.rootProject.file("scalafix.conf"))

// Work around dependency resolution issues in April 2022
semanticdb.autoConfigure.set(true)
semanticdb.version.set("4.5.5")
if (project.name != "yubico-util-scala") {
// yubico-util-scala is the only subproject with Scala sources in the "main" source set
ignoreSourceSets.add("main")
}
}

project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")
Expand Down
12 changes: 6 additions & 6 deletions test-platform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ dependencies {
api("junit:junit:4.13.2")
api("org.bouncycastle:bcpkix-jdk18on:[1.62,2)")
api("org.bouncycastle:bcprov-jdk18on:[1.62,2)")
api("org.mockito:mockito-core:4.7.0")
api("org.scalacheck:scalacheck_2.13:1.16.0")
api("org.scalatest:scalatest_2.13:3.2.13")
api("org.scalatestplus:junit-4-13_2.13:3.2.13.0")
api("org.scalatestplus:scalacheck-1-16_2.13:3.2.13.0")
api("org.slf4j:slf4j-nop:2.0.3")
api("org.mockito:mockito-core:4.11.0")
api("org.scalacheck:scalacheck_2.13:1.18.0")
api("org.scalatest:scalatest_2.13:3.2.18")
api("org.scalatestplus:junit-4-13_2.13:3.2.18.0")
api("org.scalatestplus:scalacheck-1-16_2.13:3.2.14.0")
api("org.slf4j:slf4j-nop:2.0.13")
api("uk.org.lidalia:slf4j-test:1.2.0")
}
}