diff --git a/sculpin.json b/sculpin.json index 267ba343..9164270d 100644 --- a/sculpin.json +++ b/sculpin.json @@ -3,6 +3,7 @@ "components/bootstrap": "~2.3.1", "components/highlightjs": "~7.3.0", "components/jquery": "~1.9.1", + "thomaspark/bootswatch": "@dev", "tsphethean/sculpin-related-posts-bundle": "~0.1.0" }, "config": { diff --git a/sculpin.lock b/sculpin.lock index 077f3866..1386da48 100644 --- a/sculpin.lock +++ b/sculpin.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c1a9ae4e8c31d83d7b43e6ad0161e602", + "hash": "bfddc03ede664e6abc3827244340aba6", "packages": [ { "name": "components/bootstrap", @@ -153,35 +153,39 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "b20efe38845d20458702f97f3ff625d80805897b" + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b", - "reference": "b20efe38845d20458702f97f3ff625d80805897b", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", "shasum": "" }, "require": { "php": ">=5.3.1", "symfony/process": "~2.1" }, + "conflict": { + "twig/twig": "<1.12" + }, "require-dev": { "cssmin/cssmin": "*", "joliclic/javascript-packer": "*", "kamicane/packager": "*", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "leafo/scssphp-compass": "*", + "leafo/lessphp": "^0.3.7", + "leafo/scssphp": "*@dev", + "leafo/scssphp-compass": "*@dev", "mrclay/minify": "*", - "patchwork/jsqueeze": "~1.0", - "phpunit/phpunit": "~4", + "patchwork/jsqueeze": "~1.0|~2.0", + "phpunit/phpunit": "~4.8", "psr/log": "~1.0", "ptachoire/cssembed": "*", - "twig/twig": "~1.6" + "symfony/phpunit-bridge": "~2.7", + "twig/twig": "~1.8|~2.0" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -194,7 +198,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -223,20 +227,20 @@ "compression", "minification" ], - "time": "2014-12-12 05:04:05" + "time": "2015-08-31 19:07:16" }, { "name": "robloach/component-installer", - "version": "0.2.2", + "version": "0.2.3", "source": { "type": "git", "url": "https://github.com/RobLoach/component-installer.git", - "reference": "0553c9bbf60fa1623594d125e8425edd9e8ecce3" + "reference": "908a859aa7c4949ba9ad67091e67bac10b66d3d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/RobLoach/component-installer/zipball/0553c9bbf60fa1623594d125e8425edd9e8ecce3", - "reference": "0553c9bbf60fa1623594d125e8425edd9e8ecce3", + "url": "https://api.github.com/repos/RobLoach/component-installer/zipball/908a859aa7c4949ba9ad67091e67bac10b66d3d7", + "reference": "908a859aa7c4949ba9ad67091e67bac10b66d3d7", "shasum": "" }, "require": { @@ -271,7 +275,65 @@ } ], "description": "Allows installation of Components via Composer.", - "time": "2015-08-07 13:12:01" + "time": "2015-08-10 12:35:38" + }, + { + "name": "thomaspark/bootswatch", + "version": "v3.3.5+3", + "source": { + "type": "git", + "url": "https://github.com/thomaspark/bootswatch.git", + "reference": "913f54b9483b99fa12c7feccfa18ee5cc0206043" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thomaspark/bootswatch/zipball/913f54b9483b99fa12c7feccfa18ee5cc0206043", + "reference": "913f54b9483b99fa12c7feccfa18ee5cc0206043", + "shasum": "" + }, + "suggest": { + "robloach/component-installer": "Allows installation of Components via Composer" + }, + "type": "component", + "extra": { + "component": { + "name": "bootswatch", + "files": [ + "README.md", + "LICENSE", + "amelia/*", + "cerulean/*", + "cosmo/*", + "cyborg/*", + "darkly/*", + "flatly/*", + "fonts/*", + "journal/*", + "lumen/*", + "paper/*", + "readable/*", + "sandstone/*", + "simplex/*", + "slate/*", + "spacelab/*", + "superhero/*", + "united/*", + "yeti/*" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "thomaspark", + "email": "thomas@bootswatch.com" + } + ], + "description": "Themes for Bootstrap", + "time": "2015-09-03 20:39:50" }, { "name": "tsphethean/sculpin-related-posts-bundle", @@ -322,7 +384,9 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "thomaspark/bootswatch": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": [],