diff --git a/.mend b/.mend index 01ab1df..362e626 100644 --- a/.mend +++ b/.mend @@ -3,5 +3,18 @@ "remediateSettings": { "timezone": "UTC", "dependencyDashboardAutoclose": true - } + }, + "packageRules": [ + { + "groupName": "all non-major dependencies", + "groupSlug": "all-minor-patch", + "matchPackageNames": [ + "*" + ], + "matchUpdateTypes": [ + "minor", + "patch" + ] + } + ] } diff --git a/.travis.yml.off b/.travis.yml.off deleted file mode 100644 index bf8c4b7..0000000 --- a/.travis.yml.off +++ /dev/null @@ -1,62 +0,0 @@ -os: linux - -dist: bionic - -sudo: required - -branches: - only: - - main - - develop - -addons: - apt: - packages: - - lcov - - astyle - - devscripts - - python3 - - python3-pip - - python3-dev - - python-autopep8 - - doxygen - - fakeroot - - debhelper - - pkg-config - - alien - - rpm - - dh-make - - dh-golang - -install: - - gem install coveralls-lcov - -script: - - echo "$TRAVIS_BUILD_NUMBER" > RELEASE - -matrix: - include: - - language: c - script: - - make c - #after_success: - # - coveralls-lcov /home/travis/build/Vonage/numkey/c/target/test/coverage/numkey.info - - language: go - go: "1.16" - script: - - make cgo - - make go - - language: python - script: - - cd python && make clean build - - language: node_js - node_js: - - "12" - install: - - npm install --global uglify-js js-beautify - script: - - make javascript - - language: java - script: - - make java - diff --git a/VERSION b/VERSION index 7e84a78..9494224 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.15 +1.6.16 diff --git a/c/doc/Doxyfile b/c/doc/Doxyfile index 0cdfe0f..38847b6 100644 --- a/c/doc/Doxyfile +++ b/c/doc/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = "NumKey" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.6.15 +PROJECT_NUMBER = 1.6.16 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/c/src/numkey/binsearch.h b/c/src/numkey/binsearch.h index 4e40ff0..79141da 100644 --- a/c/src/numkey/binsearch.h +++ b/c/src/numkey/binsearch.h @@ -979,8 +979,6 @@ static inline void parse_info_feather(mmfile_t *mf) * * @param file Path to the file to map. * @param mf Structure containing the memory mapped file. - * - * @return Returns the memory-mapped file descriptors. */ static inline void mmap_binfile(const char *file, mmfile_t *mf) { @@ -1041,4 +1039,4 @@ static inline int munmap_binfile(mmfile_t mf) return close(mf.fd); } -#endif // NUMKEY_BINSEARCH_H \ No newline at end of file +#endif // NUMKEY_BINSEARCH_H diff --git a/cgo/Makefile b/cgo/Makefile index d44f1c0..77012cb 100644 --- a/cgo/Makefile +++ b/cgo/Makefile @@ -50,7 +50,7 @@ GOFMT=$(shell which gofmt) GOTEST=GOPATH=$(GOPATH) $(shell which gotest) GODOC=GOPATH=$(GOPATH) $(shell which godoc) GOLANGCILINT=$(BINUTIL)/golangci-lint -GOLANGCILINTVERSION=v1.60.3 +GOLANGCILINTVERSION=v1.61.0 # Directory containing the source code SRCDIR=./src diff --git a/go.mod b/go.mod index cab5eaa..0d76b55 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/Vonage/numkey go 1.23 -toolchain go1.23.0 +toolchain go1.23.1 require ( github.com/jstemmer/go-junit-report/v2 v2.1.0 diff --git a/go/Makefile b/go/Makefile index 40b1086..683cc8f 100644 --- a/go/Makefile +++ b/go/Makefile @@ -50,7 +50,7 @@ GOFMT=$(shell which gofmt) GOTEST=GOPATH=$(GOPATH) $(shell which gotest) GODOC=GOPATH=$(GOPATH) $(shell which godoc) GOLANGCILINT=$(BINUTIL)/golangci-lint -GOLANGCILINTVERSION=v1.60.3 +GOLANGCILINTVERSION=v1.61.0 # Directory containing the source code SRCDIR=./src @@ -150,7 +150,7 @@ mod: .PHONY: modupdate modupdate: # $(GO) get $(shell $(GO) list -f '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}' -m all) - $(GO) get -t -u -d ./... && go mod tidy -compat=$(shell grep -oP 'go \K[0-9]+\.[0-9]+' ../go.mod) + $(GO) get -t -u ./... && go mod tidy -compat=$(shell grep -oP 'go \K[0-9]+\.[0-9]+' ../go.mod) # Run all tests and static analysis tools .PHONY: qa diff --git a/java/gradle/wrapper/gradle-wrapper.jar b/java/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 Binary files a/java/gradle/wrapper/gradle-wrapper.jar and b/java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/python/setup.py b/python/setup.py index 560ee45..688b176 100644 --- a/python/setup.py +++ b/python/setup.py @@ -30,7 +30,7 @@ def run(self): setup( name="numkey", - version="1.6.15.1", + version="1.6.16.1", keywords=("numkey E.164 shortcode lvn did encoding"), description="NumKey Bindings for Python", long_description=read("../README.md"),