From 1b57c1b436909b49affeac3a43fb261c046d35c9 Mon Sep 17 00:00:00 2001 From: soloturn Date: Tue, 5 Dec 2023 18:04:04 +0100 Subject: [PATCH] build: update dependencies (#5189) * gradle-8.5, full java-21 support. idea-ext plugin 1.1.7. * junit-bom 5.x.x -> 5.10.1 * lwjgl 3.3.1 -> 3.3.3 --- .idea/kotlinc.xml | 2 +- build-logic/src/main/kotlin/terasology-metrics.gradle.kts | 2 +- build-logic/src/main/kotlin/terasology-module.gradle.kts | 2 +- build.gradle | 4 ++-- engine-tests/build.gradle | 2 +- facades/PC/build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- subsystems/TypeHandlerLibrary/build.gradle.kts | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index f8467b458e4..e805548aaa8 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build-logic/src/main/kotlin/terasology-metrics.gradle.kts b/build-logic/src/main/kotlin/terasology-metrics.gradle.kts index 0b3a3b28810..e31702b0916 100644 --- a/build-logic/src/main/kotlin/terasology-metrics.gradle.kts +++ b/build-logic/src/main/kotlin/terasology-metrics.gradle.kts @@ -35,7 +35,7 @@ dependencies { because("redirects java.util.logging (from e.g. junit) through slf4j") } - add("testImplementation", platform("org.junit:junit-bom:5.10.0")) + add("testImplementation", platform("org.junit:junit-bom:5.10.1")) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/build-logic/src/main/kotlin/terasology-module.gradle.kts b/build-logic/src/main/kotlin/terasology-module.gradle.kts index cd0c27f5494..f0e511c4d04 100644 --- a/build-logic/src/main/kotlin/terasology-module.gradle.kts +++ b/build-logic/src/main/kotlin/terasology-module.gradle.kts @@ -79,7 +79,7 @@ if (project.name == "ModuleTestingEnvironment") { runtimeOnly("org.codehaus.janino:janino:3.1.3") { because("logback filters") } - add("implementation", platform("org.junit:junit-bom:5.8.1")) + add("implementation", platform("org.junit:junit-bom:5.10.1")) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.mockito:mockito-junit-jupiter:3.12.4") } diff --git a/build.gradle b/build.gradle index 53bb1ccf6e4..c73c335af67 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ plugins { //apply plugin: 'eclipse' id "idea" // For the "Build and run using: Intellij IDEA | Gradle" switch - id "org.jetbrains.gradle.plugin.idea-ext" version "1.0" + id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7" id("com.google.protobuf") version "0.9.4" apply false id("terasology-repositories") @@ -75,7 +75,7 @@ ext { // Lib dir for use in manifest entries etc (like in :engine). A separate "libsDir" exists, auto-created by Gradle subDirLibs = 'libs' - LwjglVersion = '3.3.1' + LwjglVersion = '3.3.3' } diff --git a/engine-tests/build.gradle b/engine-tests/build.gradle index 6074a4d785c..e8d94e79041 100644 --- a/engine-tests/build.gradle +++ b/engine-tests/build.gradle @@ -72,7 +72,7 @@ dependencies { // Test lib dependencies - implementation(platform("org.junit:junit-bom:5.10.0")) { + implementation(platform("org.junit:junit-bom:5.10.1")) { // junit-bom will set version numbers for the other org.junit dependencies. } api("org.junit.jupiter:junit-jupiter-api") { diff --git a/facades/PC/build.gradle.kts b/facades/PC/build.gradle.kts index d1ab573ed71..867e8e4fd19 100644 --- a/facades/PC/build.gradle.kts +++ b/facades/PC/build.gradle.kts @@ -81,7 +81,7 @@ dependencies { because("redirects java.util.logging from miscellaneous dependencies through slf4j") } - testImplementation(platform("org.junit:junit-bom:5.7.1")) { + 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") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8838ba97ba0..e6aba2515d5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/subsystems/TypeHandlerLibrary/build.gradle.kts b/subsystems/TypeHandlerLibrary/build.gradle.kts index a205c2c15f2..7dd4c033de9 100644 --- a/subsystems/TypeHandlerLibrary/build.gradle.kts +++ b/subsystems/TypeHandlerLibrary/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testRuntimeOnly("org.slf4j:slf4j-simple:1.7.32") { because("log output during tests") } - testImplementation(platform("org.junit:junit-bom:5.8.1")) { + 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")