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

chore: 7.37.1 & main sync #12817

Merged
merged 17 commits into from
Dec 20, 2024
+26 −20
Merged

chore: 7.37.1 & main sync #12817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8a7f092
bump semvar version to 7.37.0 && build version to 1506
metamaskbot Nov 28, 2024
e958128
chore: chore/7.37.0-Changelog (#12491)
github-actions[bot] Nov 28, 2024
18aca38
chore(runway): cherry-pick feat: implement remote feature flag contro…
runway-github[bot] Dec 2, 2024
e7b65d5
Bump version number to 1508
metamaskbot Dec 2, 2024
220c4b9
Bump version number to 1510
metamaskbot Dec 5, 2024
0df8b7e
chore(runway): cherry-pick fix: Move `AssetPollingProvider` from Root…
runway-github[bot] Dec 5, 2024
9d1a470
chore(runway): cherry-pick fix(12527): sdk connection with unknown ur…
runway-github[bot] Dec 5, 2024
1930c1f
Bump version number to 1511
metamaskbot Dec 6, 2024
2ff2d53
chore: cherry-pick #12540 (#12600)
github-actions[bot] Dec 9, 2024
12ac883
Bump version number to 1512
metamaskbot Dec 9, 2024
0f74530
feat: 7.37.1 (#12662)
github-actions[bot] Dec 20, 2024
889c3b8
added new build commands and bitrise workflows for QA expo builds
sethkfman Dec 17, 2024
4a3cab1
sync with main
sethkfman Dec 20, 2024
a35e43e
add store index changes
sethkfman Dec 20, 2024
e0934d7
fix bitrise changes
sethkfman Dec 20, 2024
9e91114
remove changes
sethkfman Dec 20, 2024
9dfc8e0
fix xcode proj
sethkfman Dec 20, 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
6 changes: 6 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,12 @@

## Current Main Branch

## 7.37.1 - Dec 16, 2024
### Fixed
- [#12577](https://github.com/MetaMask/metamask-mobile/pull/12577): chore: bump {gas-fee,network,selected-network,notification-services,profile-sync,signature}-controller (#12577)
- [#12694](https://github.com/MetaMask/metamask-mobile/pull/12694): fix: small refactoring of the latest migration script + add a new migration case (#12694)
- [#12664](https://github.com/MetaMask/metamask-mobile/pull/12664): fix: mark transactions as failed for cancelled / unknown smart transactions (#12664)

## 7.37.0 - Nov 28, 2024
### Added
- [#12091](https://github.com/MetaMask/metamask-mobile/pull/12091): feat: 2020 Add a performance test for iOS in Bitrise (#12091)
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 @@ -178,8 +178,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionName "7.37.0"
versionCode 1512
versionName "7.37.1"
versionCode 1520
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
10 changes: 5 additions & 5 deletions bitrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ workflows:
inputs:
- content: |-
#!/usr/bin/env bash
brew install ccache with HOMEBREW_NO_DEPENDENTS_CHECK=1
brew install ccache with HOMEBREW_NO_DEPENDENTS_CHECK=1
ln -s $(which ccache) /usr/local/bin/gcc
ln -s $(which ccache) /usr/local/bin/g++
ln -s $(which ccache) /usr/local/bin/cc
Expand Down Expand Up @@ -1781,16 +1781,16 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.37.0
VERSION_NAME: 7.37.1
- opts:
is_expand: false
VERSION_NUMBER: 1512
VERSION_NUMBER: 1520
- opts:
is_expand: false
FLASK_VERSION_NAME: 7.37.0
FLASK_VERSION_NAME: 7.37.1
- opts:
is_expand: false
FLASK_VERSION_NUMBER: 1512
FLASK_VERSION_NUMBER: 1520
- 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 @@ -1380,7 +1380,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1512;
CURRENT_PROJECT_VERSION = 1520;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1418,7 +1418,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.37.0;
MARKETING_VERSION = 7.37.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1449,7 +1449,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1512;
CURRENT_PROJECT_VERSION = 1520;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1484,7 +1484,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.37.0;
MARKETING_VERSION = 7.37.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1514,7 +1514,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1512;
CURRENT_PROJECT_VERSION = 1520;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1547,7 +1547,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.37.0;
MARKETING_VERSION = 7.37.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1576,7 +1576,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1512;
CURRENT_PROJECT_VERSION = 1520;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1607,7 +1607,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.37.0;
MARKETING_VERSION = 7.37.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1731,7 +1731,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1512;
CURRENT_PROJECT_VERSION = 1520;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1768,7 +1768,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.37.0;
MARKETING_VERSION = 7.37.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1800,7 +1800,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1512;
CURRENT_PROJECT_VERSION = 1520;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1835,7 +1835,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.37.0;
MARKETING_VERSION = 7.37.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.37.0",
"version": "7.37.1",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
Loading