Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: v7.33.1 #12020

Merged
merged 36 commits into from
Nov 1, 2024
+23 −19
Merged

feat: v7.33.1 #12020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
22e44c2
7.33.0
metamaskbot Oct 4, 2024
f178cd0
chore: chore/7.33.0-Changelog (#11617)
github-actions[bot] Oct 4, 2024
22d1a59
chore: merge 7.32.0 in 7.33.0 and bump build (#11677)
NicolasMassart Oct 8, 2024
06cf1b6
chore: cherry-pick #11595 (#11683)
github-actions[bot] Oct 8, 2024
8bc683c
chore: cherry-pick #11603 (#11682)
github-actions[bot] Oct 8, 2024
57d3a57
chore: cherry-pick #11592 (#11684)
github-actions[bot] Oct 8, 2024
58d08f1
chore: cherry-pick #11631 (#11702)
sahar-fehri Oct 9, 2024
c132256
chore: bump to version 1454 (#11738)
NicolasMassart Oct 10, 2024
db2d2c6
chore: cherry-pick #11718 (#11739)
NicolasMassart Oct 10, 2024
c774787
Bump version to 1456 for 7.33.0 RC-4 (#11784)
NicolasMassart Oct 14, 2024
3e564e1
chore(runway): cherry-pick chore(ramp): upgrade sdk to 1.28.5 (#11790)
runway-github[bot] Oct 14, 2024
93ec320
chore: cherry pick 6db794f7dc4799918dc83c97211db25d5a6542e2 (#11791)
sethkfman Oct 14, 2024
edba913
chore: cherry-pick #11760 (#11773)
github-actions[bot] Oct 14, 2024
e7ae695
bump version 1458
sethkfman Oct 14, 2024
165846c
chore(runway): cherry-pick chore: Update Sentry Performance Sampling …
runway-github[bot] Oct 16, 2024
8581bbc
chore(runway): cherry-pick fix: persist token and phishing list (#11807)
runway-github[bot] Oct 16, 2024
0556903
chore: cherry pick 9ac1488 (#11822)
sethkfman Oct 16, 2024
97d4640
chore: cherry pick tags for custom instrumentation (#11826)
tommasini Oct 16, 2024
9d54b08
Bump build version 1459 RC - 6
sethkfman Oct 16, 2024
392f8d0
chore: Revert custom span (#11839)
tommasini Oct 17, 2024
498e8a2
chore: revert tags commit (#11838)
tommasini Oct 17, 2024
3481ea8
bump build number 1460 RC-7
sethkfman Oct 17, 2024
f895d7a
chore(runway): cherry-pick chore: bump ruby version to 3.1.6 (#11848)
runway-github[bot] Oct 17, 2024
aa06696
Bump version to 1467
Cal-L Oct 24, 2024
0302b52
chore: cherry-pick #11929 (#12080)
NicolasMassart Oct 29, 2024
5084c5c
updated semversion and changelog
sethkfman Oct 29, 2024
a8eaa56
feat: Simulation re-trigger (#12073)
OGPoyraz Oct 30, 2024
6e7cf51
bump version 1471 RC - 1
sethkfman Oct 30, 2024
098dade
update changelog
sethkfman Oct 30, 2024
3c45a6c
chore(runway): cherry-pick ci: Update bitrise machines (#12106)
runway-github[bot] Oct 30, 2024
1945fe7
sync with main
sethkfman Oct 31, 2024
af8c9d4
remove unused patches
sethkfman Oct 31, 2024
1caeacf
revert simulation changes that will conflict with main updates
sethkfman Nov 1, 2024
549a9f1
added missing import
sethkfman Nov 1, 2024
c746f0a
format correction
sethkfman Nov 1, 2024
4230db7
format correction
sethkfman Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Current Main Branch

## 7.33.1 - Oct 29, 2024
### Fixed
- [#12073](https://github.com/MetaMask/metamask-mobile/pull/12073): feat: Simulation re-trigger (#12073)

## 7.33.0 - Oct 17, 2024
### Added
- [#11507](https://github.com/MetaMask/metamask-mobile/pull/11507): feat: 10550 Re-introduce test for measuring cold app start + JS bundle load time (#11507)
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionName "7.33.0"
versionCode 1460
versionName "7.33.1"
versionCode 1471
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
8 changes: 4 additions & 4 deletions bitrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1539,16 +1539,16 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.33.0
VERSION_NAME: 7.33.1
- opts:
is_expand: false
VERSION_NUMBER: 1460
VERSION_NUMBER: 1471
- opts:
is_expand: false
FLASK_VERSION_NAME: 7.33.0
FLASK_VERSION_NAME: 7.33.1
- opts:
is_expand: false
FLASK_VERSION_NUMBER: 1460
FLASK_VERSION_NUMBER: 1471
- opts:
is_expand: false
ANDROID_APK_LINK: ''
Expand Down
24 changes: 12 additions & 12 deletions ios/MetaMask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1460;
CURRENT_PROJECT_VERSION = 1471;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1318,7 +1318,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.33.0;
MARKETING_VERSION = 7.33.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1346,7 +1346,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1460;
CURRENT_PROJECT_VERSION = 1471;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1381,7 +1381,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.33.0;
MARKETING_VERSION = 7.33.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1409,7 +1409,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1460;
CURRENT_PROJECT_VERSION = 1471;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1442,7 +1442,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.33.0;
MARKETING_VERSION = 7.33.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1470,7 +1470,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1460;
CURRENT_PROJECT_VERSION = 1471;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1501,7 +1501,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.33.0;
MARKETING_VERSION = 7.33.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1624,7 +1624,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1460;
CURRENT_PROJECT_VERSION = 1471;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1661,7 +1661,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.33.0;
MARKETING_VERSION = 7.33.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1692,7 +1692,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1460;
CURRENT_PROJECT_VERSION = 1471;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1727,7 +1727,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.33.0;
MARKETING_VERSION = 7.33.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask",
"version": "7.33.0",
"version": "7.33.1",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
Loading