Skip to content

Commit 43df83c

Browse files
author
Jeremy Osterhoudt
committed
- Fixed a bug that would not create an installer package on a Windows machine
- Fixed a bug where invalid JVM properties were passed when running on a Windows machine
1 parent 12bc5d3 commit 43df83c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@ buildscript {
1111
}
1212

1313
group 'com.ge.predix'
14-
version '1.0.0'
14+
version '1.1.1'
1515

1616
apply plugin: 'java'
1717
apply plugin: 'idea'
1818
apply plugin: 'application'
1919
apply plugin: 'javafx-gradle-plugin'
2020

2121
mainClassName = "com.ge.predix.mobile.ReferenceApplication"
22-
applicationDefaultJvmArgs = ["-Djava.net.useSystemProxies=true", "-Xdock:icon=src/main/resources/icon.png", "-Xdock:name=\"MFL Reference Application\""]
22+
if (OperatingSystem.current().isMacOsX()) {
23+
applicationDefaultJvmArgs = ["-Djava.net.useSystemProxies=true", "-Xdock:icon=src/main/resources/icon.png", "-Xdock:name=\"MFL Reference Application\""]
24+
} else {
25+
applicationDefaultJvmArgs = ["-Djava.net.useSystemProxies=true"]
26+
}
2327
def vendorName = "GE Digital"
2428

2529
sourceCompatibility = 1.8
@@ -85,7 +89,7 @@ jfx {
8589
if (OperatingSystem.current().isMacOsX()) {
8690
bundler = "dmg"
8791
bundleArguments = [icon : 'src/main/resources/icon.icns', signBundle : false]
88-
} else if (OperatingSystem.current().isMacOsX()) {
92+
} else if (OperatingSystem.current().isWindows()) {
8993
bundler = "exe"
9094
bundleArguments = [icon : 'src/main/resources/icon.ico']
9195
}

0 commit comments

Comments
 (0)