Moved mac extension flag to top level Gradle script

VocabHunter · Nov 6, 2017 · 2b5475f · 2b5475f
1 parent 5b01a87
commit 2b5475f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,13 @@
  * Open Source Software published under the Apache Licence, Version 2.0.
  */
 
+import org.gradle.internal.os.OperatingSystem
+
+ext {
+    operatingSystem = OperatingSystem.current()
+    isIncludeMacExtensions = operatingSystem.isMacOsX()
+}
+
 allprojects {
     group 'io.github.vocabhunter'
 }

diff --git a/osx/build.gradle b/osx/build.gradle
@@ -2,9 +2,7 @@
  * Open Source Software published under the Apache Licence, Version 2.0.
  */
 
-import org.gradle.internal.os.OperatingSystem
-
-if (OperatingSystem.current().isMacOsX()) {
+if (isIncludeMacExtensions) {
     sourceSets {
         main {
             java {

diff --git a/package/build.gradle b/package/build.gradle
@@ -2,8 +2,6 @@
  * Open Source Software published under the Apache Licence, Version 2.0.
  */
 
-import org.gradle.internal.os.OperatingSystem
-
 buildscript {
     repositories {
         jcenter()
@@ -19,10 +17,11 @@ apply plugin: 'javafx-gradle-plugin'
 ext {
     publishedVersion = project.version
     bundleMainClass = 'io.github.vocabhunter.gui.distribution.PackagedVocabHunter'
-    operatingSystem = OperatingSystem.current()
     if (operatingSystem.isMacOsX()) {
         packageType = 'dmg'
-        bundleMainClass = 'io.github.vocabhunter.osx.distribution.OsxPackagedVocabHunter'
+        if (isIncludeMacExtensions) {
+            bundleMainClass = 'io.github.vocabhunter.osx.distribution.OsxPackagedVocabHunter'
+        }
         appIcon = file('icons/mac/VocabHunter.icns')
         sessionIcon = file('icons/mac/VocabHunterSession.icns')
     } else if (operatingSystem.isLinux()) {
@@ -41,12 +40,12 @@ ext {
 
 dependencies {
     compile project(':gui')
-    if (OperatingSystem.current().isMacOsX()) {
+    if (isIncludeMacExtensions) {
         compile project(':osx')
     }
 }
 
-if (operatingSystem.isMacOsX()) {
+if (isIncludeMacExtensions) {
     sourceSets {
         main {
             java {