From 718315b5c539a1d5b4b9e07c3daf038c69a1b0a4 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 31 Mar 2024 21:03:35 +0100 Subject: [PATCH] build: update to target adventure 4.16.0 --- build.gradle | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 7e2efc2..04c4a55 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group 'net.william278' -version "2.0.4${versionMetadata()}" +version "2.0.5${versionMetadata()}" defaultTasks 'licenseFormat', 'build' repositories { @@ -16,12 +16,12 @@ repositories { dependencies { implementation 'org.json:json:20230227' - compileOnly 'net.kyori:adventure-api:4.13.1' + compileOnly 'net.kyori:adventure-api:4.16.0' compileOnly 'org.jetbrains:annotations:24.0.1' - testImplementation 'net.kyori:adventure-platform-bukkit:4.3.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3' + testImplementation 'net.kyori:adventure-platform-bukkit:4.3.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' } tasks { @@ -107,6 +107,10 @@ publishing { @SuppressWarnings('GrMethodMayBeStatic') def versionMetadata() { + if (grgit == null) { + return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown' + } + // Get if there is a tag for this commit def tag = grgit.tag.list().find { it.commit.id == grgit.head().id } if (tag != null) { @@ -114,8 +118,5 @@ def versionMetadata() { } // Otherwise, get the last commit hash and if it's a clean head - if (grgit == null) { - return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown' - } return '-' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev') } \ No newline at end of file