Commits

shemnon committed 816be1a

use gradle os detection facility

Comments (0)

Files changed (1)

gradle-javafx-plugin/src/main/groovy/org/bitbucket/shemnon/javafxplugin/tasks/JavaFXDeployTask.groovy

 import com.sun.javafx.tools.packager.bundlers.Bundler
 import net.sf.image4j.codec.bmp.BMPEncoder
 import net.sf.image4j.codec.ico.ICOEncoder
-import org.apache.tools.ant.taskdefs.condition.Os
 import org.bitbucket.shemnon.javafxplugin.IconInfo
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
+import org.gradle.internal.os.OperatingSystem
 import org.gradle.util.ConfigureUtil
 
 import javax.imageio.ImageIO
             loadConventialIcons('volume')
             loadConventialIcons('setup')
         }
-        if (Os.isFamily(Os.FAMILY_MAC)) {
+        if (OperatingSystem.current().isMacOsX()) {
             processMacOSXIcons(destination);
         }
-        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        if (OperatingSystem.current().isWindows()) {
             processWindowsIcons(destination);
         }
-        if (Os.isFamily(Os.FAMILY_UNIX) && !Os.isFamily(Os.FAMILY_MAC)) {
+        if (OperatingSystem.current().isLinux()) {
             processLinuxIcons(destination)
         }
     }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.