commit b6b3df994924f27113bbe468ed8de407e961cc97
parent 8f29e4ad6ef6e7db9b4b834bce158331ea22b33b
Author: Jack Mordaunt <jackmordaunt.dev@gmail.com>
Date: Fri, 8 Dec 2023 10:12:49 +0800
all: restructure into separate modules
This allows each command to be go installed separately.
Signed-off-by: Jack Mordaunt <jackmordaunt.dev@gmail.com>
Diffstat:
8 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/cmd/icnsify/go.mod b/cmd/icnsify/go.mod
@@ -0,0 +1,14 @@
+module github.com/jackmordaunt/icns/cmd/icnsify
+
+go 1.21.5
+
+require (
+ github.com/jackmordaunt/icns/v3 v3.0.0
+ github.com/spf13/afero v1.11.0
+ github.com/spf13/pflag v1.0.5
+)
+
+require (
+ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+ golang.org/x/text v0.14.0 // indirect
+)
diff --git a/cmd/icnsify/go.sum b/cmd/icnsify/go.sum
@@ -0,0 +1,10 @@
+github.com/jackmordaunt/icns/v3 v3.0.0 h1:zGmeCscotL8gG6KWUNE2JfcAkn7UjgHLvHrhtO9iIgA=
+github.com/jackmordaunt/icns/v3 v3.0.0/go.mod h1:5sHL59nqTd2ynTnowxB/MDQFhKNqkK8X687uKNygaSQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
+github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
diff --git a/cmd/icnsify/main.go b/cmd/icnsify/main.go
@@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"
- "github.com/jackmordaunt/icns/v2"
+ "github.com/jackmordaunt/icns/v3"
"github.com/spf13/afero"
"github.com/spf13/pflag"
diff --git a/cmd/preview/go.mod b/cmd/preview/go.mod
@@ -1,11 +1,11 @@
module github.com/jackmordaunt/icns/cmd/preview
-go 1.20
+go 1.21.5
require (
gioui.org v0.3.1
gioui.org/x v0.3.2
- github.com/jackmordaunt/icns/v2 v2.2.7
+ github.com/jackmordaunt/icns/v3 v3.0.0
github.com/ncruces/zenity v0.10.10
)
diff --git a/cmd/preview/go.sum b/cmd/preview/go.sum
@@ -1,4 +1,5 @@
eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
+eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
gioui.org v0.3.1 h1:hslYkrkIWvx28Mxe3A87opl+8s9mnWsnWmPDh11+zco=
gioui.org v0.3.1/go.mod h1:2atiYR4upH71/6ehnh6XsUELa7JZOrOHHNMDxGBZF0Q=
gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
@@ -17,8 +18,9 @@ github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f/go.mod h1:Dv9D0NUlAsa
github.com/go-text/typesetting v0.0.0-20231126133128-3b7c9205d99e h1:XYK2AGBUaDkE9yG8FMOWCm0v/fjmcbkccKm1t3IIK/M=
github.com/go-text/typesetting v0.0.0-20231126133128-3b7c9205d99e/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
-github.com/jackmordaunt/icns/v2 v2.2.7 h1:K/RbfvuzjmjVY5y4g+XENRs8ZZatwz4YnLHypa2KwQg=
-github.com/jackmordaunt/icns/v2 v2.2.7/go.mod h1:ovoTxGguSuoUGKMk5Nn3R7L7BgMQkylsO+bblBuI22A=
+github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
+github.com/jackmordaunt/icns/v3 v3.0.0 h1:zGmeCscotL8gG6KWUNE2JfcAkn7UjgHLvHrhtO9iIgA=
+github.com/jackmordaunt/icns/v3 v3.0.0/go.mod h1:5sHL59nqTd2ynTnowxB/MDQFhKNqkK8X687uKNygaSQ=
github.com/josephspurrier/goversioninfo v1.4.0 h1:Puhl12NSHUSALHSuzYwPYQkqa2E1+7SrtAPJorKK0C8=
github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
github.com/ncruces/zenity v0.10.10 h1:V/rtAhr5QLdDThahOkm7EYlnw4RuEsf7oN+Xb6lz1j0=
@@ -33,6 +35,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
golang.org/x/exp/shiny v0.0.0-20231127185646-65229373498e h1:OcpyLYky9rjmUp6ZYOow6ky00AmhIM2pL3vTv1lQErg=
diff --git a/cmd/preview/main.go b/cmd/preview/main.go
@@ -25,7 +25,7 @@ import (
"gioui.org/widget"
m "gioui.org/widget/material"
c "gioui.org/x/component"
- "github.com/jackmordaunt/icns/v2"
+ "github.com/jackmordaunt/icns/v3"
"github.com/ncruces/zenity"
)
diff --git a/go.mod b/go.mod
@@ -1,11 +1,5 @@
-module github.com/jackmordaunt/icns/v2
+module github.com/jackmordaunt/icns/v3
-go 1.20
+go 1.21.5
-require (
- github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
- github.com/spf13/afero v1.11.0
- github.com/spf13/pflag v1.0.5
-)
-
-require golang.org/x/text v0.14.0 // indirect
+require github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
diff --git a/go.sum b/go.sum
@@ -1,8 +1,2 @@
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
-github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
