From df92c838088e538b5a01ef1e4c6d2766925adcc1 Mon Sep 17 00:00:00 2001
From: Ulrich VACHON <ulrich.vachon@docker.com>
Date: Thu, 18 Apr 2019 01:13:59 +0200
Subject: [PATCH] Update Go version to 1.12.x, update XCode version to 10.1,
 update MacOS minimum supported version to 10.11.

Signed-off-by: Ulrich VACHON <ulrich.vachon@docker.com>
---
 .travis.yml                       | 9 ++-------
 Makefile                          | 2 +-
 credentials/version.go            | 2 +-
 osxkeychain/osxkeychain_darwin.go | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b682ee..d1703b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,19 +3,14 @@
   sudo: required
   language: go
   dist: trusty
-  osx_image: xcode9
+  osx_image: xcode10.1
   os:
     - linux
     - osx
   notifications:
     email: false
   go:
-    - 1.8.1
-  before_install:
-    # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307
-    # might not be necessary in the future
-    - command curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-    - rvm get stable
+    - 1.12.x
   addons:
     apt:
       packages:
diff --git a/Makefile b/Makefile
index 22bd8b0..db58f8a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ VERSION := $(shell grep 'const Version' credentials/version.go | awk -F'"' '{ pr
 all: test
 
 deps:
-	go get -u github.com/golang/lint/golint
+	go get -u golang.org/x/lint/golint
 
 clean:
 	rm -rf bin
diff --git a/credentials/version.go b/credentials/version.go
index 033a5fe..e12d2dd 100644
--- a/credentials/version.go
+++ b/credentials/version.go
@@ -1,4 +1,4 @@
 package credentials
 
 // Version holds a string describing the current version
-const Version = "0.6.0"
+const Version = "0.6.1"
diff --git a/osxkeychain/osxkeychain_darwin.go b/osxkeychain/osxkeychain_darwin.go
index 4391267..d75adda 100644
--- a/osxkeychain/osxkeychain_darwin.go
+++ b/osxkeychain/osxkeychain_darwin.go
@@ -1,8 +1,8 @@
 package osxkeychain
 
 /*
-#cgo CFLAGS: -x objective-c -mmacosx-version-min=10.10
-#cgo LDFLAGS: -framework Security -framework Foundation -mmacosx-version-min=10.10
+#cgo CFLAGS: -x objective-c -mmacosx-version-min=10.11
+#cgo LDFLAGS: -framework Security -framework Foundation -mmacosx-version-min=10.11
 
 #include "osxkeychain_darwin.h"
 #include <stdlib.h>