nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 17:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add extra build property for store version

Browse Source
This commit is contained in:
UnfamiliarLegacy 2024-06-23 22:22:57 +02:00
parent 89b10eb8ec
commit 4266a40cbe
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
G-Earth/src/main/java/gearth/GEarth.java
View File

@ -32,6 +32,7 @@ public class GEarth extends Application {
public static GEarth main; public static GEarth main;
public static String version; public static String version;
public static String storeVersion;
public static String repository; public static String repository;
public static ObservableObject<Theme> observableTheme; public static ObservableObject<Theme> observableTheme;
@ -51,6 +52,7 @@ public class GEarth extends Application {
buildProperties.load(GEarth.class.getResourceAsStream("/build.properties")); buildProperties.load(GEarth.class.getResourceAsStream("/build.properties"));
version = buildProperties.getProperty("build.version"); version = buildProperties.getProperty("build.version");
storeVersion = buildProperties.getProperty("build.storeVersion");
repository = buildProperties.getProperty("build.github"); repository = buildProperties.getProperty("build.github");
logger.info("Starting G-Earth {} from repository {}", version, repository); logger.info("Starting G-Earth {} from repository {}", version, repository);

2
G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java
View File

@ -19,7 +19,7 @@ public class StoreFetch {
} }
public static void fetch(StoreFetchListener storeFetchListener) { 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) { public static void fetch(String version, StoreFetchListener storeFetchListener) {

1
G-Earth/src/main/resources/build.properties
View File

@ -1,2 +1,3 @@
build.version=${project.version} build.version=${project.version}
build.storeVersion=${storeVersion}
build.github=${repository} build.github=${repository}

4
pom.xml
View File

@ -10,7 +10,11 @@
<version>${revision}</version> <version>${revision}</version>
<properties> <properties>
<!-- Version of the application. -->
<revision>1.5.4-beta-1</revision> <revision>1.5.4-beta-1</revision>
<!-- Version for https://github.com/sirjonasxx/G-ExtensionStore to keep compatibility with beta versions. -->
<storeVersion>1.5.3</storeVersion>
<!-- Default repository for version checking. -->
<repository>sirjonasxx/G-Earth</repository> <repository>sirjonasxx/G-Earth</repository>
</properties> </properties>