Skip to content

Commit 14953db

Browse files
authored
Merge branch 'master' into fix/with
2 parents 4123f2c + 91f9864 commit 14953db

File tree

40 files changed

+78
-77
lines changed

40 files changed

+78
-77
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: "2"
22
run:
33
concurrency: 4
4-
go: "1.25"
54
modules-download-mode: readonly
65
issues-exit-code: 2
76
tests: false

.make_version.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
#!/usr/bin/env bash
22

3-
# Function to detect OS and set sed parameters
4-
setup_sed() {
3+
# Function to run sed in-place with OS-specific options
4+
sed_inplace() {
55
if [[ "$OSTYPE" == "darwin"* ]]; then
6-
# macOS
7-
SED_INPLACE="sed -i ''"
6+
# macOS - requires empty string after -i
7+
sed -i '' "$@"
88
else
99
# Linux/Windows Git Bash
10-
SED_INPLACE="sed -i"
10+
sed -i "$@"
1111
fi
1212
}
1313

14-
# Initialize sed command
15-
setup_sed
16-
1714
if [ $# -ne 2 ]; then
1815
echo "Parameter exception, please execute in the format of $0 [directory] [version number]"
1916
echo "PS:$0 ./ v2.4.0"
@@ -43,10 +40,11 @@ fi
4340

4441
if [[ true ]]; then
4542
# Use sed to replace the version number in version.go
46-
$SED_INPLACE 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
43+
sed_inplace 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
4744

4845
# Use sed to replace the version number in README.MD
49-
$SED_INPLACE 's/version=[^"]*/version='${newVersion}'/' README.MD
46+
sed_inplace 's/version=[^"]*/version='${newVersion}'/' README.MD
47+
sed_inplace 's/version=[^"]*/version='${newVersion}'/' README.zh_CN.MD
5048
fi
5149

5250
if [ -f "go.work" ]; then
@@ -70,6 +68,8 @@ for file in `find ${workdir} -name go.mod`; do
7068
fi
7169

7270
cd $goModPath
71+
72+
# Add replace directive for local development.
7373
if [ $goModPath = "./cmd/gf" ]; then
7474
mv go.work go.work.version.bak
7575
go mod edit -replace github.com/gogf/gf/v2=../../
@@ -81,20 +81,20 @@ for file in `find ${workdir} -name go.mod`; do
8181
go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v2=../../contrib/drivers/sqlite
8282
fi
8383
# Remove indirect dependencies
84-
sed -i '/\/\/ indirect/d' go.mod
84+
sed_inplace '/\/\/ indirect/d' go.mod
8585
go mod tidy
8686
# Remove toolchain line if exists
87-
$SED_INPLACE '/^toolchain/d' go.mod
87+
sed_inplace '/^toolchain/d' go.mod
8888

89-
# Upgrading only GoFrame related libraries, sometimes even if a version number is specified,
89+
# Upgrading only GoFrame related libraries, sometimes even if a version number is specified,
9090
# it may not be possible to successfully upgrade. Please confirm before submitting the code
9191
go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf"
92-
go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v
92+
go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v
9393
# Remove indirect dependencies
94-
sed -i '/\/\/ indirect/d' go.mod
94+
sed_inplace '/\/\/ indirect/d' go.mod
9595
go mod tidy
9696
# Remove toolchain line if exists
97-
$SED_INPLACE '/^toolchain/d' go.mod
97+
sed_inplace '/^toolchain/d' go.mod
9898
if [ $goModPath = "./cmd/gf" ]; then
9999
go mod edit -dropreplace github.com/gogf/gf/v2
100100
go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v2

README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ go get -u github.com/gogf/gf/v2
4545
💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖
4646

4747
<a href="https://github.com/gogf/gf/graphs/contributors">
48-
<img src="https://goframe.org/img/contributors.svg?version=v2.9.8" alt="goframe contributors"/>
48+
<img src="https://goframe.org/img/contributors.svg?version=v2.10.0" alt="goframe contributors"/>
4949
</a>
5050

5151
## License

README.zh_CN.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ go get -u github.com/gogf/gf/v2
4545
💖 [感谢所有使 GoFrame 成为可能的贡献者](https://github.com/gogf/gf/graphs/contributors) 💖
4646

4747
<a href="https://github.com/gogf/gf/graphs/contributors">
48-
<img src="https://goframe.org/img/contributors.svg?version=v2.9.5" alt="goframe contributors"/>
48+
<img src="https://goframe.org/img/contributors.svg?version=v2.10.0" alt="goframe contributors"/>
4949
</a>
5050

5151
## 许可证

cmd/gf/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2
33
go 1.23.0
44

55
require (
6-
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8
7-
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8
8-
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
9-
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8
10-
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8
11-
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8
12-
github.com/gogf/gf/v2 v2.9.8
6+
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0
7+
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0
8+
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
9+
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0
10+
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
11+
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0
12+
github.com/gogf/gf/v2 v2.10.0
1313
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
1414
github.com/olekukonko/tablewriter v1.1.0
1515
github.com/schollz/progressbar/v3 v3.15.0

cmd/gf/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
4646
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
4747
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
4848
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
49-
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8 h1:L72OB2HPuZSHtJ2ipBzI+62rGGDRdwYjequ1v+zctpg=
50-
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8/go.mod h1:D0UySg70Bd264F5AScYmz1Hl8vjzlUJ7YvqBJc5OFbo=
51-
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8 h1:DT5zHfo9/VkbJ+TF7kUasvv4dbU5uctoj+JGbrzgdYE=
52-
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8/go.mod h1:cDd91Zd8LxFF+xxOflRRqw0WTTCpAJ0nf0KKRA+nvTE=
53-
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8 h1:XZ4Ya/50xpjf81+4genr33iJXR2dxJmqYKxGyXlLRqA=
54-
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8/go.mod h1:wtm2NJb/L3CbDOmyUc7TsOpWHTCMakg1QRG7B/oKrRs=
55-
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8 h1:ZrqABJsUnhNDz8VAem1XXONBTywl6r+GHQH05i+4W1g=
56-
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8/go.mod h1:YTFyeVk2Rgu/JMUhFxkjYzWaBc+yZ6wAvY54XVZoNko=
57-
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8 h1:Dc227FD1uf9nNBPFEjMEgIoAJbAgeYeNrOrjviDgPzY=
58-
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8/go.mod h1:o3EpB4Ti3+x/axzRMJg2k7TrLiWZiSTxP0v64LBkk5k=
59-
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8 h1:LHEhzsBfIo8xHvOUuLDQW1q7Qix1vnBabH/iivCRghs=
60-
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8/go.mod h1:SX6dRONaJGafzCoMIrn8CkRM4fIvtmJRt/aYclUHy3Q=
61-
github.com/gogf/gf/v2 v2.9.8 h1:El0HwksTzeRk0DQV4Lh7S9DbsIwKInhHSHGcH7qJumM=
62-
github.com/gogf/gf/v2 v2.9.8/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
49+
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0 h1:9PTchr92xIJej4tq5c+HOHSU7LGOHr3YfD7tuf23LW4=
50+
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0/go.mod h1:eKtLMs9uccxFvmoKOUCRQ/Se3nxhzEZwF0Ir13qbk5g=
51+
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0 h1:mBs6XpNM34IdZPZv4Kv3LA8yhP2UisbONMLfnQVFvKM=
52+
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0/go.mod h1:mChbF9FrmiYMSE2rG3zdxI/oSTwaHsR5KbINAgt3KcY=
53+
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0 h1:UvqxwinkelKxwdwnKUfdy51/ls4RL7MCeJqAZOVAy0I=
54+
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0/go.mod h1:6v7oGBF9wv59WERJIOJxXmLhkUcxwON3tPYW3AZ7wbY=
55+
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0 h1:MvhoMaz8YYj4WJuYzKGDdzJYiieiYiqp0vjoOshfOF4=
56+
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0/go.mod h1:vb2fx33RGhjhOaocOTEFvlEuBSGHss5S0lZ4sS3XK6E=
57+
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0 h1:39+jbTenm7KBj4hO2C8ANAxVHpX/7OuRDs1VcGC9ylA=
58+
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0/go.mod h1:B0s0fVzn0W220E8UTpSGzrrGKsop5KcB90twBeLCiz0=
59+
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0 h1:OyAH7Ls2c9Un7CJiAq7G6eY1jWIICRkN8C5SyM94rnY=
60+
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0/go.mod h1:fwhAMG0qZpeHbbP2JE78rJRfV7eBbu9jXkxTMM1lwyo=
61+
github.com/gogf/gf/v2 v2.10.0 h1:rzDROlyqGMe/eM6dCalSR8dZOuMIdLhmxKSH1DGhbFs=
62+
github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
6363
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
6464
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
6565
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

cmd/gf/internal/cmd/testdata/build/varmap/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
toolchain go1.24.6
66

7-
require github.com/gogf/gf/v2 v2.9.8
7+
require github.com/gogf/gf/v2 v2.10.0
88

99
require (
1010
go.opentelemetry.io/otel v1.38.0 // indirect
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/4387
22

3-
go 1.20
3+
go 1.23.0
4+
5+
toolchain go1.24.12

cmd/gf/internal/cmd/testdata/issue/4387/go.sum

Whitespace-only changes.

contrib/config/apollo/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
github.com/apolloconfig/agollo/v4 v4.3.1
7-
github.com/gogf/gf/v2 v2.9.8
7+
github.com/gogf/gf/v2 v2.10.0
88
)
99

1010
require (

0 commit comments

Comments
 (0)