summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json21
1 files changed, 13 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index f095583..05da13d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,16 +14,16 @@
}
],
"require": {
- "php": ">=5.3.1",
- "nette/component-model": "~2.2.0",
+ "php": ">=5.6.0",
+ "nette/component-model": "~2.3",
"nette/http": "~2.2",
- "nette/utils": "~2.3.10"
+ "nette/utils": "~2.4"
},
"require-dev": {
- "nette/di": "~2.3",
- "nette/tester": "~1.3",
- "latte/latte": "~2.3.2",
- "tracy/tracy": "~2.2"
+ "nette/di": "~2.4",
+ "nette/tester": "~2.0",
+ "latte/latte": "~2.4",
+ "tracy/tracy": "^2.4"
},
"conflict": {
"nette/nette": "<2.2"
@@ -31,5 +31,10 @@
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}