From 23db75caa6e239cdc1b9724e210842fb6b0c26f4 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Sat, 10 Sep 2016 15:32:01 +1200
Subject: [PATCH] API: Update module to require ss4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As part of this we’re also requiring lumberjack 2 and tagfield 2, which
are the ss4-compatible versions.
---
 .travis.yml   | 15 +--------------
 composer.json |  8 ++++----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 41abb51..83229f0 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
 
 env:
   global:
-    - DB=MYSQL CORE_RELEASE=3.1
+    - DB=MYSQL CORE_RELEASE=4
 
     # Turn coverage off by default, as it's expensive time wise
     - COVERAGE=0
@@ -21,8 +21,6 @@ env:
     - MODULE_PATH=blog
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
   include:
     - php: 5.6
       env: DB=MYSQL COVERAGE=1
@@ -30,17 +28,6 @@ matrix:
       env: DB=MYSQL
     - php: 5.6
       env: DB=PGSQL
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.2
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.2
-    - php: 5.4
-      env: DB=SQLITE
-    - php: 5.3
-      env: DB=MYSQL
-    - php: hhvm
-      env: DB=MYSQL
-
 
 before_script:
   - phpenv rehash
diff --git a/composer.json b/composer.json
index 7cd27a7..21f9765 100755
--- a/composer.json
+++ b/composer.json
@@ -8,16 +8,16 @@
 	],
 	"type": "silverstripe-module",
 	"require": {
-		"silverstripe/cms": "^3.1.0",
-		"silverstripe/lumberjack": "~1.1",
-		"silverstripe/tagfield": "^1.0"
+		"silverstripe/cms": "^4",
+		"silverstripe/lumberjack": "^2",
+		"silverstripe/tagfield": "^2"
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.4.x-dev"
+			"dev-master": "3.x-dev"
 		}
 	},
 	"license": "BSD-2-Clause",