Merge pull request #3132 from gantry/master

Release 5.5.16
gantry · Apr 3, 2023 · 4f77567 · 4f77567
2 parents e578035 + 162d813
commit 4f77567
Show file tree

Hide file tree

Showing 33 changed files with 80 additions and 79 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -15,7 +15,7 @@ jobs:
         os: [ubuntu-latest]
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -31,9 +31,9 @@ jobs:
           sudo apt-get -y install -qq git zip < /dev/null > /dev/null
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir -d bin/builder)"
+        run: echo "dir=$(composer config cache-files-dir -d bin/builder)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-@version@
+5.5.15
diff --git a/bin/build b/bin/build
@@ -31,7 +31,7 @@ foreach ($argv as $arg) {
 
 $base = dirname(__DIR__);
 if (false === $hasVersion) {
-    $file = fopen("{$base}/CHANGELOG.md",'rb');
+    $file = fopen("{$base}/CHANGELOG.md", 'rb');
     if (preg_match('/^# (\d\.\d+.\d+(-[a-z0-9.]+)?)\s*$/i', fgets($file), $matches) !== 1) {
         echo 'First line of CHANGELOG.md has wrong Gantry version format, aborting';
         return 1;
@@ -52,13 +52,14 @@ if (false === $hasVersion) {
         $version .= '-' . $commitShort;
 
         $argv[] = '-Dstr.fileversion=_' . $branch;
-        $argv[] = '-Dcommit=' . $commit;
+        if (!empty($commit)) {
+            $argv[] = '-Dcommit=' . $commit;
+        }
     }
-
-    $argv[] = '-Dxml.version=' . $version;
 }
 
 $command = 'vendor/bin/phing ' . implode(' ', $argv);
+echo "Running command: {$command}\n";
 if (false === system($command, $result) || $result) {
     throw new \RuntimeException('Failed to run build script');
-}
+}
diff --git a/platforms/common/blueprints/gantry/theme/details.yaml b/platforms/common/blueprints/gantry/theme/details.yaml
@@ -12,7 +12,7 @@ form:
     version:
       type: input.text
       label: Version
-      default: "@version@"
+      default: "5.5.15"
 
     icon:
       type: input.text
@@ -22,7 +22,7 @@ form:
     date:
       type: input.text
       label: Release Date
-      default: "@versiondate@"
+      default: "January 16, 2023"
 
     author.name:
       type: input.text

diff --git a/platforms/grav/gantry5/blueprints.yaml b/platforms/grav/gantry5/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Gantry 5 Framework
-version: '@version@'
+version: '5.5.15'
 description: Gantry 5 Theme framework
 icon: gantry
 author:

diff --git a/platforms/joomla/com_gantry5/admin/gantry5.xml b/platforms/joomla/com_gantry5/admin/gantry5.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="component" method="upgrade">
     <name>com_gantry5</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml b/platforms/joomla/gantry5_nucleus/gantry5_nucleus.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="file" method="upgrade">
     <name>gantry5_nucleus</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/lib_gantry5/gantry5.xml b/platforms/joomla/lib_gantry5/gantry5.xml
@@ -2,8 +2,8 @@
 <extension version="3.9" type="library" method="upgrade">
     <name>Gantry 5 Framework</name>
     <libraryname>gantry5</libraryname>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml b/platforms/joomla/mod_gantry5_particle/mod_gantry5_particle.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="module" client="site" method="upgrade">
     <name>mod_gantry5_particle</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/pkg_gantry5.xml b/platforms/joomla/pkg_gantry5.xml
@@ -2,8 +2,8 @@
 <extension version="3.9" type="package" method="upgrade">
     <name>pkg_gantry5</name>
     <packagename>gantry5</packagename>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>
@@ -16,19 +16,19 @@
     <blockChildUninstall>true</blockChildUninstall>
     <files folder="packages">
         <!-- Mandatory system plugin -->
-        <file type="plugin"    group="system"     id="gantry5"              enabled="1">plg_system_gantry5_v@version@.zip</file>
+        <file type="plugin"    group="system"     id="gantry5"              enabled="1">plg_system_gantry5_v5.5.15.zip</file>
         <!-- Quick icons -->
-        <file type="plugin"    group="quickicon"  id="gantry5"              enabled="1">plg_quickicon_gantry5_v@version@.zip</file>
+        <file type="plugin"    group="quickicon"  id="gantry5"              enabled="1">plg_quickicon_gantry5_v5.5.15.zip</file>
         <!-- Mandatory system plugin -->
-        <file type="plugin"    group="gantry5"    id="preset"                          >plg_gantry5_preset_v@version@.zip</file>
+        <file type="plugin"    group="gantry5"    id="preset"                          >plg_gantry5_preset_v5.5.15.zip</file>
         <!-- Particle module -->
-        <file type="module"    client="site"      id="mod_gantry5_particle" enabled="1">mod_gantry5_particle_v@version@.zip</file>
+        <file type="module"    client="site"      id="mod_gantry5_particle" enabled="1">mod_gantry5_particle_v5.5.15.zip</file>
         <!-- Gantry framework library -->
-        <file type="library"                      id="gantry5"              enabled="1">lib_gantry5_v@version@.zip</file>
+        <file type="library"                      id="gantry5"              enabled="1">lib_gantry5_v5.5.15.zip</file>
         <!-- Common media files -->
-        <file type="file"                         id="gantry5_nucleus"      enabled="1">gantry5_nucleus_v@version@.zip</file>
+        <file type="file"                         id="gantry5_nucleus"      enabled="1">gantry5_nucleus_v5.5.15.zip</file>
         <!-- Administration component -->
-        <file type="component"                    id="com_gantry5"          enabled="1">com_gantry5_v@version@.zip</file>
+        <file type="component"                    id="com_gantry5"          enabled="1">com_gantry5_v5.5.15.zip</file>
     </files>
 
     <languages folder="language">

diff --git a/platforms/joomla/plg_gantry5_preset/preset.xml b/platforms/joomla/plg_gantry5_preset/preset.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="plugin" group="gantry5" method="upgrade">
     <name>plg_gantry5_preset</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/plg_quickicon_gantry5/gantry5.xml b/platforms/joomla/plg_quickicon_gantry5/gantry5.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="plugin" group="quickicon" method="upgrade">
     <name>plg_quickicon_gantry5</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/plg_system_gantry5/gantry5.xml b/platforms/joomla/plg_system_gantry5/gantry5.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="plugin" group="system" method="upgrade">
     <name>plg_system_gantry5</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml b/platforms/joomla/plg_system_gantry5_debugbar/gantry5_debugbar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="plugin" group="system" method="upgrade">
     <name>plg_system_gantry5_debugbar</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/platforms/joomla/updates/gantry5_jed.xml b/platforms/joomla/updates/gantry5_jed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jedupdate version="1">
-    <version>@version@</version>
+    <version>5.5.15</version>
 
     <compatibility>
         <version>39</version>

diff --git a/platforms/joomla/updates/list.xml b/platforms/joomla/updates/list.xml
@@ -5,20 +5,20 @@
                element="pkg_gantry5"
                type="package"
                client="site"
-               version="@version@"
+               version="5.5.15"
                detailsurl="http://updates.gantry.org/5.0/joomla/pkg_gantry5.xml"/>
     <extension name="Hydrogen"
                description="Hydrogen Template"
                element="g5_hydrogen"
                type="template"
                client="site"
-               version="@version@"
+               version="5.5.15"
                detailsurl="http://updates.gantry.org/5.0/joomla/tpl_g5_hydrogen.xml"/>
     <extension name="Helium"
                description="Helium Template"
                element="g5_helium"
                type="template"
                client="site"
-               version="@version@"
+               version="5.5.15"
                detailsurl="http://updates.gantry.org/5.0/joomla/tpl_g5_helium.xml"/>
 </extensionset>
diff --git a/platforms/joomla/updates/pkg_gantry5.xml b/platforms/joomla/updates/pkg_gantry5.xml
@@ -6,11 +6,11 @@
 		<element>pkg_gantry5</element>
 		<type>package</type>
 		<client>site</client>
-		<version>@version@</version>
-		<infourl title="Gantry @version@">http://docs.gantry.org/gantry5</infourl>
-        <sha512>@sha512_joomla_package@</sha512>
+		<version>5.5.15</version>
+		<infourl title="Gantry 5.5.15">http://docs.gantry.org/gantry5</infourl>
+        <sha512>937dd530553add1440ff6187bd7f7ebee58b75da52d3da801b599bb104d0d4efec720d0f944b42705db78ab9177216ab24060c2efe5a36aed4853bc51066ae2d</sha512>
 		<downloads>
-			<downloadurl type="full" format="zip">http://updates.gantry.org/download/@version@/joomla-pkg_gantry5_v@version@.zip</downloadurl>
+			<downloadurl type="full" format="zip">http://updates.gantry.org/download/5.5.15/joomla-pkg_gantry5_v5.5.15.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

diff --git a/platforms/joomla/updates/tpl_g5_helium.xml b/platforms/joomla/updates/tpl_g5_helium.xml
@@ -6,11 +6,11 @@
 		<element>g5_helium</element>
 		<type>template</type>
 		<client>site</client>
-		<version>@version@</version>
-		<infourl title="Helium @version@">http://docs.gantry.org/gantry5</infourl>
-        <sha512>@sha512_joomla_helium@</sha512>
+		<version>5.5.15</version>
+		<infourl title="Helium 5.5.15">http://docs.gantry.org/gantry5</infourl>
+        <sha512>56b4282809339da9d249efc3e02ec4979a68a1601d8fe777dc160f4895c29d44103cbf14046118461b4cd0ccf8e86761a94a5383bae93fee502454dbb171a82a</sha512>
 		<downloads>
-			<downloadurl type="full" format="zip">http://updates.gantry.org/download/@version@/joomla-tpl_g5_helium_v@version@.zip</downloadurl>
+			<downloadurl type="full" format="zip">http://updates.gantry.org/download/5.5.15/joomla-tpl_g5_helium_v5.5.15.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

diff --git a/platforms/joomla/updates/tpl_g5_hydrogen.xml b/platforms/joomla/updates/tpl_g5_hydrogen.xml
@@ -6,11 +6,11 @@
 		<element>g5_hydrogen</element>
 		<type>template</type>
 		<client>site</client>
-		<version>@version@</version>
-		<infourl title="Hydrogen @version@">http://docs.gantry.org/gantry5</infourl>
-        <sha512>@sha512_joomla_hydrogen@</sha512>
+		<version>5.5.15</version>
+		<infourl title="Hydrogen 5.5.15">http://docs.gantry.org/gantry5</infourl>
+        <sha512>7013dc0cba596fa8cccbd2ada8b17b7b349524d4dc05ef54640bd6f57fa83715649a053e368c9354d872e4aac026ba90d69fa9b5c156dad8e71cff5b4d30b097</sha512>
 		<downloads>
-			<downloadurl type="full" format="zip">http://updates.gantry.org/download/@version@/joomla-tpl_g5_hydrogen_v@version@.zip</downloadurl>
+			<downloadurl type="full" format="zip">http://updates.gantry.org/download/5.5.15/joomla-tpl_g5_hydrogen_v5.5.15.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

diff --git a/src/RealLoader.php b/src/RealLoader.php
@@ -49,8 +49,8 @@ public static function getClassLoader()
             throw new \LogicException(self::$errorMessageGantryLoaded);
         }
 
