Merge pull request #170 from karma4u101/168-fontAwesome550

168 font awesome550

CHANGELOG.md

@@ -5,13 +5,16 @@ For update history see the [History log](https://github.com/karma4u101/FoBo/tree
 section
 
 **Latest Stable Releases:**
+- **2018-12-01** -- FoBo Module v2.1 for Lift 3.3
 - **2018-07-18** -- FoBo Module v2.0 for Lift 3.3
 - **2018-01-28** -- FoBo Module v2.0
 - **2016-10-04** -- FoBo Module v1.7
 - **2016-06-25** -- FoBo Module v1.6
 - **2015-12-30** -- FoBo Module v1.5.1
 
 **Latest Updates:**
+- **2018-11-28** -- [PR #168](https://github.com/karma4u101/FoBo/pull/168) FoBo v2.1 -- Font Awesome v5.5.0
+- **2018-11-28** -- [PR #169](https://github.com/karma4u101/FoBo/pull/169) FoBo v2.1 -- Bootstrap v4.1.3
 - **2018-07-18** -- [PR #166](https://github.com/karma4u101/FoBo/pull/166) FoBo v2.0 -- Release FoBo v2.0 for Lift v3.3 
 - **2018-01-21** -- [PR #126](https://github.com/karma4u101/FoBo/pull/157) FoBo v2.0 -- Bootstrap v4.0.0 
 - **2018-01-21** -- [PR #163](https://github.com/karma4u101/FoBo/pull/162) FoBo v2.0 -- Updating Popper to v1.12.9
@@ -30,6 +33,12 @@ section
 
 See [Development branch](https://github.com/karma4u101/FoBo/tree/develop/CHANGELOG.md)
 
+## FoBo v2.1
+
+### Updated modules
+- [Bootstrap v4](https://github.com/karma4u101/FoBo/tree/master/Bootstrap/Bootstrap4) [v4.1.3] - [Bootstrap](https://getbootstrap.com/docs/4.1/)
+- [FoBo-Font-Awesome](https://github.com/karma4u101/FoBo/tree/master/Font-Awesome) [v5.5.0] - [Font-Awesome](http://fontawesome.io/)
+
 
 ## FoBo v2.0
 

FoBo/FoBo/src/main/scala/net/liftmodules/fobo/fobo.scala

@@ -479,6 +479,23 @@ package object fobo {
 
     /*===Font Awesome Toolkit===============================================================*/
 
+    /**
+      * Enable usage of FoBo's FontAwesome resources and API version 5․5․0 in your bootstrap liftweb Boot.
+      * @version 5.5.0
+      *
+      * '''Example:'''
+      *
+      * {{{
+      *   import net.liftmodules.fobo
+      *    :
+      *   fobo.Toolkit.init=fobo.Toolkit.FontAwesome550
+      * }}}
+      * @since v2.1.0
+      */
+    case object FontAwesome550 extends Toolkit {
+      net.liftmodules.fobofa.Toolkit.FontAwesome550
+    }
+
     /**
       * Enable usage of FoBo's FontAwesome resources and API version 4․7․0 in your bootstrap liftweb Boot.
       * @version 4.7.0
@@ -1371,6 +1388,23 @@ package object fobo {
 
     /*===Font Awesome Resource===============================================================*/
 
+    /**
+      * Enable usage of FoBo's FontAwesome resources version 5․5․0 in your bootstrap liftweb Boot.
+      * @version 5.5.0
+      *
+      * '''Example:'''
+      *
+      * {{{
+      *   import net.liftmodules.fobo
+      *    :
+      *   fobo.Resource.init=fobo.Resource.FontAwesome550
+      * }}}
+      * @since v2.1.0
+      */
+    case object FontAwesome550 extends Resource {
+      net.liftmodules.fobofa.Resource.FontAwesome550
+    }
+
     /**
       * Enable usage of FoBo's FontAwesome resources version 4․7․0 in your bootstrap liftweb Boot.
       * @version 4.7.0

FoBo/FoBo/src/test/scala/net/liftmodules/fobo/FoBoSpec.scala

@@ -552,6 +552,20 @@ object FoBoSpec extends Specification {
 
   /*=================FontAwesome ====================================*/
 
+  //FontAwesome550
+  "With fobo.Toolkit.init set to fobo.Toolkit.FontAwesome550 the ResourceServer" should {
+    "allow  fobo/font-awesome/all.css" in {
+      allowToolkitInit(
+        fobo.Toolkit.FontAwesome550,
+        "fobo" :: "font-awesome" :: "all.css" :: Nil) must_== true
+    }
+    "rewrit fobo/font-awesome/all.css to fobo/font-awesome/5.5.0/css/all.min.css" in {
+      rewriteToolkitInit(fobo.Toolkit.FontAwesome321,
+                         "fobo" :: "font-awesome" :: "all.css" :: Nil) must_==
+        List("fobo", "font-awesome", "5.5.0", "css", "all.min.css")
+    }
+  }
+
   //FontAwesome321
   "With fobo.Toolkit.init set to fobo.Toolkit.FontAwesome321 the ResourceServer" should {
     "allow  fobo/font-awesome.css" in {

Font-Awesome/Font-Awesome-API/src/main/scala/net/liftmodules/fobofa/fobofaapi.scala

@@ -35,7 +35,7 @@ package object fobofaapi {
     //the object name, we can easily change this if we need to
     private type Store = List[String] //List[API]
     private var store: Store = List()
-    def init: Store = store
+    def init: Store          = store
     def init_=(t: API): Store = {
       store = if (store contains t.toString) store else t.toString :: store
       store
@@ -57,6 +57,22 @@ package object fobofaapi {
     case object FontAwesome4 extends API {
       FoBoAPI.init
     }
+
+    /**
+      * Enable usage of FoBo's FontAwesome API version 5․X․X in your bootstrap liftweb Boot.
+      * @version 5.X.X
+      *
+      * @example
+      *
+      * {{{
+      *   import net.liftmodules.{fobofaapi => fobo}
+      *    :
+      *   fobo.API.init=fobo.API.FontAwesome5
+      * }}}
+      */
+    case object FontAwesome5 extends API {
+      FoBoAPI.init
+    }
   }
 
   /**

Font-Awesome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/LICENSE.txt

@@ -0,0 +1,34 @@
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OLF license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**