Include Vaadin-Icons into the project, (#8485)

Include Vaadin-Icons into the valo theme in the project,
make vaadin-icons dependency 'provided'

Fixes #8471

diff --git a/pom.xml b/pom.xml
index fdc697beb9e1d621c9caf832a67cdf284694dc42..50eb8738467a8d7552695bfadc046738438ce813 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,7 @@
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-icons</artifactId>
                 <version>${vaadin.icons.version}</version>
+                <scope>provided</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/server/pom.xml b/server/pom.xml
index a29c9d7c2cf0c6cfecb8075a4bf9db1a2bf41986..b8566f2b39f173941ded5b6afd8e1e6b807aa130 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -116,6 +116,49 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-font-icons</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <!-- VaadinIcons.java file -->
+                        <configuration>
+                            <includeGroupIds>com.vaadin</includeGroupIds>
+                            <includeArtifactIds>vaadin-icons</includeArtifactIds>
+                            <excludeTransitive>true</excludeTransitive>
+                            <includes>com/vaadin/icons/VaadinIcons.java</includes>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${project.build.directory}/vaadin-icons</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/vaadin-icons</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <!-- Copy .java files to package -->
@@ -137,6 +180,10 @@
                                     <directory>src/main/java</directory>
                                     <filtering>false</filtering>
                                 </resource>
+                                <resource>
+                                    <directory>${project.build.directory}/vaadin-icons</directory>
+                                    <filtering>false</filtering>
+                                </resource>
                             </resources>
                         </configuration>
                     </execution>

diff --git a/test/servlet-containers/generic/ivy.xml b/test/servlet-containers/generic/ivy.xml
index 6046e60620c6f5430ee91fc11980ca99c6ca0689..33ac7c7c04c1ac4dd939cc16afd679ee08dc24d9 100644 (file)
--- a/test/servlet-containers/generic/ivy.xml
+++ b/test/servlet-containers/generic/ivy.xml
@@ -68,10 +68,6 @@
             <exclude org="javax.servlet"></exclude>
             <exclude type="pom" />
         </dependency>
-        <dependency org="com.vaadin" name="vaadin-icons" rev="3.0.0"
-            conf="build->default">
-            <exclude type="pom" />
-        </dependency>
 
         <!-- For compiling TestingWidgetSet -->
         <dependency org="com.vaadin" name="vaadin-client-compiler"

diff --git a/test/servlet-containers/generic/ivysettings.xml b/test/servlet-containers/generic/ivysettings.xml
index 07f22ee12548314b373a4eea5b23550fbb959d55..f28250c3c167ca0aae24cad2ee563e1980587332 100644 (file)
--- a/test/servlet-containers/generic/ivysettings.xml
+++ b/test/servlet-containers/generic/ivysettings.xml
@@ -71,8 +71,6 @@
             resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-uitest-common"
             resolver="vaadin-maven" />
-        <module organisation="com.vaadin" name="vaadin-icons"
-            resolver="vaadin-maven" />
     </modules>
 
 

diff --git a/themes/pom.xml b/themes/pom.xml
index 9181af2e21511e72ece0355b52ba6dab86458326..93f01178693e32e8506aa10bc931cc1a7a8011a5 100644 (file)
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -72,9 +72,8 @@
                             <includeGroupIds>com.vaadin</includeGroupIds>
                             <includeArtifactIds>vaadin-icons</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
-                            <includes>VAADIN\/addons\/vaadin-icons\/**</includes>
+                            <includes>VAADIN/addons/vaadin-icons/fonts/*</includes>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${project.basedir}/src/main/themes/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -108,6 +107,25 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-font-files</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/VAADIN/themes/valo/fonts/vaadin-icons</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/dependency-unpack/VAADIN/addons/vaadin-icons/fonts/</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
+                                        <include>Vaadin-Icons.*</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 

diff --git a/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss
index 9c45d6dedac37635394e1e672d31864577547eca..63e5f6689251286a19db7b48e4663e3842c33406 100644 (file)
--- a/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss
@@ -4,7 +4,7 @@
 @import "roboto/roboto";
 @import "lato/lato";
 @import "lora/lora";
-@import "../../../VAADIN/addons/vaadin-icons/vaadin-icons.scss";
+@import "vaadin-icons/vaadin-icons.scss";
 
 /// Include VaadinIcons. They are included in Valo
 /// since Vaadin Framework version 8.0 (#7979)

diff --git a/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/vaadin-icons.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/vaadin-icons.scss
new file mode 100644 (file)
index 0000000..f99c8f3
--- /dev/null
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/vaadin-icons/vaadin-icons.scss
@@ -0,0 +1,20 @@
+$vaadin-icons-pathPrefix: null;
+
+@if $v-relative-paths == false {
+  $vaadin-icons-pathPrefix: "../valo/fonts/vaadin-icons/";
+}
+
+@font-face {
+    font-family: 'Vaadin-Icons';
+    src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot');
+    src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot?#iefix') format('embedded-opentype'),
+         url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.woff') format('woff'),
+         url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.ttf') format('truetype'),
+         url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.svg#icomoon') format('svg');
+}
+.Vaadin-Icons {
+    font-family: 'Vaadin-Icons';
+}
+
+@mixin vaadin-icons {
+}
\ No newline at end of file