Skip to content

Commit

Permalink
Merge pull request zingolabs#762 from juanky201271/dev_new_test_versi…
Browse files Browse the repository at this point in the history
…on_1.10.3_205

New test version 1.10.3 (205) & zingolib 1.10.3
  • Loading branch information
juanky201271 authored Dec 10, 2024
2 parents f078e1c + 57e5731 commit 886ab5d
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion app/translations/en.json
Original file line number Diff line number Diff line change
@@ -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...",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/es.json
Original file line number Diff line number Diff line change
@@ -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...",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/pt.json
Original file line number Diff line number Diff line change
@@ -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...",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/ru.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"zingo": "Zingo",
"version": "zingo-1.10.2 (202)",
"version": "zingo-1.10.3 (205)",
"loading": "загрузка...",
"connectingserver": "Подключение к серверу...",
"wait": "Пожалуйста, подождите...",
Expand Down
8 changes: 4 additions & 4 deletions ios/ZingoMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand All @@ -569,7 +569,7 @@
"$(PROJECT_DIR)",
"$(inherited)",
);
MARKETING_VERSION = 1.10.2;
MARKETING_VERSION = 1.10.3;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -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 = "";
Expand All @@ -610,7 +610,7 @@
"$(PROJECT_DIR)",
"$(inherited)",
);
MARKETING_VERSION = 1.10.2;
MARKETING_VERSION = 1.10.3;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
16 changes: 8 additions & 8 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rust/android/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down

0 comments on commit 886ab5d

Please sign in to comment.