Merge pull request #33 from seqsense/fix-gomod-version-dir

Support go modules version directory
seqsense · Mar 11, 2019 · a86ad56 · a86ad56
2 parents ee148b6 + 4d46f5e
commit a86ad56
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,12 +11,14 @@ env:
   global:
     - REVIEW_DOG_ON=1.11
     - REVIEW_DOG_VERSION=0.9.11
+    - VERSION_DIR=v2
 
 branches:
   only:
     - master
 
 install:
+  - cd ${TRAVIS_BUILD_DIR}/${VERSION_DIR}
   - |
     if [ ${TRAVIS_GO_VERSION} == ${REVIEW_DOG_ON} ]; then
       mkdir -p ${GOPATH}/bin
@@ -26,6 +28,7 @@ install:
     fi
   - go get -t ./...
 script:
+  - cd ${TRAVIS_BUILD_DIR}/${VERSION_DIR}
   - go build
   - |
     if [[ ! ${TRAVIS_GO_VERSION} =~ ^1\.(8|9)(\.[0-9]+){0,1}$ ]]
@@ -38,9 +41,11 @@ script:
   - go vet ./...
   - |
     if [ ${TRAVIS_GO_VERSION} == ${REVIEW_DOG_ON} ]; then
+      cd ${TRAVIS_BUILD_DIR}
       golint ./... | reviewdog -f=golint -reporter=github-pr-review
     fi
 after_success:
+  - cd ${TRAVIS_BUILD_DIR}/${VERSION_DIR}
   - |
     if [[ ${REPORT_COVERAGE} == 1 ]]
     then

diff --git a/awsiotprotocol/config.go → v2/awsiotprotocol/config.go b/awsiotprotocol/config.go → v2/awsiotprotocol/config.go
diff --git a/awsiotprotocol/loader.go → v2/awsiotprotocol/loader.go b/awsiotprotocol/loader.go → v2/awsiotprotocol/loader.go
diff --git a/awsiotprotocol/loader_test.go → v2/awsiotprotocol/loader_test.go b/awsiotprotocol/loader_test.go → v2/awsiotprotocol/loader_test.go
diff --git a/awsiotprotocol/mock.go → v2/awsiotprotocol/mock.go b/awsiotprotocol/mock.go → v2/awsiotprotocol/mock.go
diff --git a/awsiotprotocol/mqtts.go → v2/awsiotprotocol/mqtts.go b/awsiotprotocol/mqtts.go → v2/awsiotprotocol/mqtts.go
diff --git a/awsiotprotocol/mqtts_test.go → v2/awsiotprotocol/mqtts_test.go b/awsiotprotocol/mqtts_test.go → v2/awsiotprotocol/mqtts_test.go
diff --git a/awsiotprotocol/wss.go → v2/awsiotprotocol/wss.go b/awsiotprotocol/wss.go → v2/awsiotprotocol/wss.go
diff --git a/awsiotprotocol/wss_test.go → v2/awsiotprotocol/wss_test.go b/awsiotprotocol/wss_test.go → v2/awsiotprotocol/wss_test.go
diff --git a/connection.go → v2/connection.go b/connection.go → v2/connection.go
@@ -17,8 +17,8 @@ package awsiotdev
 import (
 	"time"
 
-	"github.com/seqsense/aws-iot-device-sdk-go/pubqueue"
-	"github.com/seqsense/aws-iot-device-sdk-go/subqueue"
+	"github.com/seqsense/aws-iot-device-sdk-go/v2/pubqueue"
+	"github.com/seqsense/aws-iot-device-sdk-go/v2/subqueue"
 )
 
 type pubSubQueues struct {

diff --git a/connection_test.go → v2/connection_test.go b/connection_test.go → v2/connection_test.go
diff --git a/debug.go → v2/debug.go b/debug.go → v2/debug.go
diff --git a/debug_test.go → v2/debug_test.go b/debug_test.go → v2/debug_test.go
diff --git a/device.go → v2/device.go b/device.go → v2/device.go
@@ -22,9 +22,9 @@ import (
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 
-	"github.com/seqsense/aws-iot-device-sdk-go/awsiotprotocol"
-	"github.com/seqsense/aws-iot-device-sdk-go/pubqueue"
-	"github.com/seqsense/aws-iot-device-sdk-go/subqueue"
+	"github.com/seqsense/aws-iot-device-sdk-go/v2/awsiotprotocol"
+	"github.com/seqsense/aws-iot-device-sdk-go/v2/pubqueue"
+	"github.com/seqsense/aws-iot-device-sdk-go/v2/subqueue"
 )
 
 const (

diff --git a/device_test.go → v2/device_test.go b/device_test.go → v2/device_test.go
diff --git a/go.mod → v2/go.mod b/go.mod → v2/go.mod
@@ -1,4 +1,4 @@
-module github.com/seqsense/aws-iot-device-sdk-go
+module github.com/seqsense/aws-iot-device-sdk-go/v2
 
 require (
 	github.com/aws/aws-sdk-go v1.15.68

diff --git a/go.sum → v2/go.sum b/go.sum → v2/go.sum
diff --git a/options.go → v2/options.go b/options.go → v2/options.go
diff --git a/presigner/presign.go → v2/presigner/presign.go b/presigner/presign.go → v2/presigner/presign.go
diff --git a/presigner/presign_test.go → v2/presigner/presign_test.go b/presigner/presign_test.go → v2/presigner/presign_test.go
diff --git a/pubqueue/drop_behavior.go → v2/pubqueue/drop_behavior.go b/pubqueue/drop_behavior.go → v2/pubqueue/drop_behavior.go
diff --git a/pubqueue/pubqueue.go → v2/pubqueue/pubqueue.go b/pubqueue/pubqueue.go → v2/pubqueue/pubqueue.go
diff --git a/pubqueue/pubqueue_test.go → v2/pubqueue/pubqueue_test.go b/pubqueue/pubqueue_test.go → v2/pubqueue/pubqueue_test.go
diff --git a/sample/main.go → v2/sample/main.go b/sample/main.go → v2/sample/main.go
@@ -24,7 +24,7 @@ import (
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 
-	awsiot "github.com/seqsense/aws-iot-device-sdk-go"
+	awsiot "github.com/seqsense/aws-iot-device-sdk-go/v2"
 )
 
 var message mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {

diff --git a/sample/samplecerts/cafile.pem → v2/sample/samplecerts/cafile.pem b/sample/samplecerts/cafile.pem → v2/sample/samplecerts/cafile.pem
diff --git a/sample/samplecerts/client-crt.pem → v2/sample/samplecerts/client-crt.pem b/sample/samplecerts/client-crt.pem → v2/sample/samplecerts/client-crt.pem
diff --git a/sample/samplecerts/client-key.pem → v2/sample/samplecerts/client-key.pem b/sample/samplecerts/client-key.pem → v2/sample/samplecerts/client-key.pem
diff --git a/state.go → v2/state.go b/state.go → v2/state.go
diff --git a/subqueue/subqueue.go → v2/subqueue/subqueue.go b/subqueue/subqueue.go → v2/subqueue/subqueue.go
diff --git a/subqueue/subqueue_test.go → v2/subqueue/subqueue_test.go b/subqueue/subqueue_test.go → v2/subqueue/subqueue_test.go