From 82a5f37f4b58c74d7eec88f21c7dc418388927eb Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Fri, 24 Sep 2021 15:23:16 +0800 Subject: [PATCH 1/3] Added Support for M1 Mac --- src/main/java/org/openjfx/gradle/JavaFXPlatform.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java index e7517c7..d8e02c9 100644 --- a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java +++ b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java @@ -38,9 +38,10 @@ public enum JavaFXPlatform { - LINUX("linux", "linux"), - WINDOWS("win", "windows"), - OSX("mac", "osx"); + LINUX("linux", "linux-x86_64"), + WINDOWS("win", "windows-x86_64"), + OSX("mac", "osx-x86_64"), + OSX_ARM("mac-aarch64", "osx-aarch_64"); private String classifier; private String osDetectorId; @@ -56,7 +57,7 @@ public String getClassifier() { public static JavaFXPlatform detect(Project project) { - String os = project.getExtensions().getByType(OsDetector.class).getOs(); + String os = project.getExtensions().getByType(OsDetector.class).getClassifier(); for ( JavaFXPlatform platform: values()) { if ( platform.osDetectorId.equals(os)) { From 6c3f44bd84a113102ceea2f1cc93827cd3765367 Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Fri, 10 Dec 2021 17:47:20 +0800 Subject: [PATCH 2/3] Addressed code review comments --- .../org/openjfx/gradle/JavaFXPlatform.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java index d8e02c9..105acba 100644 --- a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java +++ b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java @@ -39,16 +39,17 @@ public enum JavaFXPlatform { LINUX("linux", "linux-x86_64"), + LINUX_AARCH64("linux-aarch64", "linux-aarch_64"), WINDOWS("win", "windows-x86_64"), OSX("mac", "osx-x86_64"), - OSX_ARM("mac-aarch64", "osx-aarch_64"); + OSX_AARCH64("mac-aarch64", "osx-aarch_64"); - private String classifier; - private String osDetectorId; + private final String classifier; + private final String osDetectorClassifier; - JavaFXPlatform( String classifier, String osDetectorId ) { + JavaFXPlatform( String classifier, String osDetectorClassifier ) { this.classifier = classifier; - this.osDetectorId = osDetectorId; + this.osDetectorClassifier = osDetectorClassifier; } public String getClassifier() { @@ -57,23 +58,23 @@ public String getClassifier() { public static JavaFXPlatform detect(Project project) { - String os = project.getExtensions().getByType(OsDetector.class).getClassifier(); + final String classifier = project.getExtensions().getByType(OsDetector.class).getClassifier(); for ( JavaFXPlatform platform: values()) { - if ( platform.osDetectorId.equals(os)) { + if ( platform.osDetectorClassifier.equals(classifier)) { return platform; } } String supportedPlatforms = Arrays.stream(values()) - .map(p->p.osDetectorId) + .map(p->p.osDetectorClassifier) .collect(Collectors.joining("', '", "'", "'")); throw new GradleException( String.format( "Unsupported JavaFX platform found: '%s'! " + "This plugin is designed to work on supported platforms only." + - "Current supported platforms are %s.", os, supportedPlatforms ) + "Current supported platforms are %s.", classifier, supportedPlatforms ) ); } From bcdeb893bad8cda997628fcc9356031cd62cbc62 Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Fri, 10 Dec 2021 17:53:50 +0800 Subject: [PATCH 3/3] Renamed variable to avoid confusion --- src/main/java/org/openjfx/gradle/JavaFXPlatform.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java index 105acba..53735c0 100644 --- a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java +++ b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java @@ -58,10 +58,10 @@ public String getClassifier() { public static JavaFXPlatform detect(Project project) { - final String classifier = project.getExtensions().getByType(OsDetector.class).getClassifier(); + final String osClassifier = project.getExtensions().getByType(OsDetector.class).getClassifier(); for ( JavaFXPlatform platform: values()) { - if ( platform.osDetectorClassifier.equals(classifier)) { + if ( platform.osDetectorClassifier.equals(osClassifier)) { return platform; } } @@ -74,7 +74,7 @@ public static JavaFXPlatform detect(Project project) { String.format( "Unsupported JavaFX platform found: '%s'! " + "This plugin is designed to work on supported platforms only." + - "Current supported platforms are %s.", classifier, supportedPlatforms ) + "Current supported platforms are %s.", osClassifier, supportedPlatforms ) ); }