From d1bf5734bf86ef81e11414f30a03670660838998 Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Sat, 27 May 2023 00:35:12 -0600 Subject: version based on tags and fix eula text --- build.gradle | 6 +++++- .../xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c660a31..28d0928 100644 --- a/build.gradle +++ b/build.gradle @@ -115,7 +115,11 @@ task createProperties(dependsOn: processResources) { def stdout = new ByteArrayOutputStream() if (project.hasProperty("release")) { - project.version = 1.0 + exec { + commandLine "git", "describe", "--tags", "--abbrev=0" + standardOutput = stdout + } + project.version = stdout.toString().trim().replaceAll("\"", "") } else { exec { commandLine "git", "log", "-n", "1", "--pretty=format:\"%h\"" diff --git a/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt index 7ec04e9..6c64a76 100644 --- a/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt @@ -629,6 +629,7 @@ class PrimaryController { imagePane.children.add(ImageView(icon)) val label = Label("Do you agree to the terms of the Minecraft End User License Agreement?") label.isWrapText = true + label.maxWidth = 250.0 label.layoutX = 115.0 label.layoutY = 40.0 val buttonBar = ButtonBar() -- cgit v1.2.3