Merge pull request #22 from essentialkaos/develop

Version 1.0.6
essentialkaos · Mar 22, 2022 · 6edded1 · 6edded1
2 parents b4d46b7 + 503e881
commit 6edded1
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 22 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,30 @@
+version: 2
+
+updates:
+ - package-ecosystem: "gomod"
+ directory: "/"
+ target-branch: "develop"
+ schedule:
+ interval: "daily"
+ timezone: "Europe/London"
+ time: "03:00"
+ labels:
+ - "PR • MAINTENANCE"
+ assignees:
+ - "andyone"
+ reviewers:
+ - "andyone"
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ target-branch: "develop"
+ schedule:
+ interval: "daily"
+ timezone: "Europe/London"
+ time: "04:00"
+ labels:
+ - "PR • MAINTENANCE"
+ assignees:
+ - "andyone"
+ reviewers:
+ - "andyone"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
  strategy:
  matrix:
- go: [ '1.16.x', '1.17.x' ]
+ go: [ '1.17.x', '1.18.x' ]
 
  steps:
  - name: Set up Go
@@ -32,7 +32,7 @@ jobs:
  echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  path: ${{env.SRC_DIR}}
 
@@ -56,7 +56,7 @@ jobs:
  run: goveralls -service github -coverprofile cover.out
 
  - name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v3
  with: 
  node-version: '14.x'
 
@@ -84,7 +84,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: '1.16.x'
+ go-version: '1.17.x'
  id: go
 
  - name: Setup PATH
@@ -94,7 +94,7 @@ jobs:
  echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  path: ${{env.SRC_DIR}}
 

diff --git a/.github/workflows/godoc.yml b/.github/workflows/godoc.yml
@@ -10,4 +10,4 @@ jobs:
 
  steps:
  - name: Trigger GoSumDB and PkgGoDev
- uses: essentialkaos/pkgre-godoc-action@v1
+ uses: essentialkaos/godoc-action@v1
diff --git a/Makefile b/Makefile
@@ -1,26 +1,36 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.3.2 using next command:
-# gomakegen .
+# This Makefile generated by GoMakeGen 1.5.1 using next command:
+# gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
+export GO111MODULE=on
+
 .DEFAULT_GOAL := help
-.PHONY = fmt vet git-config deps-test test help
+.PHONY = fmt vet deps deps-test test mod-init mod-update mod-vendor help
 
 ################################################################################
 
-git-config: ## Configure git redirects for stable import path services
- git config --global http.https://pkg.re.followRedirects true
+deps: mod-update ## Download dependencies
 
-deps-test: git-config ## Download dependencies for tests
- go get -d -v pkg.re/essentialkaos/check.v1
+deps-test: deps ## Download dependencies for tests
 
 test: ## Run tests
  go test -covermode=count .
 
+mod-init: ## Initialize new module
+ go mod init
+ go mod tidy
+
+mod-update: ## Download modules to local cache
+ go mod download
+
+mod-vendor: ## Make vendored copy of dependencies
+ go mod vendor
+
 fmt: ## Format source code with gofmt
  find . -name "*.go" -exec gofmt -s -w {} \;
 
@@ -32,6 +42,6 @@ help: ## Show this info
  @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
  | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}'
  @echo -e ''
- @echo -e '\033[90mGenerated by GoMakeGen 1.3.2\033[0m\n'
+ @echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center"><a href="#readme"><img src="https://gh.kaos.st/go-jar.svg"/></a></p>
 
 <p align="center">
- <a href="https://kaos.sh/g/go-jar.v1"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev" /></a>
+ <a href="https://kaos.sh/g/go-jar"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev" /></a>
  <a href="https://kaos.sh/r/go-jar"><img src="https://kaos.sh/r/go-jar.svg" alt="GoReportCard" /></a>
  <a href="https://kaos.sh/w/go-jar/ci"><img src="https://kaos.sh/w/go-jar/ci.svg" alt="GitHub Actions CI Status" /></a>
  <a href="https://kaos.sh/w/go-jar/codeql"><img src="https://kaos.sh/w/go-jar/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
@@ -18,16 +18,16 @@
 
 ### Installation
 
-Make sure you have a working Go 1.16+ workspace (_[instructions](https://golang.org/doc/install)_), then:
+Make sure you have a working Go 1.17+ workspace (_[instructions](https://golang.org/doc/install)_), then:
 
 ```
-go get -d pkg.re/essentialkaos/go-jar.v1
+go get -d github.com/essentialkaos/go-jar
 ```
 
 For update to the latest stable release, do:
 
 ```
-go get -d -u pkg.re/essentialkaos/go-jar.v1
+go get -d -u github.com/essentialkaos/go-jar
 ```
 
 ### Build Status

diff --git a/examples_test.go b/examples_test.go
@@ -2,7 +2,7 @@ package jar
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 // //
-// Copyright (c) 2021 ESSENTIAL KAOS //
+// Copyright (c) 2022 ESSENTIAL KAOS //
 // Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
 // //
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/go.mod b/go.mod
@@ -0,0 +1,11 @@
+module github.com/essentialkaos/go-jar
+
+go 1.17
+
+require github.com/essentialkaos/check v1.2.1
+
+require (
+ github.com/kr/pretty v0.3.0 // indirect
+ github.com/kr/text v0.2.0 // indirect
+ github.com/rogpeppe/go-internal v1.6.1 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,14 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs=
+github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
diff --git a/jar.go b/jar.go
@@ -2,7 +2,7 @@ package jar
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 // //
-// Copyright (c) 2021 ESSENTIAL KAOS //
+// Copyright (c) 2022 ESSENTIAL KAOS //
 // Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
 // //
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/jar_test.go b/jar_test.go
@@ -2,15 +2,15 @@ package jar
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 // //
-// Copyright (c) 2021 ESSENTIAL KAOS //
+// Copyright (c) 2022 ESSENTIAL KAOS //
 // Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
 // //
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
  "testing"
 
- . "pkg.re/essentialkaos/check.v1"
+ . "github.com/essentialkaos/check"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //