Skip to content

Commit 8c8c7c8

Browse files
authored
feat: new version v2.10.0 (#4657)
This pull request upgrades the GoFrame framework and all related dependencies from version `v2.9.8` (and similar) to `v2.10.0` across the codebase. It also refactors the `.make_version.sh` script to improve cross-platform compatibility when editing files, and ensures documentation reflects the new version. These changes help keep the project up-to-date and simplify version management. **Dependency upgrades:** * Updated all `go.mod` files in the main repo and contrib modules to require `github.com/gogf/gf/v2 v2.10.0` (replacing `v2.9.8` and similar) for consistency and latest features/bugfixes. [[1]](diffhunk://#diff-ee0abb9c50b9f91f424349123e31b7b1ba1e1e4f7497250422696c5bda2e74ceL6-R12) [[2]](diffhunk://#diff-cef597d401b6dad225f9e2e431bdde7e53cb60bdf287624cef38a6a7bb9ae7a3L7-R7) [[3]](diffhunk://#diff-970f7eacff9cd97a0d8a00d59ea8041eedaa21c7544c6669aaa58ca692c6b274L6-R6) [[4]](diffhunk://#diff-c23d0ca80cd6588b7df84de8ef84713f0ce0555ba05d2d9e7f5d1e0324b1ed3aL6-R6) [[5]](diffhunk://#diff-aa230a2b1198e6ef8afeb7f48335eb2e2f51d87d918d63c4d891fea612d18ff0L6-R6) [[6]](diffhunk://#diff-86c2390edbede20803cd862908fe95e7207f7dbabd5089ddd4838e1f26e7fecaL6-R6) [[7]](diffhunk://#diff-5e1af33d38ced461fc0e13981d7051e125876d1692efc3aa9cb4b7faa4c18addL7-R7) [[8]](diffhunk://#diff-8c6247829130f219981483ccf25af699a63de99afedeb0dd5c1b7bd8ff0919bdL9-R9) [[9]](diffhunk://#diff-accbd2d37d45e51db3fcb0468043b1e1fd53eeac9e3d3558467ef24444188d2fL7-R7) [[10]](diffhunk://#diff-15fac9b8e76d2782594c91da72f6a6f42fc18e359c3be35bf6564ac3ca09f700L6-R7) [[11]](diffhunk://#diff-8e1a76afd564b6073aac7b02ca59f296ae45a24da3dc4d5c40f18169f48ceba1L6-R6) [[12]](diffhunk://#diff-00a9db26966c21305c72e8f659628dffaff0d6e9dc98a751406d2141d51a5d90L7-R7) [[13]](diffhunk://#diff-2cbf2f66d5cb77d9f4d00e4c0ce45055620fff50c941a588da31729f09a81f1bL6-R7) [[14]](diffhunk://#diff-20a21d07addeea398c4adb76d077875894a73b4b5b181b9df1fafe497d3fc843L6-R6) [[15]](diffhunk://#diff-909670f1c29b0bba24faf1420504b9eacdff124c4cbbec1ddec5de60653ad007L6-R6) [[16]](diffhunk://#diff-8eef5f0c081743f8002e0faba686e838b323cb53b749706ea42e0440aaa793f1L7-R7) [[17]](diffhunk://#diff-82345842a29e8eaffa4f51aab96fa2aa78597e6639fe4b0ece797bc60edacea8L6-R6) **Script improvements:** * Refactored `.make_version.sh` to use a new `sed_inplace` function for in-place file editing, improving cross-platform support (Linux/macOS) and removing reliance on a global variable for the sed command. * Updated `.make_version.sh` to use `sed_inplace` consistently for version replacement and dependency cleanup steps, ensuring robust file modification regardless of OS. [[1]](diffhunk://#diff-546db9206ba1b7973e6187a1025b3904a0b08681d40d0ee4767082040fd0f661L46-R47) [[2]](diffhunk://#diff-546db9206ba1b7973e6187a1025b3904a0b08681d40d0ee4767082040fd0f661L84-R97) * Added a step in `.make_version.sh` to insert local development replace directives for Go modules, streamlining local testing and development. **Documentation updates:** * Updated contributor badge version in `README.MD` and `README.zh_CN.MD` to reflect the new GoFrame version (`v2.10.0`). [[1]](diffhunk://#diff-01e6d9ffed056a02cae8d8a0ec5d476a64d017bf85c0d5a94bb23ca21f33f5aaL48-R48) [[2]](diffhunk://#diff-c93759cb9a9500f20e551c741eb167fc72825fd638d36121357feb8253ce6ac1L48-R48)
1 parent 7321170 commit 8c8c7c8

File tree

38 files changed

+60
-76
lines changed

38 files changed

+60
-76
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: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,6 @@ 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=
6349
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
6450
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
6551
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

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 (

contrib/config/consul/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
33
go 1.23.0
44

55
require (
6-
github.com/gogf/gf/v2 v2.9.8
6+
github.com/gogf/gf/v2 v2.10.0
77
github.com/hashicorp/consul/api v1.24.0
88
github.com/hashicorp/go-cleanhttp v0.5.2
99
)

contrib/config/kubecm/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
33
go 1.24.0
44

55
require (
6-
github.com/gogf/gf/v2 v2.9.8
6+
github.com/gogf/gf/v2 v2.10.0
77
k8s.io/api v0.33.4
88
k8s.io/apimachinery v0.33.4
99
k8s.io/client-go v0.33.4

contrib/config/nacos/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
33
go 1.23.0
44

55
require (
6-
github.com/gogf/gf/v2 v2.9.8
6+
github.com/gogf/gf/v2 v2.10.0
77
github.com/nacos-group/nacos-sdk-go/v2 v2.3.3
88
)
99

0 commit comments

Comments
 (0)