diff --git a/HISTORY.md b/HISTORY.md index 42b78477d..7f010f2a7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,7 +1,30 @@ # Changelog -## 2.3.1 (2024-09-06) +## 2.5.0 (2024-09-22) + +#### Other + +* Merge pull request #1335 from laperuz92/patch-1. + _Update russian translations_ + +* Update russian translations. + +* Merge pull request #1328 from yxiZo/main. + _Update translations_ + +* Chore: update translations with Fink 🐦 + +* Merge pull request #1322 from andythesilly/main. + _set edgeToEdge ui mode_ + +* Chore: update translations with Fink 🐦 + +* Set edgeToEdge ui mode. + + + +## v2.3.1 (2024-09-07) #### Fix diff --git a/Makefile b/Makefile index 0e01ae004..a81e4875f 100644 --- a/Makefile +++ b/Makefile @@ -240,10 +240,10 @@ release: # Create a new tag for release. VERSION_STR="$${VERSION_ARRAY[0]}.$${VERSION_ARRAY[1]}.$${VERSION_ARRAY[2]}" && \ BUILD_NUMBER=$$(( $${VERSION_ARRAY[0]} * 10000 + $${VERSION_ARRAY[1]} * 100 + $${VERSION_ARRAY[2]} )) && \ echo "version: $${VERSION_STR}+$${BUILD_NUMBER}" && \ - sed -i "" "s/^version: .*/version: $${VERSION_STR}\+$${BUILD_NUMBER}/g" pubspec.yaml && \ - sed -i "" "s/^msix_version: .*/msix_version: $${VERSION_ARRAY[0]}.$${VERSION_ARRAY[1]}.$${VERSION_ARRAY[2]}.0/g" windows/packaging/msix/make_config.yaml && \ - sed -i "" "s/CURRENT_PROJECT_VERSION = $${cbuild_number}/CURRENT_PROJECT_VERSION = $${BUILD_NUMBER}/g" ios/Runner.xcodeproj/project.pbxproj && \ - sed -i "" "s/MARKETING_VERSION = $${cstr_version}/MARKETING_VERSION = $${VERSION_STR}/g" ios/Runner.xcodeproj/project.pbxproj && \ + sed -i "s/^version: .*/version: $${VERSION_STR}\+$${BUILD_NUMBER}/g" pubspec.yaml && \ + sed -i "s/^msix_version: .*/msix_version: $${VERSION_ARRAY[0]}.$${VERSION_ARRAY[1]}.$${VERSION_ARRAY[2]}.0/g" windows/packaging/msix/make_config.yaml && \ + sed -i "s/CURRENT_PROJECT_VERSION = $${cbuild_number}/CURRENT_PROJECT_VERSION = $${BUILD_NUMBER}/g" ios/Runner.xcodeproj/project.pbxproj && \ + sed -i "s/MARKETING_VERSION = $${cstr_version}/MARKETING_VERSION = $${VERSION_STR}/g" ios/Runner.xcodeproj/project.pbxproj && \ git tag $${TAG} > /dev/null && \ gitchangelog > HISTORY.md || { git tag -d $${TAG}; echo "Please run pip install gitchangelog pystache mustache markdown"; exit 2; } && \ git tag -d $${TAG} > /dev/null && \ diff --git a/dependencies.properties b/dependencies.properties index 30ef67153..4b29fc952 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1 +1 @@ -core.version=2.3.0 \ No newline at end of file +core.version=3.0.0 \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 6eee424a2..7bdcf40cf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hiddify description: Cross Platform Multi Protocol Proxy Frontend. publish_to: "none" -version: 2.3.1+20301 +version: 2.5.0+20500 environment: sdk: ">=3.3.0 <4.0.0" diff --git a/windows/packaging/msix/make_config.yaml b/windows/packaging/msix/make_config.yaml index 575d76a03..a142cd1f1 100644 --- a/windows/packaging/msix/make_config.yaml +++ b/windows/packaging/msix/make_config.yaml @@ -1,7 +1,7 @@ display_name: Hiddify publisher_display_name: Hiddify identity_name: Hiddify.HiddifyNext -msix_version: 2.3.1.0 +msix_version: 2.5.0.0 logo_path: windows\runner\resources\app_icon.ico capabilities: internetClient, internetClientServer, privateNetworkClientServer languages: en-us, zh-cn, zh-tw, tr-tr,fa-ir,ru-ru,pt-br,es-es