From a37abf2c0505dca5863f4b52c500ebcb26ca7f94 Mon Sep 17 00:00:00 2001
From: thinkerou <thinkerou@gmail.com>
Date: Tue, 20 Nov 2018 18:55:50 +0800
Subject: [PATCH] remove go1.7 support

---
 .travis.yml                                   |  1 -
 README.md                                     |  2 +-
 debug.go                                      |  4 +--
 examples/graceful-shutdown/close/server.go    |  2 --
 .../graceful-shutdown/server.go               |  2 --
 response_writer.go                            | 13 +++++++++-
 response_writer_1.7.go                        | 12 ---------
 response_writer_1.8.go                        | 25 -------------------
 8 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 response_writer_1.7.go
 delete mode 100644 response_writer_1.8.go

diff --git a/.travis.yml b/.travis.yml
index 5f4e8037..4bfd170e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 sudo: false
 go:
-  - 1.7.x
   - 1.8.x
   - 1.9.x
   - 1.10.x
diff --git a/README.md b/README.md
index f4ee0fa8..bd710ad7 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ $ go run main.go
 
 ## Prerequisite
 
-Now Gin requires Go 1.7 or later and Go 1.8 will be required soon.
+Now Gin requires Go 1.8 or later and Go 1.9 will be required soon.
 
 ## Quick start
  
diff --git a/debug.go b/debug.go
index f0a23794..0fb60e53 100644
--- a/debug.go
+++ b/debug.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 )
 
-const ginSupportMinGoVer = 7
+const ginSupportMinGoVer = 8
 
 // IsDebugging returns true if the framework is running in debug mode.
 // Use SetMode(gin.ReleaseMode) to disable debug mode.
@@ -66,7 +66,7 @@ func getMinVer(v string) (uint64, error) {
 
 func debugPrintWARNINGDefault() {
 	if v, e := getMinVer(runtime.Version()); e == nil && v <= ginSupportMinGoVer {
-		debugPrint(`[WARNING] Now Gin requires Go 1.7 or later and Go 1.8 will be required soon.
+		debugPrint(`[WARNING] Now Gin requires Go 1.8 or later and Go 1.9 will be required soon.
 
 `)
 	}
diff --git a/examples/graceful-shutdown/close/server.go b/examples/graceful-shutdown/close/server.go
index 9c4e90fa..9fd5bed6 100644
--- a/examples/graceful-shutdown/close/server.go
+++ b/examples/graceful-shutdown/close/server.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package main
 
 import (
diff --git a/examples/graceful-shutdown/graceful-shutdown/server.go b/examples/graceful-shutdown/graceful-shutdown/server.go
index af4f2146..8a5b8faf 100644
--- a/examples/graceful-shutdown/graceful-shutdown/server.go
+++ b/examples/graceful-shutdown/graceful-shutdown/server.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package main
 
 import (
diff --git a/response_writer.go b/response_writer.go
index 923b53f8..26826689 100644
--- a/response_writer.go
+++ b/response_writer.go
@@ -16,7 +16,8 @@ const (
 	defaultStatus = http.StatusOK
 )
 
-type responseWriterBase interface {
+// ResponseWriter ...
+type ResponseWriter interface {
 	http.ResponseWriter
 	http.Hijacker
 	http.Flusher
@@ -37,6 +38,9 @@ type responseWriterBase interface {
 
 	// Forces to write the http header (status code + headers).
 	WriteHeaderNow()
+
+	// get the http.Pusher for server push
+	Pusher() http.Pusher
 }
 
 type responseWriter struct {
@@ -113,3 +117,10 @@ func (w *responseWriter) Flush() {
 	w.WriteHeaderNow()
 	w.ResponseWriter.(http.Flusher).Flush()
 }
+
+func (w *responseWriter) Pusher() (pusher http.Pusher) {
+	if pusher, ok := w.ResponseWriter.(http.Pusher); ok {
+		return pusher
+	}
+	return nil
+}
diff --git a/response_writer_1.7.go b/response_writer_1.7.go
deleted file mode 100644
index d8023497..00000000
--- a/response_writer_1.7.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2018 Gin Core Team.  All rights reserved.
-// Use of this source code is governed by a MIT style
-// license that can be found in the LICENSE file.
-
-// +build !go1.8
-
-package gin
-
-// ResponseWriter ...
-type ResponseWriter interface {
-	responseWriterBase
-}
diff --git a/response_writer_1.8.go b/response_writer_1.8.go
deleted file mode 100644
index 47e2f3c1..00000000
--- a/response_writer_1.8.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2018 Gin Core Team.  All rights reserved.
-// Use of this source code is governed by a MIT style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package gin
-
-import (
-	"net/http"
-)
-
-// ResponseWriter ...
-type ResponseWriter interface {
-	responseWriterBase
-	// get the http.Pusher for server push
-	Pusher() http.Pusher
-}
-
-func (w *responseWriter) Pusher() (pusher http.Pusher) {
-	if pusher, ok := w.ResponseWriter.(http.Pusher); ok {
-		return pusher
-	}
-	return nil
-}