From 5caf75237bfb02ed3df620a51e1e9d2c889baff8 Mon Sep 17 00:00:00 2001 From: Fred Silberberg Date: Sun, 20 Nov 2016 21:32:32 -0800 Subject: [PATCH] Fixed version generation when no - is present (#156) --- publish.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/publish.gradle b/publish.gradle index aa67b89375..2122e39ff2 100644 --- a/publish.gradle +++ b/publish.gradle @@ -3,7 +3,14 @@ import org.gradle.internal.os.OperatingSystem apply plugin: 'maven-publish' apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' -def utilVersion = "1.0.2${-> WPILibVersion.version.substring(WPILibVersion.version.indexOf('-'))}" +def getVersion = { + if (WPILibVersion.version.contains('-')) + return WPILibVersion.version.substring(WPILibVersion.version.indexOf('-')) + else + return WPIlibVersion.version +} + +def utilVersion = "1.0.2${-> getVersion()}" def utilFile = file("$buildDir/wpiutil.txt") def ntcoreFile = file("$buildDir/ntcore.txt")