Merge branch 'master' into dev

flextype-plugins · Dec 7, 2020 · 02ec56e · 02ec56e
2 parents d7e9e8a + 9029a90
commit 02ec56e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+# Global
+.composer
+composer.lock
+package-lock.json
+vendor/
+node_modules/
+dist/
+
+# Flextype Site Specific
+var/
+
+# OS Generated
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+*.swp
+
+# phpstorm
+.idea/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/flextype-plugins/icon/compare/v1.3.0...v1.4.0) (2020-12-07)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.12
+
 <a name="1.3.0"></a>
-# [1.3.0](https://github.com/flextype-plugins/form-icon/compare/v1.2.0...v1.3.0) (2020-08-25)
+# [1.3.0](https://github.com/flextype-plugins/icon/compare/v1.2.0...v1.3.0) (2020-08-25)
 
 ### Features
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2020 Sergey Romanenko
+Copyright (c) 2021 Sergey Romanenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Icon Plugin for <a href="http://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/icon/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/icon/icon.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/github/downloads/flextype-plugins/icon/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.11-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-plugins/icon/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/icon/icon.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/icon"><img src="https://img.shields.io/github/downloads/flextype-plugins/icon/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.12-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 Icon plugin to present [Font Awesome](https://fontawesome.com/) icons set for Flextype.
@@ -14,7 +14,7 @@ The following dependencies need to be installed for Icon Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.11 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.12 | [download](https://github.com/flextype/flextype/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 
 ## Installation
@@ -46,4 +46,4 @@ echo Icon::icon('fab fa-apple');
 
 ## LICENSE
 [The MIT License (MIT)](https://github.com/flextype-plugins/icon/blob/master/LICENSE.txt)
-Copyright (c) 2018-2020 [Sergey Romanenko](https://github.com/Awilum)
+Copyright (c) 2021 [Sergey Romanenko](https://github.com/Awilum)
diff --git a/composer.json b/composer.json
@@ -16,7 +16,9 @@
       "issues": "https://github.com/flextype-plugins/icon/issues"
     },
     "require": {
-        "php": ">=7.3.0"
+        "php": ">=7.3.0",
+        "flextype-components/arrays" : "3.0.1",
+        "flextype-components/filesystem": "2.0.8"
     },
     "config": {
         "apcu-autoloader": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Icon",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Icon plugin to present Font Awesome icons set for Flextype.",
   "homepage": "https://flextype.org",
   "author": "Sergey Romanenko",

diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Icon
-version: 1.3.0
+version: 1.4.0
 description: Icon plugin to present Font Awesome icons set for Flextype.
 icon: fab fa-font-awesome-flag
 author:
@@ -11,5 +11,5 @@ bugs: https://github.com/flextype-plugins/icon/issues
 license: MIT
 
 dependencies:
-  flextype: 0.9.11
+  flextype: 0.9.12
   twig: '>=1.0.0'