Merge remote-tracking branch 'origin/ui-fixes' into ui-fixes

# Conflicts:
#	macos/Runner/Release.entitlements
This commit is contained in:
julian-CStack 2023-09-22 14:12:06 -06:00
commit 12f0dcce18

View file

@ -11,7 +11,7 @@ description: Stack Wallet
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.8.0+190 version: 1.8.0+191
environment: environment:
sdk: ">=3.0.2 <4.0.0" sdk: ">=3.0.2 <4.0.0"
@ -60,7 +60,7 @@ dependencies:
tor_ffi_plugin: tor_ffi_plugin:
git: git:
url: https://github.com/cypherstack/tor.git url: https://github.com/cypherstack/tor.git
ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa ref: 0a6888282f4e98401051a396e9d2293bd55ac2c2
# Utility plugins # Utility plugins
http: ^0.13.0 http: ^0.13.0