From 2b63eaa51fa0043303e90890be9dbbe0a6623550 Mon Sep 17 00:00:00 2001 From: Amitabh Aggarwal Date: Fri, 20 Sep 2024 09:24:22 -0500 Subject: [PATCH 1/2] feat: Enable pooled staking UI in app configuration --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index cae5c05edf1..492a0bcd9ca 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -1464,7 +1464,7 @@ app: MM_MULTICHAIN_V1_ENABLED: false - opts: is_expand: false - MM_POOLED_STAKING_UI_ENABLED: false + MM_POOLED_STAKING_UI_ENABLED: true - opts: is_expand: false PROJECT_LOCATION: android From 2ad8229fc1173d1314604890ef124adc9dc06ac6 Mon Sep 17 00:00:00 2001 From: Amitabh Aggarwal Date: Mon, 30 Sep 2024 11:29:27 -0500 Subject: [PATCH 2/2] chore: bump build versions --- android/app/build.gradle | 4 ++-- bitrise.yml | 8 ++++---- ios/MetaMask.xcodeproj/project.pbxproj | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2363b3c882e..9afbf46ad21 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -173,8 +173,8 @@ android { applicationId "io.metamask" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1432 - versionName "7.31.0" + versionCode 1440 + versionName "7.33.0" testBuildType System.getProperty('testBuildType', 'debug') missingDimensionStrategy 'react-native-camera', 'general' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/bitrise.yml b/bitrise.yml index d501ac52abc..9f6a4f8646f 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -1497,16 +1497,16 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 7.31.0 + VERSION_NAME: 7.33.0 - opts: is_expand: false - VERSION_NUMBER: 1432 + VERSION_NUMBER: 1440 - opts: is_expand: false - FLASK_VERSION_NAME: 7.31.0 + FLASK_VERSION_NAME: 7.33.0 - opts: is_expand: false - FLASK_VERSION_NUMBER: 1432 + FLASK_VERSION_NUMBER: 1440 - opts: is_expand: false ANDROID_APK_LINK: '' diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 33f3d02a0fe..8dc3b922ae8 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1273,7 +1273,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1432; + CURRENT_PROJECT_VERSION = 1440; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1310,7 +1310,7 @@ "${inherited}", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.31.0; + MARKETING_VERSION = 7.33.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1338,7 +1338,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1432; + CURRENT_PROJECT_VERSION = 1440; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1373,7 +1373,7 @@ "${inherited}", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.31.0; + MARKETING_VERSION = 7.33.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1401,7 +1401,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1432; + CURRENT_PROJECT_VERSION = 1440; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1434,7 +1434,7 @@ ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)"; LLVM_LTO = YES; - MARKETING_VERSION = 7.31.0; + MARKETING_VERSION = 7.33.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1462,7 +1462,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1432; + CURRENT_PROJECT_VERSION = 1440; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1493,7 +1493,7 @@ ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)"; LLVM_LTO = YES; - MARKETING_VERSION = 7.31.0; + MARKETING_VERSION = 7.33.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1616,7 +1616,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1432; + CURRENT_PROJECT_VERSION = 1440; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1653,7 +1653,7 @@ "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.31.0; + MARKETING_VERSION = 7.33.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -1684,7 +1684,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1432; + CURRENT_PROJECT_VERSION = 1440; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1719,7 +1719,7 @@ "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.31.0; + MARKETING_VERSION = 7.33.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)",