Update

bitterdev · Aug 22, 2023 · f44497b · f44497b
1 parent c13a006
commit f44497b
Show file tree

Hide file tree

Showing 14 changed files with 2,417 additions and 359 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+release/
+
 ##### Windows
 # Windows thumbnail cache files
 Thumbs.db

diff --git a/.idea/app_icon.iml b/.idea/app_icon.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.5.0
+==================================================
+- V9 compatible
+
 Version 2.0.0
 ==================================================
 - Integrate new support system dialog + clean up code

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -58,6 +58,7 @@ module.exports = function (grunt) {
                     {src: ['controllers/**'], dest: "dist/"},
                     {src: ['views/**'], dest: "dist/"},
                     {src: ['elements/**'], dest: "dist/"},
+                    {src: ['routes/**'], dest: "dist/"},
                     {src: ['single_pages/**'], dest: "dist/"},
                     {src: ['src/**'], dest: "dist/"},
                     {src: ['languages/**'], dest: "dist/"},
@@ -69,7 +70,7 @@ module.exports = function (grunt) {
         compress: {
             main: {
                 options: {
-                    archive: 'build/' + packageName + '.zip'
+                    archive: 'release/' + packageName + '.zip'
                 },
                 files: [
                     {src: ['**'], dest: packageName, expand: true, cwd: 'dist/'}
@@ -79,25 +80,13 @@ module.exports = function (grunt) {
         clean: {
             dist: ['dist'],
             composer: ['vendor', 'composer.lock']
-        },
-        phpcsfixer: {
-            app: {
-                dir: 'dist'
-            },
-            options: {
-                bin: './vendor/friendsofphp/php-cs-fixer/php-cs-fixer',
-                usingCache: "no",
-                quiet: true
-            }
         }
     });
 
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-composer');
-    grunt.loadNpmTasks('grunt-php-cs-fixer');
     grunt.loadNpmTasks('grunt-version');
     grunt.loadNpmTasks('grunt-contrib-copy');
 
-    grunt.registerTask('default', ['clean:composer', 'composer:release:install', 'clean:dist', 'copy', 'version', 'clean:composer', 'composer:dev:install', 'phpcsfixer', 'compress:main', 'clean:dist']);
+    grunt.registerTask('default', ['clean:dist', 'copy', 'version', 'compress:main', 'clean:dist']);
 };
diff --git a/controller.php b/controller.php
@@ -10,16 +10,14 @@
 
 namespace Concrete\Package\AppIcon;
 
-defined('C5_EXECUTE') or die('Access denied');
-
 use Bitter\AppIcon\Provider\ServiceProvider;
 use Concrete\Core\Package\Package;
 
 class Controller extends Package
 {
     protected $pkgHandle = 'app_icon';
-    protected $pkgVersion = '2.0.0';
-    protected $appVersionRequired = '8.0.0';
+    protected $pkgVersion = '2.5.0';
+    protected $appVersionRequired = '9.0.0';
     protected $pkgAutoloaderRegistries = [
         'src/Bitter/AppIcon' => 'Bitter\AppIcon',
     ];

diff --git a/elements/dashboard/did_you_know.php b/elements/dashboard/did_you_know.php
diff --git a/elements/dashboard/help.php b/elements/dashboard/help.php
diff --git a/elements/dashboard/install_post.php b/elements/dashboard/install_post.php
diff --git a/elements/dashboard/license_check.php b/elements/dashboard/license_check.php