Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
// Apply Gradle 9 convention plugins from included build
// Apply Gradle 9 convention plugins from the included build
id("cryptad.java-kotlin-conventions")
id("cryptad.spotless")
id("cryptad.versioning")
Expand Down Expand Up @@ -44,7 +44,7 @@ dependencies {
// Compile-time access to Logback classes for runtime reconfiguration
compileOnly(libs.logbackClassic)
// Java source annotations used across the codebase
compileOnly("org.jetbrains:annotations:23.0.0")
compileOnly(libs.jetbrainsAnnotations)

// runtimeOnly
runtimeOnly(libs.dbusTransportNativeUnix)
Expand All @@ -63,7 +63,7 @@ dependencies {
testImplementation(libs.mockitoInline)
testImplementation(libs.hamcrest)
testImplementation(libs.objenesis)
testCompileOnly("org.jetbrains:annotations:23.0.0")
testCompileOnly(libs.jetbrainsAnnotations)

// testRuntimeOnly
testRuntimeOnly(libs.junitJupiterEngine)
Expand All @@ -79,7 +79,7 @@ tasks.register("printVersion") {

// The default from build-logic (512m) is too small for the full test suite on Windows and can
// trigger OOM in long-running integration tests.
tasks.withType<org.gradle.api.tasks.testing.Test>().configureEach { maxHeapSize = "2g" }
tasks.withType<Test>().configureEach { maxHeapSize = "2g" }

// Application entrypoint (used by jpackage). This does not change how we build the wrapper
// distribution; it's only to inform launchers that invoke the launcher main class directly.
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spotbugs = "6.4.8"
jacoco = "0.8.14"
errorpronePlugin = "5.0.0"
errorproneCore = "2.38.0"
jetbrainsAnnotations = "23.0.0"

[libraries]
bcprov = { group = "org.bouncycastle", name = "bcprov-lts8on", version.ref = "bcprov" }
Expand Down Expand Up @@ -53,6 +54,7 @@ junitJupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine
junitPlatformLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatform" }
junitPlatformSuite = { group = "org.junit.platform", name = "junit-platform-suite", version.ref = "junitPlatform" }
errorproneCore = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorproneCore" }
jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrainsAnnotations" }

[plugins]
#noinspection UnusedVersionCatalogEntry
Expand Down
Loading