From 31d3b7bc7fe08a4fb6ab83231cee49b6ada72366 Mon Sep 17 00:00:00 2001 From: Robinson Date: Fri, 8 Oct 2021 15:02:58 +0200 Subject: [PATCH] Added version information --- build.gradle.kts | 4 +++- src/dorkbox/vaadin/VaadinApplication.kt | 2 ++ src/dorkbox/vaadin/util/VaadinConfig.kt | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 012bb61..0326c7d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,7 +48,9 @@ object Extras { val buildDate = Instant.now().toString() const val coroutineVer = "1.4.3" - const val vaadinVer = "14.7.1" // this must be synchronized with the gradle plugin + + // this must match the version information in the VaadinConfig.kt file (this is automatically passed into the plugin) + const val vaadinVer = "14.7.1" const val undertowVer = "2.2.10.Final" } diff --git a/src/dorkbox/vaadin/VaadinApplication.kt b/src/dorkbox/vaadin/VaadinApplication.kt index af0acba..1a1698e 100644 --- a/src/dorkbox/vaadin/VaadinApplication.kt +++ b/src/dorkbox/vaadin/VaadinApplication.kt @@ -48,6 +48,8 @@ class VaadinApplication : ExceptionHandler { */ const val version = "14.7" + const val vaadinVersion = VaadinConfig.VAADIN_VERSION + init { // Add this project to the updates system, which verifies this class + UUID + version information dorkbox.updates.Updates.add(VaadinApplication::class.java, "fc74a52b08c8410fabfea67ac5dca566", version) diff --git a/src/dorkbox/vaadin/util/VaadinConfig.kt b/src/dorkbox/vaadin/util/VaadinConfig.kt index 9332fc7..6ba754b 100644 --- a/src/dorkbox/vaadin/util/VaadinConfig.kt +++ b/src/dorkbox/vaadin/util/VaadinConfig.kt @@ -13,6 +13,9 @@ import java.io.File */ class VaadinConfig(runningAsJar: Boolean, tempDir: File) { companion object { + // this must match the version information in the build.gradle.kts file + const val VAADIN_VERSION = "14.7.1" + val EXTRACT_JAR = "extract.jar" val EXTRACT_JAR_OVERWRITE = "extract.jar.overwrite" val DEBUG = "debug"