This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch feature/vivid-ui-set in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit e9d58c5ef24743b89c53f709abaf6d78086fb10f Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Sat Feb 24 17:21:11 2018 +0100 Move vivid theme to themes folder and change vivid example to dependency "theme" --- examples/royale/VividExample/pom.xml | 11 ++- .../src/main/config/compile-swf-config.xml | 91 ---------------------- frameworks/projects/pom.xml | 1 - .../VividBlueTheme/.vscode/launch.json | 0 .../VividBlueTheme/.vscode/settings.json | 0 .../VividBlueTheme/.vscode/tasks.json | 0 .../VividBlueTheme/asconfig.json | 0 .../{projects => themes}/VividBlueTheme/build.xml | 0 .../{projects => themes}/VividBlueTheme/pom.xml | 6 +- .../src/main/resources/TextField.css | 0 .../VividBlueTheme/src/main/resources/defaults.css | 0 .../src/main/royale/VividBlueThemeClasses.as | 0 frameworks/themes/pom.xml | 1 + 13 files changed, 10 insertions(+), 100 deletions(-) diff --git a/examples/royale/VividExample/pom.xml b/examples/royale/VividExample/pom.xml index e53bc13..9c73e11 100644 --- a/examples/royale/VividExample/pom.xml +++ b/examples/royale/VividExample/pom.xml @@ -48,9 +48,7 @@ <configuration> <mainClass>App.mxml</mainClass> <targets>JSRoyale</targets> - <!--<htmlTemplate>${basedir}/target/javascript/bin/js-debug/vivid-js-index-template.html</htmlTemplate> - <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>--> - <additionalCompilerOptions>-theme=${basedir}/../../../frameworks/projects/VividBlueTheme/target/VividBlueTheme-${royale.framework.version}-js.swc</additionalCompilerOptions> + <!--<htmlTemplate>${basedir}/target/javascript/bin/js-debug/vivid-js-index-template.html</htmlTemplate>--> </configuration> </plugin> </plugins> @@ -85,6 +83,13 @@ <type>swc</type> <classifier>swf</classifier> </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>VividBlueTheme</artifactId> + <version>0.9.2-SNAPSHOT</version> + <type>swc</type> + <scope>theme</scope> + </dependency> </dependencies> </project> diff --git a/frameworks/projects/VividBlueTheme/src/main/config/compile-swf-config.xml b/frameworks/projects/VividBlueTheme/src/main/config/compile-swf-config.xml deleted file mode 100644 index e4dd958..0000000 --- a/frameworks/projects/VividBlueTheme/src/main/config/compile-swf-config.xml +++ /dev/null @@ -1,91 +0,0 @@ -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<royale-config> - - <compiler> - <accessible>false</accessible> - - <!-- build only SWF version since no compiled code --> - <targets> - <target>SWF</target> - </targets> - <strict-xml>true</strict-xml> - - <external-library-path> - <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - </external-library-path> - - <allow-subclass-overrides>true</allow-subclass-overrides> - <mxml> - <children-as-data>true</children-as-data> - </mxml> - <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event> - <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind> - <binding-value-change-event-type>valueChange</binding-value-change-event-type> - - <define> - <name>COMPILE::SWF</name> - <value>true</value> - </define> - <define> - <name>COMPILE::JS</name> - <value>false</value> - </define> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path/> - - <namespaces> - </namespaces> - - <source-path> - <path-element>../royale</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - <name>defaults.css</name> - <path>../resources/defaults.css</path> - </include-file> - <include-file> - <name>TextField.css</name> - <path>../resources/TextField.css</path> - </include-file> - - <include-lookup-only>true</include-lookup-only> - - <include-classes> - <class>VividBlueThemeClasses</class> - </include-classes> - - <target-player>${playerglobal.version}</target-player> - - -</royale-config> diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml index 55fb559..c851a7d 100644 --- a/frameworks/projects/pom.xml +++ b/frameworks/projects/pom.xml @@ -61,7 +61,6 @@ <module>TLF</module> <module>RoyaleSite</module> <module>Vivid</module> - <module>VividBlueTheme</module> </modules> <profiles> diff --git a/frameworks/projects/VividBlueTheme/.vscode/launch.json b/frameworks/themes/VividBlueTheme/.vscode/launch.json similarity index 100% rename from frameworks/projects/VividBlueTheme/.vscode/launch.json rename to frameworks/themes/VividBlueTheme/.vscode/launch.json diff --git a/frameworks/projects/VividBlueTheme/.vscode/settings.json b/frameworks/themes/VividBlueTheme/.vscode/settings.json similarity index 100% rename from frameworks/projects/VividBlueTheme/.vscode/settings.json rename to frameworks/themes/VividBlueTheme/.vscode/settings.json diff --git a/frameworks/projects/VividBlueTheme/.vscode/tasks.json b/frameworks/themes/VividBlueTheme/.vscode/tasks.json similarity index 100% rename from frameworks/projects/VividBlueTheme/.vscode/tasks.json rename to frameworks/themes/VividBlueTheme/.vscode/tasks.json diff --git a/frameworks/projects/VividBlueTheme/asconfig.json b/frameworks/themes/VividBlueTheme/asconfig.json similarity index 100% rename from frameworks/projects/VividBlueTheme/asconfig.json rename to frameworks/themes/VividBlueTheme/asconfig.json diff --git a/frameworks/projects/VividBlueTheme/build.xml b/frameworks/themes/VividBlueTheme/build.xml similarity index 100% rename from frameworks/projects/VividBlueTheme/build.xml rename to frameworks/themes/VividBlueTheme/build.xml diff --git a/frameworks/projects/VividBlueTheme/pom.xml b/frameworks/themes/VividBlueTheme/pom.xml similarity index 87% rename from frameworks/projects/VividBlueTheme/pom.xml rename to frameworks/themes/VividBlueTheme/pom.xml index 92b6054..5017d0e 100644 --- a/frameworks/projects/VividBlueTheme/pom.xml +++ b/frameworks/themes/VividBlueTheme/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.royale.framework</groupId> - <artifactId>projects</artifactId> + <artifactId>themes</artifactId> <version>0.9.2-SNAPSHOT</version> </parent> @@ -54,10 +54,6 @@ <path>../src/main/resources/TextField.css</path> </include-file> </includeFiles> - <includeLookupOnly>true</includeLookupOnly> - <!--<allowSubclassOverrides>true</allowSubclassOverrides>--> - <skipExtern>true</skipExtern> - <!--<additionalCompilerOptions>-compiler.fxg-base-class=flash.display.Sprite</additionalCompilerOptions>--> </configuration> </plugin> </plugins> diff --git a/frameworks/projects/VividBlueTheme/src/main/resources/TextField.css b/frameworks/themes/VividBlueTheme/src/main/resources/TextField.css similarity index 100% rename from frameworks/projects/VividBlueTheme/src/main/resources/TextField.css rename to frameworks/themes/VividBlueTheme/src/main/resources/TextField.css diff --git a/frameworks/projects/VividBlueTheme/src/main/resources/defaults.css b/frameworks/themes/VividBlueTheme/src/main/resources/defaults.css similarity index 100% rename from frameworks/projects/VividBlueTheme/src/main/resources/defaults.css rename to frameworks/themes/VividBlueTheme/src/main/resources/defaults.css diff --git a/frameworks/projects/VividBlueTheme/src/main/royale/VividBlueThemeClasses.as b/frameworks/themes/VividBlueTheme/src/main/royale/VividBlueThemeClasses.as similarity index 100% rename from frameworks/projects/VividBlueTheme/src/main/royale/VividBlueThemeClasses.as rename to frameworks/themes/VividBlueTheme/src/main/royale/VividBlueThemeClasses.as diff --git a/frameworks/themes/pom.xml b/frameworks/themes/pom.xml index 33ba1d3..3f2ca6a 100644 --- a/frameworks/themes/pom.xml +++ b/frameworks/themes/pom.xml @@ -34,6 +34,7 @@ <modules> <module>Basic</module> + <module>VividBlueTheme</module> </modules> <dependencies> -- To stop receiving notification emails like this one, please contact carlosrov...@apache.org.