From 350751c48c171b6a50334bfa70b0bcc808e40fa1 Mon Sep 17 00:00:00 2001 From: Chris Martin <101210272+ChrisScotMartin@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:02:44 -0500 Subject: [PATCH 1/6] renamed --- go.mod | 5 +++-- main.go | 2 +- .../ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod | 3 +++ .../ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go | 12 ++++++++++++ vendor/modules.txt | 4 ++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod create mode 100644 vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go create mode 100644 vendor/modules.txt diff --git a/go.mod b/go.mod index 547c84c..521d4ff 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ go 1.16 // go get github.com/ChrisScotMartin/ait-c/pkgmodc //Go get will always pull pkgmodc from a previous commit instead of the local more up-to-date version. Two solutions for that, I can either commit/push this as is and then do a go get now that the module is updated. Or I can fix it with a local replace like this: -require github.com/ChrisScotMartin/ait-c/pkgmodc v0.0.0-00010101000000-000000000000 // indirect -replace github.com/ChrisScotMartin/ait-c/pkgmodc => ./pkgmodc +replace github.com/ChrisScotMartin/ait-c/renamed-pkgmodc => ./renamed-pkgmodc + +require github.com/ChrisScotMartin/ait-c/renamed-pkgmodc v0.0.0-00010101000000-000000000000 diff --git a/main.go b/main.go index 069ce80..5f67c02 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/ChrisScotMartin/ait-c/pkgmodc" + "github.com/ChrisScotMartin/ait-c/renamed-pkgmodc" ) func main() { diff --git a/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod b/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod new file mode 100644 index 0000000..4003fa9 --- /dev/null +++ b/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod @@ -0,0 +1,3 @@ +module github.com/ChrisScotMartin/ait-c/pkgmodc + +go 1.16 diff --git a/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go b/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go new file mode 100644 index 0000000..ff234c7 --- /dev/null +++ b/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go @@ -0,0 +1,12 @@ +package pkgmodc + +import "fmt" + +func main() { + fmt.Println("Nothing to see here... move along.") +} + +func Hello() { + fmt.Println("From pkgmodc") + fmt.Println("Hello, I'm now a module (pkgmodc) at this version.") +} diff --git a/vendor/modules.txt b/vendor/modules.txt new file mode 100644 index 0000000..a6467c6 --- /dev/null +++ b/vendor/modules.txt @@ -0,0 +1,4 @@ +# github.com/ChrisScotMartin/ait-c/renamed-pkgmodc v0.0.0-00010101000000-000000000000 => ./renamed-pkgmodc +## explicit +github.com/ChrisScotMartin/ait-c/renamed-pkgmodc +# github.com/ChrisScotMartin/ait-c/renamed-pkgmodc => ./renamed-pkgmodc From 21150c732b30d3650febfa969ba20dda6fb4ff81 Mon Sep 17 00:00:00 2001 From: Chris Martin <101210272+ChrisScotMartin@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:04:05 -0500 Subject: [PATCH 2/6] changed module name not just dir --- pkgmodc/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgmodc/go.mod b/pkgmodc/go.mod index 4003fa9..5770e3b 100644 --- a/pkgmodc/go.mod +++ b/pkgmodc/go.mod @@ -1,3 +1,3 @@ -module github.com/ChrisScotMartin/ait-c/pkgmodc +module github.com/ChrisScotMartin/ait-c/renamed-pkgmodc go 1.16 From 58e2cda0203d281d88fc881ace7578b1b4ebb929 Mon Sep 17 00:00:00 2001 From: Chris Martin <101210272+ChrisScotMartin@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:07:28 -0500 Subject: [PATCH 3/6] bug fix --- {pkgmodc => renamed-pkgmodc}/go.mod | 0 {pkgmodc => renamed-pkgmodc}/pkgmodc.go | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {pkgmodc => renamed-pkgmodc}/go.mod (100%) rename {pkgmodc => renamed-pkgmodc}/pkgmodc.go (100%) diff --git a/pkgmodc/go.mod b/renamed-pkgmodc/go.mod similarity index 100% rename from pkgmodc/go.mod rename to renamed-pkgmodc/go.mod diff --git a/pkgmodc/pkgmodc.go b/renamed-pkgmodc/pkgmodc.go similarity index 100% rename from pkgmodc/pkgmodc.go rename to renamed-pkgmodc/pkgmodc.go From 8ff3f500f6d5e6e8d2504242b21ea70d5289e039 Mon Sep 17 00:00:00 2001 From: Chris Martin <101210272+ChrisScotMartin@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:08:08 -0500 Subject: [PATCH 4/6] go file name change --- renamed-pkgmodc/{pkgmodc.go => renamed-pkgmodc.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename renamed-pkgmodc/{pkgmodc.go => renamed-pkgmodc.go} (100%) diff --git a/renamed-pkgmodc/pkgmodc.go b/renamed-pkgmodc/renamed-pkgmodc.go similarity index 100% rename from renamed-pkgmodc/pkgmodc.go rename to renamed-pkgmodc/renamed-pkgmodc.go From ffe421b7e18dc5e1d97b084d785b395a883e8b0c Mon Sep 17 00:00:00 2001 From: Chris Martin <101210272+ChrisScotMartin@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:09:04 -0500 Subject: [PATCH 5/6] renamed package --- renamed-pkgmodc/renamed-pkgmodc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renamed-pkgmodc/renamed-pkgmodc.go b/renamed-pkgmodc/renamed-pkgmodc.go index ff234c7..96ae06e 100644 --- a/renamed-pkgmodc/renamed-pkgmodc.go +++ b/renamed-pkgmodc/renamed-pkgmodc.go @@ -1,4 +1,4 @@ -package pkgmodc +package renamed-pkgmodc import "fmt" From 97d39d1a0b71a59201c08aad68d04ec7eece0e5b Mon Sep 17 00:00:00 2001 From: Chris Martin <101210272+ChrisScotMartin@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:10:53 -0500 Subject: [PATCH 6/6] all changes --- go.mod | 4 ++-- main.go | 4 ++-- renamed-pkgmodc/go.mod | 3 --- renamedpkgmodc/go.mod | 3 +++ .../pkgmodc.go => renamedpkgmodc/renamed-pkgmodc.go | 2 +- .../github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod | 3 --- .../github.com/ChrisScotMartin/ait-c/renamedpkgmodc/go.mod | 3 +++ .../ait-c/renamedpkgmodc}/renamed-pkgmodc.go | 2 +- vendor/modules.txt | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 renamed-pkgmodc/go.mod create mode 100644 renamedpkgmodc/go.mod rename vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go => renamedpkgmodc/renamed-pkgmodc.go (89%) delete mode 100644 vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod create mode 100644 vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/go.mod rename {renamed-pkgmodc => vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc}/renamed-pkgmodc.go (89%) diff --git a/go.mod b/go.mod index 521d4ff..de14d3f 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,6 @@ go 1.16 //Go get will always pull pkgmodc from a previous commit instead of the local more up-to-date version. Two solutions for that, I can either commit/push this as is and then do a go get now that the module is updated. Or I can fix it with a local replace like this: -replace github.com/ChrisScotMartin/ait-c/renamed-pkgmodc => ./renamed-pkgmodc +replace github.com/ChrisScotMartin/ait-c/renamedpkgmodc => ./renamedpkgmodc -require github.com/ChrisScotMartin/ait-c/renamed-pkgmodc v0.0.0-00010101000000-000000000000 +require github.com/ChrisScotMartin/ait-c/renamedpkgmodc v0.0.0-00010101000000-000000000000 diff --git a/main.go b/main.go index 5f67c02..5d2d1a5 100644 --- a/main.go +++ b/main.go @@ -2,12 +2,12 @@ package main import ( "fmt" - "github.com/ChrisScotMartin/ait-c/renamed-pkgmodc" + "github.com/ChrisScotMartin/ait-c/renamedpkgmodc" ) func main() { fmt.Println("Hello World") - pkgmodc.Hello() + renamedpkgmodc.Hello() } func SomeServerFunc() { diff --git a/renamed-pkgmodc/go.mod b/renamed-pkgmodc/go.mod deleted file mode 100644 index 5770e3b..0000000 --- a/renamed-pkgmodc/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/ChrisScotMartin/ait-c/renamed-pkgmodc - -go 1.16 diff --git a/renamedpkgmodc/go.mod b/renamedpkgmodc/go.mod new file mode 100644 index 0000000..6d63916 --- /dev/null +++ b/renamedpkgmodc/go.mod @@ -0,0 +1,3 @@ +module github.com/ChrisScotMartin/ait-c/renamedpkgmodc + +go 1.16 diff --git a/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go b/renamedpkgmodc/renamed-pkgmodc.go similarity index 89% rename from vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go rename to renamedpkgmodc/renamed-pkgmodc.go index ff234c7..37bd544 100644 --- a/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/pkgmodc.go +++ b/renamedpkgmodc/renamed-pkgmodc.go @@ -1,4 +1,4 @@ -package pkgmodc +package renamedpkgmodc import "fmt" diff --git a/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod b/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod deleted file mode 100644 index 4003fa9..0000000 --- a/vendor/github.com/ChrisScotMartin/ait-c/renamed-pkgmodc/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/ChrisScotMartin/ait-c/pkgmodc - -go 1.16 diff --git a/vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/go.mod b/vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/go.mod new file mode 100644 index 0000000..6d63916 --- /dev/null +++ b/vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/go.mod @@ -0,0 +1,3 @@ +module github.com/ChrisScotMartin/ait-c/renamedpkgmodc + +go 1.16 diff --git a/renamed-pkgmodc/renamed-pkgmodc.go b/vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/renamed-pkgmodc.go similarity index 89% rename from renamed-pkgmodc/renamed-pkgmodc.go rename to vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/renamed-pkgmodc.go index 96ae06e..37bd544 100644 --- a/renamed-pkgmodc/renamed-pkgmodc.go +++ b/vendor/github.com/ChrisScotMartin/ait-c/renamedpkgmodc/renamed-pkgmodc.go @@ -1,4 +1,4 @@ -package renamed-pkgmodc +package renamedpkgmodc import "fmt" diff --git a/vendor/modules.txt b/vendor/modules.txt index a6467c6..182c2a9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/ChrisScotMartin/ait-c/renamed-pkgmodc v0.0.0-00010101000000-000000000000 => ./renamed-pkgmodc +# github.com/ChrisScotMartin/ait-c/renamedpkgmodc v0.0.0-00010101000000-000000000000 => ./renamedpkgmodc ## explicit -github.com/ChrisScotMartin/ait-c/renamed-pkgmodc -# github.com/ChrisScotMartin/ait-c/renamed-pkgmodc => ./renamed-pkgmodc +github.com/ChrisScotMartin/ait-c/renamedpkgmodc +# github.com/ChrisScotMartin/ait-c/renamedpkgmodc => ./renamedpkgmodc