Merge branch 'gantry:develop' into develop

gantry · Oct 23, 2023 · fa6f230 · fa6f230
2 parents 4bfe104 + 18c4cad
commit fa6f230
Show file tree

Hide file tree

Showing 10 changed files with 359 additions and 210 deletions.
diff --git a/platforms/grav/gantry5/compat/composer.lock b/platforms/grav/gantry5/compat/composer.lock
diff --git a/platforms/grav/gantry5/composer.json b/platforms/grav/gantry5/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": ">=7.3.6",
         "scssphp/scssphp": "~1.10",
-        "leafo/scssphp": "0.8.4"
+        "leafo/scssphp": "dev-master"
     },
     "autoload": {
         "psr-4": {
@@ -20,6 +20,12 @@
             "src/Loader.php"
         ]
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/rockettheme/scssphp"
+          }
+    ],
     "config": {
         "platform": {
             "php": "7.3.6"

diff --git a/platforms/grav/gantry5/composer.lock b/platforms/grav/gantry5/composer.lock
diff --git a/platforms/joomla/lib_gantry5/compat/composer.lock b/platforms/joomla/lib_gantry5/compat/composer.lock
diff --git a/platforms/joomla/lib_gantry5/composer.json b/platforms/joomla/lib_gantry5/composer.json
@@ -14,7 +14,7 @@
 
         "twig/twig": "~1.42",
         "scssphp/scssphp": "1.10.0",
-        "leafo/scssphp": "0.8.4"
+        "leafo/scssphp": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"
@@ -23,7 +23,11 @@
         {
             "type": "vcs",
             "url": "https://github.com/rockettheme/toolbox"
-        }
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/rockettheme/scssphp"
+          }
     ],
     "autoload": {
         "psr-4": {