diff --git a/android/app/build.gradle b/android/app/build.gradle index 5da9ad37a..0eb417a96 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -101,8 +101,8 @@ android { applicationId 'org.ZingoLabs.Zingo' // Real minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 202 // Real - versionName "zingo-1.10.2" // Real + versionCode 205 // Real + versionName "zingo-1.10.3" // Real missingDimensionStrategy 'react-native-camera', 'general' testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/app/translations/en.json b/app/translations/en.json index e189845b7..400bc44b1 100644 --- a/app/translations/en.json +++ b/app/translations/en.json @@ -1,6 +1,6 @@ { "zingo": "Zingo", - "version": "zingo-1.10.2 (202)", + "version": "zingo-1.10.3 (205)", "loading": "loading...", "connectingserver": "Connecting to the server...", "wait": "Please wait...", diff --git a/app/translations/es.json b/app/translations/es.json index f69eef8d0..c2995db52 100644 --- a/app/translations/es.json +++ b/app/translations/es.json @@ -1,6 +1,6 @@ { "zingo": "Zingo", - "version": "zingo-1.10.2 (202)", + "version": "zingo-1.10.3 (205)", "loading": "cargando...", "connectingserver": "Conectando con el servidor...", "wait": "Por favor espere...", diff --git a/app/translations/pt.json b/app/translations/pt.json index 8f787791f..293540e4b 100644 --- a/app/translations/pt.json +++ b/app/translations/pt.json @@ -1,6 +1,6 @@ { "zingo": "Zingo", - "version": "zingo-1.10.2 (202)", + "version": "zingo-1.10.3 (205)", "loading": "carregando...", "connectingserver": "Conectando-se ao servidor...", "wait": "Aguarde um momento...", diff --git a/app/translations/ru.json b/app/translations/ru.json index 4d4f6fa00..6d6bfecc2 100644 --- a/app/translations/ru.json +++ b/app/translations/ru.json @@ -1,6 +1,6 @@ { "zingo": "Zingo", - "version": "zingo-1.10.2 (202)", + "version": "zingo-1.10.3 (205)", "loading": "загрузка...", "connectingserver": "Подключение к серверу...", "wait": "Пожалуйста, подождите...", diff --git a/ios/ZingoMobile.xcodeproj/project.pbxproj b/ios/ZingoMobile.xcodeproj/project.pbxproj index 244a8e049..dd6ff5962 100644 --- a/ios/ZingoMobile.xcodeproj/project.pbxproj +++ b/ios/ZingoMobile.xcodeproj/project.pbxproj @@ -552,7 +552,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements; - CURRENT_PROJECT_VERSION = 202; + CURRENT_PROJECT_VERSION = 205; DEVELOPMENT_TEAM = 788KRST4S8; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -569,7 +569,7 @@ "$(PROJECT_DIR)", "$(inherited)", ); - MARKETING_VERSION = 1.10.2; + MARKETING_VERSION = 1.10.3; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -593,7 +593,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements; - CURRENT_PROJECT_VERSION = 202; + CURRENT_PROJECT_VERSION = 205; DEVELOPMENT_TEAM = 788KRST4S8; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -610,7 +610,7 @@ "$(PROJECT_DIR)", "$(inherited)", ); - MARKETING_VERSION = 1.10.2; + MARKETING_VERSION = 1.10.3; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 05ce7ece4..9e719f72b 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -594,7 +594,7 @@ dependencies = [ [[package]] name = "build_utils" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" [[package]] name = "bumpalo" @@ -891,7 +891,7 @@ dependencies = [ [[package]] name = "darkside-tests" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" dependencies = [ "futures-util", "hex", @@ -2571,7 +2571,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "itertools 0.13.0", "log", "multimap", @@ -4860,7 +4860,7 @@ dependencies = [ [[package]] name = "zingo-memo" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" dependencies = [ "zcash_address", "zcash_client_backend", @@ -4872,7 +4872,7 @@ dependencies = [ [[package]] name = "zingo-netutils" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" dependencies = [ "http", "http-body", @@ -4892,7 +4892,7 @@ dependencies = [ [[package]] name = "zingo-status" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" dependencies = [ "zcash_primitives", ] @@ -4900,7 +4900,7 @@ dependencies = [ [[package]] name = "zingo-sync" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" dependencies = [ "base58", "crossbeam-channel", @@ -4930,7 +4930,7 @@ dependencies = [ [[package]] name = "zingolib" version = "0.2.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#f51c7f36b645e2e367ad465c9ec980a53b1757c8" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.3#f51c7f36b645e2e367ad465c9ec980a53b1757c8" dependencies = [ "append-only-vec", "base58", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 157e18c97..4158b4ba3 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -3,7 +3,7 @@ members = ["lib", "android", "zingomobile_utils"] resolver = "2" [workspace.dependencies] -zingolib = { git = "https://github.com/zingolabs/zingolib", default-features = true, branch = "dev", features = [ +zingolib = { git = "https://github.com/zingolabs/zingolib", default-features = true, tag = "1.10.3", features = [ "test-elevation", ] } uniffi = "0.27" diff --git a/rust/android/Cargo.toml b/rust/android/Cargo.toml index 6edfea627..cd24c9ac5 100644 --- a/rust/android/Cargo.toml +++ b/rust/android/Cargo.toml @@ -12,7 +12,7 @@ regchest = [] zingolib = { workspace = true } zingomobile_utils = { path = "../zingomobile_utils" } regchest_utils = { git = "https://github.com/zingolabs/zingo-regchest", default-features = true, branch = "dev" } -darkside-tests = { git = "https://github.com/zingolabs/zingolib", default-features = true, branch = "dev" } +darkside-tests = { git = "https://github.com/zingolabs/zingolib", default-features = true, tag = "1.10.3" } json = "0.12.4" env_logger = "0.10.0" tokio = { workspace = true }