From 75436e1012606c5cd33c309f14a40a1b057d2662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= Date: Wed, 8 Apr 2015 02:14:59 +0200 Subject: [PATCH] Lock to Nette 2.2.* --- .travis.yml | 3 +-- composer.json | 57 ++++++++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1b61a0..3b24da2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: php env: - - NETTE=nette-2.3-dev - - NETTE=nette-2.3 + - NETTE=nette-2.2-dev - NETTE=nette-2.2 php: diff --git a/composer.json b/composer.json index e183ef7..41955c0 100644 --- a/composer.json +++ b/composer.json @@ -17,36 +17,36 @@ "issues": "https://github.com/kdyby/aop/issues" }, "require": { - "nette/di": "~2.2@dev", - "nette/php-generator": "~2.2@dev", + "nette/di": "2.2.*@dev", + "nette/php-generator": "2.2.*@dev", - "kdyby/annotations": "~2.0@dev", - "symfony/property-access": "~2.4" + "kdyby/annotations": "2.1.*@dev", + "symfony/property-access": "~2.6" }, "require-dev": { - "nette/application": "~2.3@dev", - "nette/bootstrap": "~2.3@dev", - "nette/caching": "~2.3@dev", - "nette/component-model": "~2.2@dev", - "nette/database": "~2.3@dev", - "nette/deprecated": "~2.2@dev", - "nette/di": "~2.3@dev", - "nette/finder": "~2.3@dev", - "nette/forms": "~2.3@dev", - "nette/http": "~2.3@dev", - "nette/mail": "~2.3@dev", - "nette/neon": "~2.3@dev", - "nette/php-generator": "~2.3@dev", - "nette/reflection": "~2.3@dev", - "nette/robot-loader": "~2.3@dev", - "nette/safe-stream": "~2.3@dev", - "nette/security": "~2.3@dev", - "nette/tokenizer": "~2.2@dev", - "nette/utils": "~2.3@dev", - "latte/latte": "~2.3@dev", - "tracy/tracy": "~2.3@dev", + "nette/application": "2.2.*@dev", + "nette/bootstrap": "2.2.*@dev", + "nette/caching": "2.2.*@dev", + "nette/component-model": "2.2.*@dev", + "nette/database": "2.2.*@dev", + "nette/deprecated": "2.2.*@dev", + "nette/di": "2.2.*@dev", + "nette/finder": "2.2.*@dev", + "nette/forms": "2.2.*@dev", + "nette/http": "2.2.*@dev", + "nette/mail": "2.2.*@dev", + "nette/neon": "2.2.*@dev", + "nette/php-generator": "2.2.*@dev", + "nette/reflection": "2.2.*@dev", + "nette/robot-loader": "2.2.*@dev", + "nette/safe-stream": "2.2.*@dev", + "nette/security": "2.2.*@dev", + "nette/tokenizer": "2.2.*@dev", + "nette/utils": "2.2.*@dev", + "latte/latte": "2.2.*@dev", + "tracy/tracy": "2.2.*@dev", - "kdyby/doctrine-cache": "~2.3@dev", + "kdyby/doctrine-cache": "2.3.*@dev", "nette/tester": "~1.3@rc", "doctrine/collections": "~1.2" @@ -59,5 +59,10 @@ "src/Kdyby/Aop/annotations.php", "src/Kdyby/Aop/exceptions.php" ] + }, + "extra": { + "branch-alias": { + "dev-nette-2.2": "0.1-dev" + } } }