summaryrefslogtreecommitdiffstats
path: root/composer-dev.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer-dev.json')
-rw-r--r--composer-dev.json19
1 files changed, 12 insertions, 7 deletions
diff --git a/composer-dev.json b/composer-dev.json
index 1018199..fe13341 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -14,9 +14,9 @@
}
],
"require": {
- "php": ">=5.3.1",
- "nette/di": "~2.3.0",
- "nette/utils": "~2.2"
+ "php": ">=5.6.0",
+ "nette/di": "~2.4.0",
+ "nette/utils": "~2.4"
},
"suggest": {
"nette/robot-loader": "to use Configurator::createRobotLoader()",
@@ -27,14 +27,14 @@
"nette/caching": "~2.3",
"nette/database": "~2.3",
"nette/forms": "~2.3",
- "nette/http": "~2.3",
+ "nette/http": "~2.4.0",
"nette/mail": "~2.3",
"nette/robot-loader": "~2.2",
"nette/safe-stream": "~2.2",
"nette/security": "~2.3",
- "nette/tester": "~1.3",
+ "nette/tester": "~2.0",
"latte/latte": "~2.2",
- "tracy/tracy": "~2.3"
+ "tracy/tracy": "^2.4.1"
},
"conflict": {
"nette/nette": "<2.2"
@@ -42,5 +42,10 @@
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}