Merge remote-tracking branch 'origin/upgrade'

cloak-php · Jan 24, 2015 · 0868d0e · 0868d0e
2 parents e43660d + 673f325
commit 0868d0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/RoboFile.php b/RoboFile.php
@@ -1,8 +1,9 @@
 <?php
 
 use \Robo\Tasks;
-use \coverallskit\robo\CoverallsKitTasks;
-use \peridot\robo\PeridotTasks;
+use \coverallskit\robo\loadTasks as CoverallsKitTasks;
+use \peridot\robo\loadTasks as PeridotTasks;
+
 
 /**
  * Class RoboFile
@@ -25,7 +26,7 @@ public function specAll()
     public function coverallsUpload()
     {
         $result = $this->taskCoverallsKit()
-            ->configure('coveralls.toml')
+            ->configureBy('coveralls.toml')
             ->run();
 
         return $result;

diff --git a/composer.json b/composer.json
@@ -3,10 +3,10 @@
     "keywords": ["peridot", "peridot-plugin", "code coverage", "lcov report", "markdown report", "text report"],
     "require": {
         "cloak/cloak": "~1.4",
-        "peridot-php/peridot": "~1.9"
+        "peridot-php/peridot": "~1.11"
     },
     "require-dev": {
-        "codegyre/robo": "~0.4",
+        "codegyre/robo": "~0.5",
         "cloak/robo-coveralls-kit": "~1.0",
         "expectation/peridot-expectation": "~1.2",
         "robo-peridot/robo-peridot": "~1.0"