Merge branch 'develop' into yomo-903

Emurgo · Nov 21, 2023 · 0598a99 · 0598a99
2 parents 6ae4158 + 7173f80
commit 0598a99
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 15 deletions.
diff --git a/apps/wallet-mobile/.bundle/config b/apps/wallet-mobile/.bundle/config
@@ -1,2 +1,5 @@
-BUNDLE_PATH: "vendor/bundle"
-BUNDLE_FORCE_RUBY_PLATFORM: 1
+---
+BUNDLE_PATH: "/Users/runner/work/yoroi/yoroi/apps/wallet-mobile/vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: "1"
+BUNDLE_DEPLOYMENT: "true"
+BUNDLE_JOBS: "4"
diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
@@ -108,7 +108,7 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 540
+        versionCode 601
         versionName "4.23.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>483</string>
+	<string>489</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 483;
+				CURRENT_PROJECT_VERSION = 489;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env";
@@ -857,7 +857,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 483;
+				CURRENT_PROJECT_VERSION = 489;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
 				INFOPLIST_FILE = yoroi/Info.plist;
@@ -1046,7 +1046,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 483;
+				CURRENT_PROJECT_VERSION = 489;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
@@ -1085,7 +1085,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 483;
+				CURRENT_PROJECT_VERSION = 489;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
 				INFOPLIST_FILE = nightly.plist;

diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>483</string>
+	<string>489</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>483</string>
+	<string>489</string>
 </dict>
 </plist>
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -174,7 +174,7 @@
     "react": ">= 16.8.0 <= 19.0.0",
     "react-query": "^3.39.3"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.21",
   "engines": {
     "node": ">= 16.19.0"
   },

diff --git a/packages/banxa/package.json b/packages/banxa/package.json
@@ -170,7 +170,7 @@
   "optionalDependencies": {
     "@react-native-async-storage/async-storage": "^1.18.1"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.21",
   "engines": {
     "node": ">= 16.19.0"
   },

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -173,7 +173,7 @@
     "react": ">= 16.8.0 <= 19.0.0",
     "react-query": "^3.39.3"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.21",
   "engines": {
     "node": ">= 16.19.0"
   },

diff --git a/packages/swap/package.json b/packages/swap/package.json
@@ -177,7 +177,7 @@
   "optionalDependencies": {
     "@react-native-async-storage/async-storage": "^1.19.3"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.21",
   "engines": {
     "node": ">= 16.19.0"
   },

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -110,7 +110,7 @@
     "release-it": "^15.0.0",
     "typescript": "^4.5.2"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.21",
   "engines": {
     "node": ">= 16.19.0"
   },