Use JavaFX JS SDK version as internal version (gluonhq#997)

Co-authored-by: jose.pereda <[email protected]>
makingthematrix · Sep 5, 2021 · 45b80d2 · 45b80d2
1 parent bd07ffb
commit 45b80d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/gluonhq/substrate/Constants.java b/src/main/java/com/gluonhq/substrate/Constants.java
@@ -107,6 +107,7 @@ public enum Profile {
 
     public static final String DEFAULT_JAVA_STATIC_SDK_VERSION  = "11-ea+10";
     public static final String DEFAULT_JAVAFX_STATIC_SDK_VERSION  = "17-ea+14";
+    public static final String DEFAULT_JAVAFX_JS_SDK_VERSION  = "18-internal+0-2021-09-02-165800";
     public static final String DEFAULT_SYSROOT_VERSION  = "20210424";
 
     /**
@@ -155,7 +156,6 @@ public enum Profile {
     public static final String ANDROID_PROJECT_NAME = "android_project";
 
     public static final String META_INF_SUBSTRATE_WEB = "META-INF/substrate/web/";
-    public static final String WEB_NATIVE_FOLDER = "/native/web/";
     public static final String WEB_AOT_CLASSIFIER = "bck2brwsr";
     public static final String WEB_AOT_VERSION = "0.51";
     public static final String WEB_INDEX_HTML = "index.html";

diff --git a/src/main/java/com/gluonhq/substrate/target/WebTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/WebTargetConfiguration.java
@@ -271,6 +271,9 @@ protected String artifactId(File a) {
             protected String version(File a) {
                 String artifact = artifacts.get(a);
                 if (artifact != null) {
+                    if ("org.openjfx".equals(groupId(a)) && classifier(a) != null) {
+                        return Constants.DEFAULT_JAVAFX_JS_SDK_VERSION;
+                    }
                     return artifact.split(":")[2];
                 }
                 return null;