From 65f53197d302141e8af9ef9f5ca183a18b4204c4 Mon Sep 17 00:00:00 2001 From: soloturn Date: Mon, 14 Oct 2024 00:17:36 +0200 Subject: [PATCH] centralize jna, junit5 versions for facade --- engine/build.gradle.kts | 2 +- facades/PC/build.gradle.kts | 8 ++++---- settings.gradle.kts | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts index c8dc2332f8f..8617b5772d8 100644 --- a/engine/build.gradle.kts +++ b/engine/build.gradle.kts @@ -73,7 +73,7 @@ dependencies { api("org.codehaus.plexus:plexus-utils:3.0.16") // Java magic - implementation("net.java.dev.jna:jna-platform:5.6.0") + implementation(libs.jna.platform) implementation("org.terasology:reflections:0.9.12-MB") implementation("com.esotericsoftware:reflectasm:1.11.9") diff --git a/facades/PC/build.gradle.kts b/facades/PC/build.gradle.kts index 79255a88a69..d5753c734e4 100644 --- a/facades/PC/build.gradle.kts +++ b/facades/PC/build.gradle.kts @@ -58,7 +58,7 @@ logger.info("PC VERSION: {}", version) group = "org.terasology.facades" dependencies { - implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.6.0") + implementation(libs.jna.platform) implementation(group = "info.picocli", name = "picocli", version = "4.5.2") annotationProcessor("info.picocli:picocli-codegen:4.5.2") @@ -82,9 +82,9 @@ dependencies { testImplementation(platform("org.junit:junit-bom:5.10.1")) { // junit-bom will set version numbers for the other org.junit dependencies. } - testImplementation("org.junit.jupiter:junit-jupiter-api") - testImplementation("org.junit.jupiter:junit-jupiter-params") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testRuntimeOnly(libs.junit.engine) testImplementation("com.google.truth:truth:1.1.2") testImplementation("com.google.truth.extensions:truth-java8-extension:1.1.2") diff --git a/settings.gradle.kts b/settings.gradle.kts index 35af385e1dc..5f1f8f2cb52 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,6 +15,7 @@ dependencyResolutionManagement { library("gestalt-util", "org.terasology.gestalt", "gestalt-util" ).versionRef(gestalt) library("gson", "com.google.code.gson:gson:2.8.6") library("guava", "com.google.guava:guava:31.1-jre") + library("jna-platform", "net.java.dev.jna:jna-platform:5.6.0") val junit5 = version("junit5", "5.10.1") library("junit-api", "org.junit.jupiter", "junit-jupiter-api").versionRef(junit5) library("junit-engine", "org.junit.jupiter", "junit-jupiter-engine").versionRef(junit5)