chore(build): Resolve build deprecations

SpongePowered · Oct 14, 2023 · f4871f8 · f4871f8
1 parent 47c4018
commit f4871f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/build-logic/src/main/groovy/org.spongepowered.configurate.build.component.gradle b/build-logic/src/main/groovy/org.spongepowered.configurate.build.component.gradle
@@ -94,8 +94,10 @@ dependencies {
 
     // Testing
     testImplementation(libs.assertj.core)
+    testImplementation(platform(libs.junit.bom))
     testImplementation(libs.junit.api)
     testRuntimeOnly(libs.junit.engine)
+    testRuntimeOnly(libs.junit.launcher)
 }
 
 configurations {

diff --git a/build.gradle b/build.gradle
@@ -5,9 +5,10 @@ plugins {
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.aggregateJavadoc)
-    alias(libs.plugins.indra.sonatype)
-    alias(libs.plugins.indra.git)
     alias(libs.plugins.gitPublish)
+    alias(libs.plugins.indra.git)
+    alias(libs.plugins.indra.sonatype)
+    alias(libs.plugins.nexusPublish)
     id 'java-base'
     id 'org.spongepowered.configurate.build.base'
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,8 +20,10 @@ autoValue-annotations = { module = "com.google.auto.value:auto-value-annotations
 errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
 guava = "com.google.guava:guava:32.1.3-jre"
-junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 stylecheck = "ca.stellardrift:stylecheck:0.2.1"
 
 # Kotlin
@@ -76,10 +78,9 @@ detekt = "io.gitlab.arturbosch.detekt:1.23.1"
 dokka = "org.jetbrains.dokka:1.9.0"
 gitPublish = "org.ajoberstar.git-publish:3.0.1"
 gitpatcher = { id = "ca.stellardrift.gitpatcher", version = "1.0.0" }
-indra-common = { id = "net.kyori.indra", version.ref = "indra" }
-indra-crossdoc = { id = "net.kyori.indra.crossdoc", version.ref = "indra" }
 indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
 indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
 kotlin = "org.jetbrains.kotlin.jvm:1.9.10"
+nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1" }
 shadow = "com.github.johnrengelman.shadow:8.1.1"
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }