From 4266a40cbea4599818c831a001975fd9820f6930 Mon Sep 17 00:00:00 2001 From: UnfamiliarLegacy <74633542+UnfamiliarLegacy@users.noreply.github.com> Date: Sun, 23 Jun 2024 22:22:57 +0200 Subject: [PATCH] Add extra build property for store version --- G-Earth/src/main/java/gearth/GEarth.java | 2 ++ .../extensionstore/repository/StoreFetch.java | 2 +- G-Earth/src/main/resources/build.properties | 1 + pom.xml | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/G-Earth/src/main/java/gearth/GEarth.java b/G-Earth/src/main/java/gearth/GEarth.java index c53c88b..a9eccc0 100644 --- a/G-Earth/src/main/java/gearth/GEarth.java +++ b/G-Earth/src/main/java/gearth/GEarth.java @@ -32,6 +32,7 @@ public class GEarth extends Application { public static GEarth main; public static String version; + public static String storeVersion; public static String repository; public static ObservableObject observableTheme; @@ -51,6 +52,7 @@ public class GEarth extends Application { buildProperties.load(GEarth.class.getResourceAsStream("/build.properties")); version = buildProperties.getProperty("build.version"); + storeVersion = buildProperties.getProperty("build.storeVersion"); repository = buildProperties.getProperty("build.github"); logger.info("Starting G-Earth {} from repository {}", version, repository); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java index 08bc3c7..c029870 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java @@ -19,7 +19,7 @@ public class StoreFetch { } public static void fetch(StoreFetchListener storeFetchListener) { - fetch(GEarth.version, storeFetchListener, "sirjonasxx/G-ExtensionStore"); + fetch(GEarth.storeVersion, storeFetchListener, "sirjonasxx/G-ExtensionStore"); } public static void fetch(String version, StoreFetchListener storeFetchListener) { diff --git a/G-Earth/src/main/resources/build.properties b/G-Earth/src/main/resources/build.properties index 27df389..103fcf2 100644 --- a/G-Earth/src/main/resources/build.properties +++ b/G-Earth/src/main/resources/build.properties @@ -1,2 +1,3 @@ build.version=${project.version} +build.storeVersion=${storeVersion} build.github=${repository} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 45e9b65..c4b44e0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,11 @@ ${revision} + 1.5.4-beta-1 + + 1.5.3 + sirjonasxx/G-Earth