Merge branch 'release/3.0.1'

fpoirotte · Jul 15, 2017 · ebda081 · ebda081
2 parents 7e9a610 + bf823c2
commit ebda081
Show file tree

Hide file tree

Showing 29 changed files with 691 additions and 501 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+dist: trusty
 
 sudo: false
 
@@ -7,7 +8,6 @@ cache:
     - vendor/
 
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6

diff --git a/README.rst b/README.rst
@@ -55,9 +55,8 @@ Several types of installations are possible:
 
 *   Using a ``.phar`` archive:
 
-        ..  sourcecode:: console
-
-            $ wget --no-check-certificate https://packages.erebot.net/get/XRL-dev-master.phar
+    Download the PHAR archive for the latest release from
+    https://github.com/fpoirotte/XRL/releases/latest
 
 *   Using composer:
 

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     "require-dev": {
         "ext-dom": "*",
         "ext-SimpleXML": "*",
-        "erebot/buildenv": "*",
+        "erebot/buildenv": "^1.4.0",
         "erebot/plop": "*",
         "fpoirotte/natives4doxygen": "*",
         "pdepend/pdepend": "*",
@@ -52,7 +52,7 @@
     "bin": ["bin/xrl"],
     "extra": {
         "branch-alias": {
-            "dev-develop": "2.0.x-dev"
+            "dev-develop": "3.0.x-dev"
         }
     }
 }