diff --git a/Makefile b/Makefile index aac230ef09..248f524ca4 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ tidy: lint: golangci-lint run -# make version to=v2.4.0 -to=v1.0.5 +# make version to=v1.18.3 +to=v1.18.3 .PHONY: version version: @set -e; \ diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod index 8b95989ca2..3583f39e32 100644 --- a/cmd/gf/go.mod +++ b/cmd/gf/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/cmd/gf go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/joy12825/gf/contrib/drivers/clickhouse v1.0.5 github.com/joy12825/gf/contrib/drivers/mssql v1.0.5 github.com/joy12825/gf/contrib/drivers/mysql v1.0.5 diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod index 334bcd6f68..60f8feb1c6 100644 --- a/contrib/config/apollo/go.mod +++ b/contrib/config/apollo/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/apolloconfig/agollo/v4 v4.1.1 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 ) require ( diff --git a/contrib/config/kubecm/go.mod b/contrib/config/kubecm/go.mod index d495a6a5a8..7f30bf8b61 100644 --- a/contrib/config/kubecm/go.mod +++ b/contrib/config/kubecm/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/config/kubecm go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 k8s.io/client-go v0.25.2 diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod index 24663fa487..c170ab24a3 100644 --- a/contrib/config/nacos/go.mod +++ b/contrib/config/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/config/nacos go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/nacos-group/nacos-sdk-go v1.1.2 ) diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod index 5ca2f17e98..4087375740 100644 --- a/contrib/config/polaris/go.mod +++ b/contrib/config/polaris/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/config/polaris go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/polarismesh/polaris-go v1.4.3 ) diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod index 224f9ba184..255b734ac5 100644 --- a/contrib/drivers/clickhouse/go.mod +++ b/contrib/drivers/clickhouse/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/ClickHouse/clickhouse-go/v2 v2.10.0 github.com/google/uuid v1.3.0 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/shopspring/decimal v1.3.1 ) diff --git a/contrib/drivers/dm/go.mod b/contrib/drivers/dm/go.mod index 4cb827f740..ab92ee3bf4 100644 --- a/contrib/drivers/dm/go.mod +++ b/contrib/drivers/dm/go.mod @@ -6,7 +6,7 @@ replace github.com/joy12825/gf => ../../../ require ( gitee.com/chunanyong/dm v1.8.10 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 ) require ( diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod index e435d7ea19..5bbba6ef57 100644 --- a/contrib/drivers/mssql/go.mod +++ b/contrib/drivers/mssql/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/denisenkom/go-mssqldb v0.11.0 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 ) require ( diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod index 838bfe965d..d78df797a8 100644 --- a/contrib/drivers/mysql/go.mod +++ b/contrib/drivers/mysql/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/go-sql-driver/mysql v1.6.0 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 ) require ( diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod index f6928b0b4f..25113c45f6 100644 --- a/contrib/drivers/oracle/go.mod +++ b/contrib/drivers/oracle/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/drivers/oracle go 1.17 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/sijms/go-ora/v2 v2.4.20 ) diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod index 3839b9a592..283547dd06 100644 --- a/contrib/drivers/pgsql/go.mod +++ b/contrib/drivers/pgsql/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/drivers/pgsql go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/lib/pq v1.10.4 ) diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod index 08191578c6..2b6a60ba8e 100644 --- a/contrib/drivers/sqlite/go.mod +++ b/contrib/drivers/sqlite/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/glebarez/go-sqlite v1.17.3 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 ) require ( diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod index a13addde99..96b3255a07 100644 --- a/contrib/registry/etcd/go.mod +++ b/contrib/registry/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/registry/etcd/v2 go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 go.etcd.io/etcd/client/v3 v3.5.4 ) diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod index 189132347c..d174dd65e2 100644 --- a/contrib/registry/file/go.mod +++ b/contrib/registry/file/go.mod @@ -2,7 +2,7 @@ module github.com/joy12825/gf/contrib/registry/file/v2 go 1.18 -require github.com/joy12825/gf v1.0.5 +require github.com/joy12825/gf v1.18.3 require ( github.com/BurntSushi/toml v1.1.0 // indirect diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod index 148a5b1a8c..2b73945db9 100644 --- a/contrib/registry/polaris/go.mod +++ b/contrib/registry/polaris/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/registry/polaris go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 github.com/polarismesh/polaris-go v1.4.3 ) diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod index ec9a2301f0..d3ebc53a35 100644 --- a/contrib/registry/zookeeper/go.mod +++ b/contrib/registry/zookeeper/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/go-zookeeper/zk v1.0.3 - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 golang.org/x/sync v0.1.0 ) diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod index 9eae0b9ee7..00c9e8ef21 100644 --- a/contrib/rpc/grpcx/go.mod +++ b/contrib/rpc/grpcx/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/rpc/grpcx go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 google.golang.org/grpc v1.49.0 diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod index 73fca42324..e80f07df93 100644 --- a/contrib/sdk/httpclient/go.mod +++ b/contrib/sdk/httpclient/go.mod @@ -2,7 +2,7 @@ module github.com/joy12825/gf/contrib/sdk/httpclient go 1.18 -require github.com/joy12825/gf v1.0.5 +require github.com/joy12825/gf v1.18.3 require ( github.com/BurntSushi/toml v1.1.0 // indirect diff --git a/contrib/trace/jaeger/go.mod b/contrib/trace/jaeger/go.mod index 5bba229210..144323231a 100644 --- a/contrib/trace/jaeger/go.mod +++ b/contrib/trace/jaeger/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/trace/jaeger go 1.18 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/exporters/jaeger v1.7.0 go.opentelemetry.io/otel/sdk v1.16.0 diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod index 18d6fdd7e0..9314e15b02 100644 --- a/contrib/trace/otlpgrpc/go.mod +++ b/contrib/trace/otlpgrpc/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/trace/otlpgrpc go 1.20 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod index d450288841..96d869312e 100644 --- a/contrib/trace/otlphttp/go.mod +++ b/contrib/trace/otlphttp/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/contrib/trace/otlphttp go 1.20 require ( - github.com/joy12825/gf v1.0.5 + github.com/joy12825/gf v1.18.3 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 diff --git a/example/go.mod b/example/go.mod index 3e0644160b..1214f5ec38 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,7 +3,7 @@ module github.com/joy12825/gf/example go 1.18 require ( - github.com/joy12825/gf v1.0.6 + github.com/joy12825/gf v1.18.3 github.com/joy12825/gf/contrib/drivers/mysql v1.0.2 github.com/joy12825/gf/contrib/nosql/redis v1.0.6 github.com/joy12825/gf/contrib/registry/polaris v0.0.0-00010101000000-000000000000 diff --git a/version.go b/version.go index e3edddfad5..e9c69f4147 100644 --- a/version.go +++ b/version.go @@ -2,5 +2,5 @@ package gf const ( // VERSION is the current GoFrame version. - VERSION = "v1.0.5.2" + VERSION = "v1.18.3" )