diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 3f5cf22e5..68afee40e 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -239,15 +239,15 @@ jobs: export PATH="$PATH:$(go env GOPATH)/bin" - name: Before Script - run: bash .github/workflows/before_script.sh + run: bash .github/workflows/scripts/before_script.sh - name: Build & Test if: ${{ (github.event_name == 'push' && github.ref != 'refs/heads/master') || github.event_name == 'pull_request' }} - run: bash .github/workflows/ci-main.sh + run: bash .github/workflows/scripts/ci-main.sh - name: Build & Test & Coverage if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - run: bash .github/workflows/ci-main.sh coverage + run: bash .github/workflows/scripts/ci-main.sh coverage - name: Stop Redis Cluster Containers run: docker compose -f ".github/workflows/redis/docker-compose.yml" down diff --git a/.github/workflows/ci-sub.yml b/.github/workflows/ci-sub.yml index 6a1244385..0989af143 100644 --- a/.github/workflows/ci-sub.yml +++ b/.github/workflows/ci-sub.yml @@ -64,9 +64,9 @@ jobs: cache-dependency-path: '**/go.sum' - name: Before Script - run: bash .github/workflows/before_script.sh + run: bash .github/workflows/scripts/before_script.sh - name: Build & Test - run: bash .github/workflows/ci-sub.sh + run: bash .github/workflows/scripts/ci-sub.sh diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml deleted file mode 100644 index 32d6f7d1a..000000000 --- a/.github/workflows/doc-build.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Deploy to GitHub Pages - -on: - push: - branches: - - 'doc-build' - schedule: - - cron: '0 15 * * *' - -jobs: - deploy: - name: Deploy to GitHub Pages - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - ref: doc-build - - uses: actions/setup-node@v4 - with: - node-version: 18 - cache: npm - - name: Set Up Golang Environment - uses: actions/setup-go@v5 - with: - go-version: 1.23.4 - cache: false - - name: download goframe docs - run: ./download.sh - - name: Install dependencies - run: npm ci - - name: Build website - run: npm run build - - name: Deploy to GitHub Pages - uses: peaceiris/actions-gh-pages@v4 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./build - cname: pages.goframe.org diff --git a/.github/workflows/before_script.sh b/.github/workflows/scripts/before_script.sh similarity index 100% rename from .github/workflows/before_script.sh rename to .github/workflows/scripts/before_script.sh diff --git a/.github/workflows/ci-main.sh b/.github/workflows/scripts/ci-main.sh similarity index 92% rename from .github/workflows/ci-main.sh rename to .github/workflows/scripts/ci-main.sh index 1c8b36d02..c75552f71 100644 --- a/.github/workflows/ci-main.sh +++ b/.github/workflows/scripts/ci-main.sh @@ -5,6 +5,9 @@ coverage=$1 # update code of submodules git clone https://github.com/gogf/examples +# update go.mod in examples directory to replace github.com/gogf/gf packages with local directory +bash .github/workflows/scripts/replace_examples_gomod.sh + # find all path that contains go.mod. for file in `find . -name go.mod`; do dirpath=$(dirname $file) diff --git a/.github/workflows/ci-sub.sh b/.github/workflows/scripts/ci-sub.sh similarity index 100% rename from .github/workflows/ci-sub.sh rename to .github/workflows/scripts/ci-sub.sh diff --git a/.github/workflows/scripts/replace_examples_gomod.sh b/.github/workflows/scripts/replace_examples_gomod.sh new file mode 100755 index 000000000..a34fc1abc --- /dev/null +++ b/.github/workflows/scripts/replace_examples_gomod.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +# Get the absolute path to the repository root +repo_root=$(pwd) +workdir=$repo_root/examples + +echo "Prepare to process go.mod files in the ${workdir} directory" + +# Check if examples directory exists +if [ ! -d "${workdir}" ]; then + echo "Error: examples directory not found at ${workdir}" + exit 1 +fi + +# Check if find command is available +if ! command -v find &> /dev/null; then + echo "Error: find command not found!" + exit 1 +fi + +for file in `find ${workdir} -name go.mod`; do + goModPath=$(dirname $file) + echo "" + echo "Processing dir: $goModPath" + + # Calculate relative path to root + # First get the relative path from go.mod to repo root + relativePath="" + current="$goModPath" + while [ "$current" != "$repo_root" ]; do + relativePath="../$relativePath" + current=$(dirname "$current") + done + relativePath=${relativePath%/} # Remove trailing slash + echo "Relative path to root: $relativePath" + + # Get all github.com/gogf/gf dependencies + # Use awk to get package names without version numbers + dependencies=$(awk '/^[[:space:]]*github\.com\/gogf\/gf\// {print $1}' "$file" | sort -u) + + if [ -n "$dependencies" ]; then + echo "Found GoFrame dependencies:" + echo "$dependencies" + echo "Adding replace directives..." + + # Create temporary file + temp_file="${file}.tmp" + # Remove existing replace directives and copy to temp file + sed '/^replace.*github\.com\/gogf\/gf.*/d' "$file" > "$temp_file" + + # Add new replace block + echo "" >> "$temp_file" + echo "replace (" >> "$temp_file" + + while IFS= read -r dep; do + # Skip empty lines + [ -z "$dep" ] && continue + + # Calculate the relative path for the replacement + if [[ "$dep" == "github.com/gogf/gf/v2" ]]; then + replacement="$relativePath" + else + # Extract the path after v2 and remove trailing version + subpath=$(echo "$dep" | sed -E 's/github\.com\/gogf\/gf\/(contrib\/[^/]+\/[^/]+)\/v2.*/\1/') + replacement="$relativePath/$subpath" + fi + + echo " $dep => $replacement/" >> "$temp_file" + done <<< "$dependencies" + + echo ")" >> "$temp_file" + + # Replace original file with temporary file + mv "$temp_file" "$file" + echo "Replace directives added to $file" + else + echo "No GoFrame dependencies found in $file" + fi +done + +echo "\nAll go.mod files have been processed successfully." diff --git a/.make_tidy.sh b/.make_tidy.sh new file mode 100755 index 000000000..e14d2dd85 --- /dev/null +++ b/.make_tidy.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +workdir=. +echo "Prepare to tidy all go.mod files in the ${workdir} directory" + +# check find command support or not +output=$(find "${workdir}" -name go.mod 2>&1) +if [[ $? -ne 0 ]]; then + echo "Error: please use bash or zsh to run!" + exit 1 +fi + +for file in `find ${workdir} -name go.mod`; do + goModPath=$(dirname $file) + echo "" + echo "processing dir: $goModPath" + + if [[ $goModPath =~ "/testdata/" ]]; then + echo "ignore testdata path $goModPath" + continue 1 + fi + + if [[ $goModPath =~ "/examples/" ]]; then + echo "ignore examples path $goModPath" + continue 1 + fi + + cd $goModPath + go mod tidy + # Remove toolchain line if exists + sed -i '' '/^toolchain/d' go.mod + cd - > /dev/null +done diff --git a/.set_version.sh b/.make_version.sh similarity index 83% rename from .set_version.sh rename to .make_version.sh index ceedac620..95f9de8fe 100755 --- a/.set_version.sh +++ b/.make_version.sh @@ -17,7 +17,7 @@ fi workdir=. newVersion=$2 -echo "Prepare to replace the GF library version numbers in all go.mod files in the ${workdir} directory with ${newVersion}" +echo "Prepare to replace the GoFrame library version numbers in all go.mod files in the ${workdir} directory with ${newVersion}" # check find command support or not output=$(find "${workdir}" -name go.mod 2>&1) @@ -49,6 +49,11 @@ for file in `find ${workdir} -name go.mod`; do continue 1 fi + if [[ $goModPath =~ "/examples/" ]]; then + echo "ignore examples path $goModPath" + continue 1 + fi + cd $goModPath if [ $goModPath = "./cmd/gf" ]; then mv go.work go.work.version.bak @@ -59,15 +64,18 @@ for file in `find ${workdir} -name go.mod`; do go mod edit -replace github.com/gogf/gf/contrib/drivers/oracle/v2=../../contrib/drivers/oracle go mod edit -replace github.com/gogf/gf/contrib/drivers/pgsql/v2=../../contrib/drivers/pgsql go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v2=../../contrib/drivers/sqlite - # else - # cd - - # continue 1 fi go mod tidy - # Upgrading only GF related libraries, sometimes even if a version number is specified, it may not be possible to successfully upgrade. Please confirm before submitting the code + # Remove toolchain line if exists + sed -i '' '/^toolchain/d' go.mod + + # Upgrading only GoFrame related libraries, sometimes even if a version number is specified, + # it may not be possible to successfully upgrade. Please confirm before submitting the code go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v go mod tidy + # Remove toolchain line if exists + sed -i '' '/^toolchain/d' go.mod if [ $goModPath = "./cmd/gf" ]; then go mod edit -dropreplace github.com/gogf/gf/v2 go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v2 diff --git a/Makefile b/Makefile index 03f694839..d0cd1cc8e 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,7 @@ SHELL := /bin/bash # execute "go mod tidy" on all folders that have go.mod file .PHONY: tidy tidy: - $(eval files=$(shell find . -name go.mod)) - @set -e; \ - for file in ${files}; do \ - goModPath=$$(dirname $$file); \ - if ! echo $$goModPath | grep -q "testdata"; then \ - echo "handle: $$goModPath"; \ - cd $$goModPath; \ - go mod tidy; \ - cd -; \ - fi \ - done + ./.make_tidy.sh # execute "golangci-lint" to check code style .PHONY: lint @@ -25,7 +15,7 @@ lint: version: @set -e; \ newVersion=$(to); \ - ./.set_version.sh ./ $$newVersion; \ + ./.make_version.sh ./ $$newVersion; \ echo "make version to=$(to) done" diff --git a/README.MD b/README.MD index 37dc8a5aa..3fc372015 100644 --- a/README.MD +++ b/README.MD @@ -36,7 +36,7 @@ A powerful framework for faster, easier, and more efficient project development. 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖 -goframe contributors +goframe contributors # License diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod index ae17a9e10..b12cae08a 100644 --- a/cmd/gf/go.mod +++ b/cmd/gf/go.mod @@ -1,15 +1,15 @@ module github.com/gogf/gf/cmd/gf/v2 -go 1.20 +go 1.22 require ( - github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.3 - github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.3 - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.3 - github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.3 - github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.3 - github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.3 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.0-beta + github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.0-beta + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.0-beta + github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.0-beta + github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.0-beta + github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.0-beta + github.com/gogf/gf/v2 v2.9.0-beta github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f github.com/olekukonko/tablewriter v0.0.5 github.com/schollz/progressbar/v3 v3.15.0 @@ -48,10 +48,10 @@ require ( github.com/rivo/uniseg v0.4.7 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sijms/go-ora/v2 v2.7.10 // indirect - go.opentelemetry.io/otel v1.24.0 // indirect - go.opentelemetry.io/otel/metric v1.24.0 // indirect - go.opentelemetry.io/otel/sdk v1.24.0 // indirect - go.opentelemetry.io/otel/trace v1.24.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/sdk v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect golang.org/x/crypto v0.31.0 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect diff --git a/cmd/gf/go.sum b/cmd/gf/go.sum index e29244f93..f250a44e6 100644 --- a/cmd/gf/go.sum +++ b/cmd/gf/go.sum @@ -1,11 +1,17 @@ aead.dev/minisign v0.2.0 h1:kAWrq/hBRu4AARY6AlciO83xhNnW9UaC8YipS2uhLPk= aead.dev/minisign v0.2.0/go.mod h1:zdq6LdSd9TbuSxchxwhpA9zEb9YXcVGoE8JakuiGaIQ= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 h1:lGlwhPtrX6EVml1hO0ivjkUxsSyl4dsiw9qcA1k/3IQ= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo= github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 h1:6oNBlSdi1QqM1PNW7FPA6xOGA5UNsXnkaYZz9vdPGhA= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA= +github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= @@ -40,24 +46,11 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.3 h1:b/AQMTxiHKPHsidEdk471AC5pkfoK88a5cPmKnzE53U= -github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.3/go.mod h1:qYrF+x5urXLhce3pMcUAyccIsw3Oec0htynoDE4Boi4= -github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.3 h1:F7Gt1y6YsYOIvgrUlRK07H29BL77dEgLPXilTqqVC80= -github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.3/go.mod h1:K5prIMZwHANSZrqZbfm6PoEIMfLtd0PwR7u+hZD9HFs= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.3 h1:RtoBg5HWACFrgIrFkpzH94kxSd5EWefNAq5k6olNY6c= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.3/go.mod h1:elZjckHRCejwml5Kdx2zfhOUDiAV3r5i4BgXcKAeH00= -github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.3 h1:10/RCoWmvQ6PSm+leoS6CsKijH4dB38HOXLgP5+aScQ= -github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.3/go.mod h1:XSaHf3/vTlzj/zioUbzKmaffPuoKvPV639fT91caheM= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.3 h1:DvpoiVac1cwGVDTqC6wzFbDb+gXNzcceRgZUIcuTmaI= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.3/go.mod h1:zugvYVb6c/X9rJ8Gb6b5WkMe+bFz2BsxQ5OLf4RSZos= -github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.3 h1:3pdibfm4UOiTGGh6UD8jfMyGZBGH9ikrrIMU8i/XANA= -github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.3/go.mod h1:G5rfcFkBhtmZT4+CU7A3fJH3sNmP4WRIaJ+4JFeVE08= -github.com/gogf/gf/v2 v2.8.3 h1:h9Px3lqJnnH6It0AqHRz4/1hx0JmvaSf1IvUir5x1rA= -github.com/gogf/gf/v2 v2.8.3/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY= github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM= github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= +github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= @@ -66,7 +59,9 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -80,7 +75,12 @@ github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhB github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -109,6 +109,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= @@ -117,6 +118,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qq github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/schollz/progressbar/v3 v3.15.0 h1:cNZmcNiVyea6oofBTg80ZhVXxf3wG/JoAhqCCwopkQo= github.com/schollz/progressbar/v3 v3.15.0/go.mod h1:ncBdc++eweU0dQoeZJ3loXoAc+bjaallHRIm8pVVeQM= github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= @@ -131,22 +134,23 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= -go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= -go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= -go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= -go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= -go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= -go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= -go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= -go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -202,8 +206,9 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/cmd/gf/go.work b/cmd/gf/go.work index 19bee584a..32a45696a 100644 --- a/cmd/gf/go.work +++ b/cmd/gf/go.work @@ -1,4 +1,4 @@ -go 1.20 +go 1.22 use ( ./ diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod index 5c8aa52f7..be2ef8f53 100644 --- a/contrib/config/apollo/go.mod +++ b/contrib/config/apollo/go.mod @@ -2,11 +2,9 @@ module github.com/gogf/gf/contrib/config/apollo/v2 go 1.22 -toolchain go1.22.0 - require ( github.com/apolloconfig/agollo/v4 v4.3.1 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta ) require ( diff --git a/contrib/config/consul/go.mod b/contrib/config/consul/go.mod index b59d1c856..53212a751 100644 --- a/contrib/config/consul/go.mod +++ b/contrib/config/consul/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/config/consul/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/hashicorp/consul/api v1.24.0 github.com/hashicorp/go-cleanhttp v0.5.2 ) diff --git a/contrib/config/kubecm/go.mod b/contrib/config/kubecm/go.mod index e21e6e46d..2c0b5f09a 100644 --- a/contrib/config/kubecm/go.mod +++ b/contrib/config/kubecm/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/config/kubecm/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta k8s.io/api v0.27.4 k8s.io/apimachinery v0.27.4 k8s.io/client-go v0.27.4 diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod index beb5ce58e..31b3b6b74 100644 --- a/contrib/config/nacos/go.mod +++ b/contrib/config/nacos/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/config/nacos/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/nacos-group/nacos-sdk-go/v2 v2.2.5 ) diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod index 0d11a9bed..e1d0e95d2 100644 --- a/contrib/config/polaris/go.mod +++ b/contrib/config/polaris/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/config/polaris/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/polarismesh/polaris-go v1.5.8 ) diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod index 06b845256..5b7080249 100644 --- a/contrib/drivers/clickhouse/go.mod +++ b/contrib/drivers/clickhouse/go.mod @@ -2,11 +2,9 @@ module github.com/gogf/gf/contrib/drivers/clickhouse/v2 go 1.22 -toolchain go1.22.0 - require ( github.com/ClickHouse/clickhouse-go/v2 v2.0.15 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/google/uuid v1.6.0 github.com/shopspring/decimal v1.3.1 ) diff --git a/contrib/drivers/dm/go.mod b/contrib/drivers/dm/go.mod index 5182d9399..c3b1efc77 100644 --- a/contrib/drivers/dm/go.mod +++ b/contrib/drivers/dm/go.mod @@ -2,13 +2,11 @@ module github.com/gogf/gf/contrib/drivers/dm/v2 go 1.22 -toolchain go1.22.0 - replace github.com/gogf/gf/v2 => ../../../ require ( gitee.com/chunanyong/dm v1.8.12 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta ) require ( diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod index 80b7e8a0b..7bb9d011d 100644 --- a/contrib/drivers/mssql/go.mod +++ b/contrib/drivers/mssql/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/drivers/mssql/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/microsoft/go-mssqldb v1.7.1 ) diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod index 39f0c0f60..330074afb 100644 --- a/contrib/drivers/mysql/go.mod +++ b/contrib/drivers/mysql/go.mod @@ -2,11 +2,9 @@ module github.com/gogf/gf/contrib/drivers/mysql/v2 go 1.22 -toolchain go1.22.0 - require ( github.com/go-sql-driver/mysql v1.7.1 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta ) require ( diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod index 39bb2f259..845f18ec4 100644 --- a/contrib/drivers/oracle/go.mod +++ b/contrib/drivers/oracle/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/sijms/go-ora/v2 v2.7.10 ) diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod index edbfa4ea1..4bfa51c0c 100644 --- a/contrib/drivers/pgsql/go.mod +++ b/contrib/drivers/pgsql/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/lib/pq v1.10.9 ) diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod index 60f434a72..51bd021b3 100644 --- a/contrib/drivers/sqlite/go.mod +++ b/contrib/drivers/sqlite/go.mod @@ -2,11 +2,9 @@ module github.com/gogf/gf/contrib/drivers/sqlite/v2 go 1.22 -toolchain go1.22.0 - require ( github.com/glebarez/go-sqlite v1.21.2 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta ) require ( diff --git a/contrib/drivers/sqlitecgo/go.mod b/contrib/drivers/sqlitecgo/go.mod index b80615394..8b30e6855 100644 --- a/contrib/drivers/sqlitecgo/go.mod +++ b/contrib/drivers/sqlitecgo/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/mattn/go-sqlite3 v1.14.17 ) diff --git a/contrib/metric/otelmetric/go.mod b/contrib/metric/otelmetric/go.mod index f9c8a2746..4c0fabb57 100644 --- a/contrib/metric/otelmetric/go.mod +++ b/contrib/metric/otelmetric/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/metric/otelmetric/v2 go 1.22 require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/prometheus/client_golang v1.19.1 go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0 go.opentelemetry.io/otel v1.32.0 diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod index aede72dec..3ff89b717 100644 --- a/contrib/nosql/redis/go.mod +++ b/contrib/nosql/redis/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/nosql/redis/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/redis/go-redis/v9 v9.7.0 go.opentelemetry.io/otel v1.32.0 go.opentelemetry.io/otel/trace v1.32.0 diff --git a/contrib/registry/consul/go.mod b/contrib/registry/consul/go.mod index 2c44f5170..d1cce9932 100644 --- a/contrib/registry/consul/go.mod +++ b/contrib/registry/consul/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/registry/consul/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/hashicorp/consul/api v1.26.1 ) diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod index 8b7dacc21..0ee6e218b 100644 --- a/contrib/registry/etcd/go.mod +++ b/contrib/registry/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2 go 1.22 require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta go.etcd.io/etcd/client/v3 v3.5.17 google.golang.org/grpc v1.59.0 ) diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod index d2533732f..c5a61244f 100644 --- a/contrib/registry/file/go.mod +++ b/contrib/registry/file/go.mod @@ -2,9 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2 go 1.22 -toolchain go1.22.0 - -require github.com/gogf/gf/v2 v2.8.3 +require github.com/gogf/gf/v2 v2.9.0-beta require ( github.com/BurntSushi/toml v1.4.0 // indirect diff --git a/contrib/registry/nacos/go.mod b/contrib/registry/nacos/go.mod index 768b3aa44..4b9e42d19 100644 --- a/contrib/registry/nacos/go.mod +++ b/contrib/registry/nacos/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/registry/nacos/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/nacos-group/nacos-sdk-go/v2 v2.2.7 ) diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod index cc7ac6c19..b4415b6e1 100644 --- a/contrib/registry/polaris/go.mod +++ b/contrib/registry/polaris/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/registry/polaris/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta github.com/polarismesh/polaris-go v1.5.8 ) diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod index 7f1f3466c..15908c239 100644 --- a/contrib/registry/zookeeper/go.mod +++ b/contrib/registry/zookeeper/go.mod @@ -2,11 +2,9 @@ module github.com/gogf/gf/contrib/registry/zookeeper/v2 go 1.22 -toolchain go1.22.0 - require ( github.com/go-zookeeper/zk v1.0.3 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta golang.org/x/sync v0.10.0 ) diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod index 9d9705297..72919a9d2 100644 --- a/contrib/rpc/grpcx/go.mod +++ b/contrib/rpc/grpcx/go.mod @@ -2,11 +2,9 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/contrib/registry/file/v2 v2.8.3 - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/contrib/registry/file/v2 v2.9.0-beta + github.com/gogf/gf/v2 v2.9.0-beta go.opentelemetry.io/otel v1.32.0 go.opentelemetry.io/otel/trace v1.32.0 google.golang.org/grpc v1.64.1 diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod index e2abac29e..5dfb326ff 100644 --- a/contrib/sdk/httpclient/go.mod +++ b/contrib/sdk/httpclient/go.mod @@ -2,9 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2 go 1.22 -toolchain go1.22.0 - -require github.com/gogf/gf/v2 v2.8.3 +require github.com/gogf/gf/v2 v2.9.0-beta require ( github.com/BurntSushi/toml v1.4.0 // indirect diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod index 7e77a80f1..29d16faef 100644 --- a/contrib/trace/otlpgrpc/go.mod +++ b/contrib/trace/otlpgrpc/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta go.opentelemetry.io/otel v1.32.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod index 6d7038d4f..616865c31 100644 --- a/contrib/trace/otlphttp/go.mod +++ b/contrib/trace/otlphttp/go.mod @@ -2,10 +2,8 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2 go 1.22 -toolchain go1.22.0 - require ( - github.com/gogf/gf/v2 v2.8.3 + github.com/gogf/gf/v2 v2.9.0-beta go.opentelemetry.io/otel v1.32.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 diff --git a/version.go b/version.go index f27c3be04..34f324280 100644 --- a/version.go +++ b/version.go @@ -2,5 +2,5 @@ package gf const ( // VERSION is the current GoFrame version. - VERSION = "v2.8.3" + VERSION = "v2.9.0-beta" )