From 25f513f719b003b504768d766d97a10b39d76acb Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Sat, 28 Sep 2024 21:54:06 +0200 Subject: [PATCH] fix: update repos to .git --- copyable.go | 2 +- go.mod | 6 +++--- go.sum | 16 ++++++---------- http-handler.go | 2 +- import.go | 2 +- nix/config/release.nix | 6 +++--- settings.go | 2 +- watch.go | 2 +- 8 files changed, 17 insertions(+), 21 deletions(-) diff --git a/copyable.go b/copyable.go index 4e30abb..8c256c3 100644 --- a/copyable.go +++ b/copyable.go @@ -4,7 +4,7 @@ package configuration import ( - "gitlab.schukai.com/oss/libraries/go/utilities/pathfinder" + "gitlab.schukai.com/oss/libraries/go/utilities/pathfinder.git" ) // Copy implements the xflags.Copyable interface. diff --git a/go.mod b/go.mod index b765073..769044e 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/r3labs/diff/v3 v3.0.1 github.com/stretchr/testify v1.9.0 github.com/vmihailenco/msgpack/v5 v5.4.1 - gitlab.schukai.com/oss/libraries/go/network/http-negotiation v1.3.3 - gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.4 - gitlab.schukai.com/oss/libraries/go/utilities/watch v0.4.1 + gitlab.schukai.com/oss/libraries/go/network/http-negotiation.git v1.3.4 + gitlab.schukai.com/oss/libraries/go/utilities/pathfinder.git v0.9.5 + gitlab.schukai.com/oss/libraries/go/utilities/watch.git v0.4.2 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 481b96e..6a220c1 100644 --- a/go.sum +++ b/go.sum @@ -26,16 +26,12 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -gitlab.schukai.com/oss/libraries/go/network/http-negotiation v1.3.3 h1:xzCwoOOogDpiR4ceOWERkeBlPNXlrylAEcvuPJVGSWY= -gitlab.schukai.com/oss/libraries/go/network/http-negotiation v1.3.3/go.mod h1:d2Ayu+QC2T6fao8q9V0axnDPdjfe0CDw+xG4UQd1fxM= -gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.3 h1:krLwGJFEGYUDZOZJbwZAG/1JgwYCJXLAKazymSUg8Vc= -gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.3/go.mod h1:36psT3WHelpcXWXVp8D33IXvUIpaAXEtrQYYOODUbjE= -gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.4 h1:/+fgcPeXqz5tRrT+EZXA2vGV+OWV9R+5hEBpRJUpp80= -gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.4/go.mod h1:36psT3WHelpcXWXVp8D33IXvUIpaAXEtrQYYOODUbjE= -gitlab.schukai.com/oss/libraries/go/utilities/watch v0.4.0 h1:5jwbpUbE721pinIAgzQCfBEnjMjqd/rDQl6gNplpz1M= -gitlab.schukai.com/oss/libraries/go/utilities/watch v0.4.0/go.mod h1:1pP8q6sEYUXs8rRSXOBCshjGqg6JtVTx8NPkTBNZHwk= -gitlab.schukai.com/oss/libraries/go/utilities/watch v0.4.1 h1:0ThDWEgqZrpkpur5mKn6IBWjCAnG7GOm19g8hVkMm5k= -gitlab.schukai.com/oss/libraries/go/utilities/watch v0.4.1/go.mod h1:bZ8NRgKJO3Owb6DI7kcb10N7nmTMJbZyeMnqO5alO6I= +gitlab.schukai.com/oss/libraries/go/network/http-negotiation.git v1.3.4 h1:bstrTJ7MUNKQdGikMMiMWwtGefgNz9dJlbu1OlsJBaE= +gitlab.schukai.com/oss/libraries/go/network/http-negotiation.git v1.3.4/go.mod h1:ahPF6lUPdMUJuVB7eNzwwXSRkTHPMWKrp8A8GTSsFw8= +gitlab.schukai.com/oss/libraries/go/utilities/pathfinder.git v0.9.5 h1:PiDmw3O3UDubKILC+t7fKs+m9670a+b8SkrHq5Rkk9M= +gitlab.schukai.com/oss/libraries/go/utilities/pathfinder.git v0.9.5/go.mod h1:HwXjaFUAxLv+qTN63xrPBO5DEVGuZNF859t29bhTsFQ= +gitlab.schukai.com/oss/libraries/go/utilities/watch.git v0.4.2 h1:PoX7Cxmclttb5lIrrHZ5QvIjN5MAaaWvReFU972RgpM= +gitlab.schukai.com/oss/libraries/go/utilities/watch.git v0.4.2/go.mod h1:7Rv8r5eVw5FDRp/K3KlDmjNMrdj7JA7eC3o6s7JBcHU= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= diff --git a/http-handler.go b/http-handler.go index 6c6c097..75dba80 100644 --- a/http-handler.go +++ b/http-handler.go @@ -6,7 +6,7 @@ package configuration import ( "bytes" "context" - negotiation "gitlab.schukai.com/oss/libraries/go/network/http-negotiation" + negotiation "gitlab.schukai.com/oss/libraries/go/network/http-negotiation.git" "net/http" ) diff --git a/import.go b/import.go index 4ac4e4e..9488779 100644 --- a/import.go +++ b/import.go @@ -10,7 +10,7 @@ import ( "github.com/imdario/mergo" "github.com/magiconair/properties" toml "github.com/pelletier/go-toml/v2" - "gitlab.schukai.com/oss/libraries/go/utilities/pathfinder" + "gitlab.schukai.com/oss/libraries/go/utilities/pathfinder.git" yaml "gopkg.in/yaml.v3" "io" "os" diff --git a/nix/config/release.nix b/nix/config/release.nix index 1af4594..0285fa8 100644 --- a/nix/config/release.nix +++ b/nix/config/release.nix @@ -2,8 +2,8 @@ # this file is generated by nix/scripts/init-project.nix # please don't edit it manually - version = "v1.22.6"; - commit = "5b9fb4baff26cafcd1babd0bc86dbcf5d436e3c3"; + version = "1.22.6"; + commit = "cb1f0038b696c9862ca83acc013aa394a7970657"; projectURL = "https://gitlab.schukai.com/oss/configuration"; name = "configuration"; mnemonic = "configuration"; @@ -12,4 +12,4 @@ # this file is generated by nix/scripts/init-project.nix # please don't edit it manually -} \ No newline at end of file +} diff --git a/settings.go b/settings.go index 55288ec..2c2f2b5 100644 --- a/settings.go +++ b/settings.go @@ -4,7 +4,7 @@ package configuration import ( - "gitlab.schukai.com/oss/libraries/go/utilities/watch" + "gitlab.schukai.com/oss/libraries/go/utilities/watch.git" "reflect" "strconv" "sync" diff --git a/watch.go b/watch.go index 2dd96a2..7085c4d 100644 --- a/watch.go +++ b/watch.go @@ -4,7 +4,7 @@ package configuration import ( - "gitlab.schukai.com/oss/libraries/go/utilities/watch" + "gitlab.schukai.com/oss/libraries/go/utilities/watch.git" "path" ) -- GitLab