-        define('GANTRY5_VERSION', '@version@');
-        define('GANTRY5_VERSION_DATE', '@versiondate@');
+        define('GANTRY5_VERSION', '5.5.15');
+        define('GANTRY5_VERSION_DATE', 'January 16, 2023');
 
         if (!defined('DS')) {
             define('DS', DIRECTORY_SEPARATOR);

diff --git a/themes/base/joomla/templateDetails.xml b/themes/base/joomla/templateDetails.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="template" client="site" method="upgrade">
     <name>g5_base</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/themes/helium-child/wordpress/gantry/theme.yaml b/themes/helium-child/wordpress/gantry/theme.yaml
@@ -1,8 +1,8 @@
 details:
   name: Helium Child
-  version: '@version@'
+  version: '5.5.15'
   icon: paper-plane
-  date: '@versiondate@'
+  date: 'January 16, 2023'
   author:
     name: 'RocketTheme, LLC'
     email: 'support@rockettheme.com'

diff --git a/themes/helium/grav/blueprints.yaml b/themes/helium/grav/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Helium
-version: "@version@"
+version: "5.5.15"
 description: "Default Gantry 5 theme."
 icon: gantry
 author:

diff --git a/themes/helium/grav/gantry/theme.yaml b/themes/helium/grav/gantry/theme.yaml
@@ -1,8 +1,8 @@
 details:
   name: Helium
-  version: '@version@'
+  version: '5.5.15'
   icon: paper-plane
-  date: '@versiondate@'
+  date: 'January 16, 2023'
   author:
     name: RocketTheme, LLC
     email: 'support@rockettheme.com'

diff --git a/themes/helium/joomla/gantry/theme.yaml b/themes/helium/joomla/gantry/theme.yaml
@@ -1,8 +1,8 @@
 details:
   name: Helium
-  version: '@version@'
+  version: '5.5.15'
   icon: paper-plane
-  date: '@versiondate@'
+  date: 'January 16, 2023'
   author:
     name: 'RocketTheme, LLC'
     email: 'support@rockettheme.com'

diff --git a/themes/helium/joomla/templateDetails.xml b/themes/helium/joomla/templateDetails.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension version="3.9" type="template" client="site" method="upgrade">
     <name>g5_helium</name>
-    <version>@version@</version>
-    <creationDate>@versiondate@</creationDate>
+    <version>5.5.15</version>
+    <creationDate>January 16, 2023</creationDate>
     <author>RocketTheme, LLC</author>
     <authorEmail>support@rockettheme.com</authorEmail>
     <authorUrl>http://www.rockettheme.com</authorUrl>

diff --git a/themes/helium/wordpress/gantry/theme.yaml b/themes/helium/wordpress/gantry/theme.yaml
@@ -1,8 +1,8 @@
 details:
   name: Helium
-  version: '@version@'
+  version: '5.5.15'
   icon: paper-plane
-  date: '@versiondate@'
+  date: 'January 16, 2023'
   author:
     name: 'RocketTheme, LLC'
     email: 'support@rockettheme.com'

diff --git a/themes/hydrogen-child/wordpress/gantry/theme.yaml b/themes/hydrogen-child/wordpress/gantry/theme.yaml
@@ -1,8 +1,8 @@
 details:
   name: Hydrogen Child
-  version: '@version@'
+  version: '5.5.15'
   icon: paper-plane
-  date: '@versiondate@'
+  date: 'January 16, 2023'
   author:
     name: RocketTheme, LLC
     email: support@rockettheme.com

diff --git a/themes/hydrogen/grav/blueprints.yaml b/themes/hydrogen/grav/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Hydrogen
-version: "@version@"
+version: "5.5.15"
 description: "Default Gantry 5 theme."
 icon: gantry
 author:

diff --git a/themes/hydrogen/grav/gantry/theme.yaml b/themes/hydrogen/grav/gantry/theme.yaml
@@ -1,8 +1,8 @@
 details:
   name: Hydrogen
-  version: '@version@'
+  version: '5.5.15'
   icon: paper-plane
-  date: '@versiondate@'
+  date: 'January 16, 2023'
   author:
     name: 'RocketTheme, LLC'
     email: support@rockettheme.com