From f0fbbd565067335ff0dafa2629a1765ebe7ca678 Mon Sep 17 00:00:00 2001
From: UndefinedOffset <echipman@webbuildersgroup.com>
Date: Tue, 4 Jul 2017 10:34:17 -0300
Subject: [PATCH] Adjusted silverstripe/framework dependency

Removed silverstripe/admin dependency

Aliased 2.0 branch as 2.0.x-dev

Set travis to 4.0 instead of just 4
---
 .travis.yml   | 4 ++--
 composer.json | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index afe19fb..6b529b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,12 @@ php:
   - 7.1
 
 env:
-  - DB=MYSQL CORE_RELEASE=4
+  - DB=MYSQL CORE_RELEASE=4.0
 
 matrix:
   include:
     - php: 7.1
-      env: DB=PGSQL CORE_RELEASE=4
+      env: DB=PGSQL CORE_RELEASE=4.0
 
 before_script:
   - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
diff --git a/composer.json b/composer.json
index 46e51f2..f60bc50 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,7 @@
 		}
 	],
 	"require": {
-		"silverstripe/admin": "^1.0@dev",
-		"silverstripe/framework": "^4.0@dev",
+		"silverstripe/framework": "~4.0",
 		"silverstripe/versioned": "^1.0"
 	},
 	"autoload": {
@@ -28,7 +27,7 @@
 	"extra": {
 		"installer-name": "sortablegridfield",
 		"branch-alias": {
-			"dev-master": "1.0.x-dev"
+			"dev-master": "2.0.x-dev"
 		}
 	}
 }