This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 5b52c04df6 use new [JSIncludeScript], [JSIncludeCSS], and
[JSIncludeAsset] metadata
5b52c04df6 is described below
commit 5b52c04df635873f7ced84af0424eb6a5183d377
Author: Josh Tynjala <[email protected]>
AuthorDate: Tue May 13 15:59:43 2025 -0700
use new [JSIncludeScript], [JSIncludeCSS], and [JSIncludeAsset] metadata
We're still using -js-include-script, -js-include-css, and
-js-include-asset compiler options where appropriate for an entire library, but
the metadata allows the files to be skipped if there are no references to
specific definitions.
---
.../asconfig.json | 4 +---
.../pom.xml | 2 --
.../src/main/config/compile-app-config.xml | 6 ------
.../src/main/royale/hljs.as | 2 ++
examples/jewel/TourDeJewel/TourDeJewel.as3proj | 2 +-
examples/jewel/TourDeJewel/asconfig.json | 2 --
examples/jewel/TourDeJewel/pom.xml | 2 --
.../src/main/config/compile-app-config.xml | 7 ------
examples/jewel/TourDeJewel/src/main/royale/hljs.as | 2 ++
.../BasicJS/src/main/config/compile-js-config.xml | 9 --------
.../IconsJS/src/main/config/compile-js-config.xml | 25 ----------------------
.../JewelJS/src/main/config/compile-js-config.xml | 4 ----
frameworks/projects/Basic/asconfig.json | 6 +-----
frameworks/projects/Basic/pom.xml | 2 --
.../org/apache/royale/html/util/DialogPolyfill.as | 4 +++-
frameworks/projects/Icons/asconfig.json | 23 +-------------------
frameworks/projects/Icons/pom.xml | 19 ----------------
.../org/apache/royale/icons/FontAwesomeIcon.as | 16 ++++++++++++++
.../royale/org/apache/royale/icons/MaterialIcon.as | 2 ++
frameworks/projects/Jewel/asconfig.json | 5 +----
frameworks/projects/Jewel/pom.xml | 1 -
.../apache/royale/jewel/beads/views/TabBarView.as | 1 +
22 files changed, 31 insertions(+), 115 deletions(-)
diff --git
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/asconfig.json
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/asconfig.json
index d849b9df92..6cf65342db 100644
---
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/asconfig.json
+++
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/asconfig.json
@@ -28,9 +28,7 @@
},
"copySourcePathAssets": true,
"additionalOptions": [
- "-js-output-optimization=skipAsCoercions",
-
"-js-include-script+=src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js",
-
"-js-include-css+=src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css"
+ "-js-output-optimization=skipAsCoercions"
],
"files":
[
diff --git
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
index f027045f28..8df748ade4 100644
---
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
+++
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
@@ -45,8 +45,6 @@
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
<additionalCompilerOptions>
-source-map=true;
-
-js-include-script+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js;
-
-js-include-css+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css;
</additionalCompilerOptions>
</configuration>
</plugin>
diff --git
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/config/compile-app-config.xml
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/config/compile-app-config.xml
index f179b08688..06decb409e 100644
---
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/config/compile-app-config.xml
+++
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/config/compile-app-config.xml
@@ -26,10 +26,4 @@
<filename>../../../../../../frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css</filename>
</theme>
</compiler>
- <js-include-script>
-
<path-element>../assembly/third-party/highlight.js/9.12.0/highlight.min.js</path-element>
- </js-include-script>
- <js-include-css>
-
<path-element>../assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css</path-element>
- </js-include-css>
</royale-config>
diff --git
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/royale/hljs.as
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/royale/hljs.as
index 7f192f0a40..295235d70a 100644
---
a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/royale/hljs.as
+++
b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/src/main/royale/hljs.as
@@ -18,6 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package
{
+
[JSIncludeScript(source="../assembly/third-party/highlight.js/9.12.0/highlight.min.js")]
+
[JSIncludeCSS(source="../assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css")]
/**
* @externs
*/
diff --git a/examples/jewel/TourDeJewel/TourDeJewel.as3proj
b/examples/jewel/TourDeJewel/TourDeJewel.as3proj
index f17816129c..efffd7c098 100644
--- a/examples/jewel/TourDeJewel/TourDeJewel.as3proj
+++ b/examples/jewel/TourDeJewel/TourDeJewel.as3proj
@@ -60,7 +60,7 @@
<option es="False"/>
<option verboseStackTraces="False"/>
<option allowSourcePathOverlap="False"/>
- <option
additional="-theme=${royalelib}/themes/JewelTheme/src/main/resources/defaults.css
-html-template=src/main/resources/jewel-example-index-template.html
-js-dynamic-access-unknown-members=true
-js-include-script+=src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js"/>
+ <option
additional="-theme=${royalelib}/themes/JewelTheme/src/main/resources/defaults.css
-html-template=src/main/resources/jewel-example-index-template.html
-js-dynamic-access-unknown-members=true"/>
<option linkReport=""/>
</build>
<mavenBuild>
diff --git a/examples/jewel/TourDeJewel/asconfig.json
b/examples/jewel/TourDeJewel/asconfig.json
index 357efaa9ae..fb137b2f1e 100644
--- a/examples/jewel/TourDeJewel/asconfig.json
+++ b/examples/jewel/TourDeJewel/asconfig.json
@@ -32,8 +32,6 @@
"copySourcePathAssets": true,
"additionalOptions": [
"-js-dynamic-access-unknown-members=true",
-
"-js-include-script+=src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js",
-
"-js-include-css+=src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css"
],
"files":
[
diff --git a/examples/jewel/TourDeJewel/pom.xml
b/examples/jewel/TourDeJewel/pom.xml
index 530ef5fd17..37e76fabfb 100644
--- a/examples/jewel/TourDeJewel/pom.xml
+++ b/examples/jewel/TourDeJewel/pom.xml
@@ -995,8 +995,6 @@
-prevent-rename-public-instance-methods=false
-source-map=true;
-
-js-include-script+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js;
-
-js-include-css+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css;
</additionalCompilerOptions>
<!-- At command line use
-Droyalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven/frameworks
-->
</configuration>
diff --git a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml
b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml
index 403b775df2..ce3103c27d 100644
--- a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml
+++ b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml
@@ -31,11 +31,4 @@
<filename>../../../../../../frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css</filename>
</theme>
</compiler>
-
- <js-include-script>
-
<path-element>../assembly/third-party/highlight.js/9.12.0/highlight.min.js</path-element>
- </js-include-script>
- <js-include-css>
-
<path-element>../assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css</path-element>
- </js-include-css>
</royale-config>
diff --git a/examples/jewel/TourDeJewel/src/main/royale/hljs.as
b/examples/jewel/TourDeJewel/src/main/royale/hljs.as
index 7f192f0a40..295235d70a 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/hljs.as
+++ b/examples/jewel/TourDeJewel/src/main/royale/hljs.as
@@ -18,6 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package
{
+
[JSIncludeScript(source="../assembly/third-party/highlight.js/9.12.0/highlight.min.js")]
+
[JSIncludeCSS(source="../assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css")]
/**
* @externs
*/
diff --git
a/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
b/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
index 031adb467f..1d3ed08c97 100644
--- a/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml
@@ -103,14 +103,5 @@
<js-complex-implicit-coercions>false</js-complex-implicit-coercions>
<js-resolve-uncertain>false</js-resolve-uncertain>
<js-vector-index-checks>false</js-vector-index-checks>
-
- <js-include-script>
-
<path-element>../../../../../../projects/Basic/src/main/assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.js</path-element>
- </js-include-script>
-
- <js-include-css>
-
<path-element>../../../../../../projects/Basic/src/main/assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.css</path-element>
- </js-include-css>
-
</royale-config>
diff --git
a/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
b/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
index c570dd5fb5..8ae2e06218 100644
--- a/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
@@ -93,30 +93,5 @@
<js-complex-implicit-coercions>false</js-complex-implicit-coercions>
<js-resolve-uncertain>false</js-resolve-uncertain>
<js-vector-index-checks>false</js-vector-index-checks>
-
- <js-include-css>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/material-icons/4.0.0/material-icons.css</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fontawesome-all.css</path-element>
- </js-include-css>
-
- <js-include-asset>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/material-icons/4.0.0/material-icons.woff2</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.eot</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.svg</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.ttf</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff2</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.eot</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.svg</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.ttf</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff2</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.eot</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.svg</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.ttf</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff</path-element>
-
<path-element>../../../../../../projects/Icons/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff2</path-element>
- </js-include-asset>
-
</royale-config>
diff --git
a/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml
b/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml
index c06a9ceeef..c8d385d991 100644
--- a/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/JewelJS/src/main/config/compile-js-config.xml
@@ -101,9 +101,5 @@
<js-complex-implicit-coercions>false</js-complex-implicit-coercions>
<js-resolve-uncertain>false</js-resolve-uncertain>
<js-vector-index-checks>false</js-vector-index-checks>
-
- <js-include-script>
-
<path-element>../../../../../../projects/Jewel/src/main/assembly/third-party/web-animations/2.3.1/web-animations.min.js</path-element>
- </js-include-script>
</royale-config>
diff --git a/frameworks/projects/Basic/asconfig.json
b/frameworks/projects/Basic/asconfig.json
index e1e5fa4c7a..03c0f35ae6 100644
--- a/frameworks/projects/Basic/asconfig.json
+++ b/frameworks/projects/Basic/asconfig.json
@@ -32,9 +32,5 @@
"../../../../royale-typedefs/airglobal/target/airglobal.swc"
],
"output": "target/Basic.swc"
- },
- "additionalOptions": [
-
"-js-include-script+=src/main/assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.js",
-
"-js-include-css+=src/main/assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.css"
- ]
+ }
}
\ No newline at end of file
diff --git a/frameworks/projects/Basic/pom.xml
b/frameworks/projects/Basic/pom.xml
index 3c18354346..30d66c6087 100644
--- a/frameworks/projects/Basic/pom.xml
+++ b/frameworks/projects/Basic/pom.xml
@@ -70,8 +70,6 @@
<additionalCompilerOptions>
${project.compiler.options};
-compiler.fxg-base-class=flash.display.Sprite;
-
-js-include-script+=${project.basedir}/src/main/assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.js
-
-js-include-css+=${project.basedir}/src/main/assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.css;
</additionalCompilerOptions>
</configuration>
</plugin>
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as
index 111ba54498..f8130c9ce9 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as
@@ -18,6 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.util
{
+
[JSIncludeScript(source="../../../../../../assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.js")]
+
[JSIncludeCSS(source="../../../../../../assembly/third-party/dialog-polyfill/0.4.9/dialog-polyfill.min.css")]
COMPILE::JS
public class DialogPolyfill
{
@@ -25,7 +27,7 @@ package org.apache.royale.html.util
public static function registerDialog(dialog:Element):void
{
-
window["dialogPolyfill"]["registerDialog"](dialog);
+ window["dialogPolyfill"]["registerDialog"](dialog);
}
}
}
\ No newline at end of file
diff --git a/frameworks/projects/Icons/asconfig.json
b/frameworks/projects/Icons/asconfig.json
index d121f5ef97..4d53baf359 100644
--- a/frameworks/projects/Icons/asconfig.json
+++ b/frameworks/projects/Icons/asconfig.json
@@ -30,26 +30,5 @@
"src/main/royale"
],
"output": "target/Icons.swc"
- },
- "additionalOptions": [
-
"-js-include-css+=src/main/assembly/third-party/material-icons/4.0.0/material-icons.css",
-
"-js-include-asset+=src/main/assembly/third-party/material-icons/4.0.0/material-icons.woff2",
-
-
"-js-include-css+=src/main/assembly/third-party/font-awesome/5.15.4/fontawesome-all.css",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.eot",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.svg",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.ttf",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff2",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.eot",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.svg",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.ttf",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff2",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.eot",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.svg",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.ttf",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff",
-
"-js-include-asset+=src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff2"
- ]
+ }
}
diff --git a/frameworks/projects/Icons/pom.xml
b/frameworks/projects/Icons/pom.xml
index 64875e06dd..65e4f06697 100644
--- a/frameworks/projects/Icons/pom.xml
+++ b/frameworks/projects/Icons/pom.xml
@@ -66,25 +66,6 @@
<skipAS>${royale.skipAS}</skipAS>
<!--<additionalCompilerOptions>-compiler.fxg-base-class=flash.display.Sprite</additionalCompilerOptions>-->
<additionalCompilerOptions>
-
-js-include-css+=${project.basedir}/src/main/assembly/third-party/material-icons/4.0.0/material-icons.css;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/material-icons/4.0.0/material-icons.woff2;
-
-
-js-include-css+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fontawesome-all.css;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.eot;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.svg;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.ttf;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff2;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.eot;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.svg;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.ttf;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff2;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.eot;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.svg;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.ttf;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff;
-
-js-include-asset+=${project.basedir}/src/main/assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff2;
</additionalCompilerOptions>
</configuration>
</plugin>
diff --git
a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeIcon.as
b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeIcon.as
index 7484e3164e..94a4de3721 100644
---
a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeIcon.as
+++
b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontAwesomeIcon.as
@@ -18,6 +18,22 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.icons
{
+
[JSIncludeCSS(source="../../../../../assembly/third-party/font-awesome/5.15.4/fontawesome-all.css")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-brands-400.eot")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-brands-400.svg")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-brands-400.ttf")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-brands-400.woff2")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-regular-400.eot")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-regular-400.svg")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-regular-400.ttf")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-regular-400.woff2")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-solid-900.eot")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-solid-900.svg")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-solid-900.ttf")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/font-awesome/5.15.4/fa-solid-900.woff2")]
/**
* Icons can be used alone or in buttons and other controls
*
diff --git
a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/MaterialIcon.as
b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/MaterialIcon.as
index 092f1bb476..eff10fb45a 100644
---
a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/MaterialIcon.as
+++
b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/MaterialIcon.as
@@ -18,6 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.icons
{
+
[JSIncludeCSS(source="../../../../../assembly/third-party/material-icons/4.0.0/material-icons.css")]
+
[JSIncludeAsset(source="../../../../../assembly/third-party/material-icons/4.0.0/material-icons.woff2")]
/**
* A Material based icon can be used alone or in buttons and other
controls
*
diff --git a/frameworks/projects/Jewel/asconfig.json
b/frameworks/projects/Jewel/asconfig.json
index c9538a5d33..3915f722ae 100644
--- a/frameworks/projects/Jewel/asconfig.json
+++ b/frameworks/projects/Jewel/asconfig.json
@@ -30,8 +30,5 @@
"src/main/royale"
],
"output": "target/Jewel.swc"
- },
- "additionalOptions": [
-
"-js-include-script+=src/main/assembly/third-party/web-animations/2.3.1/web-animations.min.js"
- ]
+ }
}
diff --git a/frameworks/projects/Jewel/pom.xml
b/frameworks/projects/Jewel/pom.xml
index d1d2282f0d..1f66be55ea 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -66,7 +66,6 @@
<skipAS>${royale.skipAS}</skipAS>
<additionalCompilerOptions>
${project.compiler.options}
-
-js-include-script+=${project.basedir}/src/main/assembly/third-party/web-animations/2.3.1/web-animations.min.js
</additionalCompilerOptions>
</configuration>
</plugin>
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
index 0aede0f397..3659e418f0 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
@@ -27,6 +27,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.utils.getSelectionRenderBead;
}
+
[JSIncludeScript(source="../../../../../../../assembly/third-party/web-animations/2.3.1/web-animations.min.js")]
/**
* The TabBarView class creates the visual elements of the
org.apache.royale.jewel.TabBar
* component.
