From ade0934d3541460994fc92331fc83a92ecc914d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Mi=C3=B1o?= Date: Wed, 7 Apr 2021 18:30:55 -0400 Subject: [PATCH] v2.1.0 (#2481) * bumps * changelog --- CHANGELOG.md | 22 ++++++++++++++++++++++ android/app/build.gradle | 4 ++-- ios/MetaMask.xcodeproj/project.pbxproj | 8 ++++---- package.json | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90310404a41..a0122d10dfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## Current Develop Branch + +## v2.1.0 - Apr 12 2021 +- [#2456](https://github.com/MetaMask/metamask-mobile/pull/2456): Analytics v2 (priority 1) +- [#2408](https://github.com/MetaMask/metamask-mobile/pull/2408): Fix/gas estimations +- [#2479](https://github.com/MetaMask/metamask-mobile/pull/2479): remove controllers tgz +- [#2441](https://github.com/MetaMask/metamask-mobile/pull/2441): Improvement/assets by chainid +- [#2442](https://github.com/MetaMask/metamask-mobile/pull/2442): Improvement/chain ticker +- [#2372](https://github.com/MetaMask/metamask-mobile/pull/2372): Remove instapay +- [#2467](https://github.com/MetaMask/metamask-mobile/pull/2467): Fix iOS build +- [#2084](https://github.com/MetaMask/metamask-mobile/pull/2084): Migrate from AsyncStorage to FileStorage +- [#2443](https://github.com/MetaMask/metamask-mobile/pull/2443): Update terms and privacy links +- [#2318](https://github.com/MetaMask/metamask-mobile/pull/2318): Add custom network rpc API +- [#2306](https://github.com/MetaMask/metamask-mobile/pull/2306): Feature/high gas warn +- [#2463](https://github.com/MetaMask/metamask-mobile/pull/2463): update pods +- [#2448](https://github.com/MetaMask/metamask-mobile/pull/2448): Add resolution for netmask +- [#2445](https://github.com/MetaMask/metamask-mobile/pull/2445): Add resolution for y18n +- [#2404](https://github.com/MetaMask/metamask-mobile/pull/2404): Bump react-native-branch from 5.0.0 to 5.0.1 +- [#2439](https://github.com/MetaMask/metamask-mobile/pull/2439): json-rpc-engine@6.1.0 +- [#2413](https://github.com/MetaMask/metamask-mobile/pull/2413): remove "git add" per husky warning +- [#2431](https://github.com/MetaMask/metamask-mobile/pull/2431): Update BN import + ## v2.0.1 - Mar 24 2021 - [#2430](https://github.com/MetaMask/metamask-mobile/pull/2430): Fix/send to style - [#2426](https://github.com/MetaMask/metamask-mobile/pull/2426): bugfix/allow seedphrases when locked diff --git a/android/app/build.gradle b/android/app/build.gradle index bd75d063563..c2f664d7216 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -166,8 +166,8 @@ android { applicationId "io.metamask" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 49 - versionName "2.0.1" + versionCode 50 + versionName "2.1.0" multiDexEnabled true testBuildType System.getProperty('testBuildType', 'debug') missingDimensionStrategy "minReactNative", "minReactNative46" diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index d610c89a9bf..1fdbd817742 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -849,7 +849,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 605; + CURRENT_PROJECT_VERSION = 606; DEAD_CODE_STRIPPING = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -882,7 +882,7 @@ "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); LLVM_LTO = YES; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.1.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -913,7 +913,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 605; + CURRENT_PROJECT_VERSION = 606; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; FRAMEWORK_SEARCH_PATHS = ( @@ -945,7 +945,7 @@ "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); LLVM_LTO = YES; - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.1.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)", diff --git a/package.json b/package.json index c83ce6f9832..c6693548d73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "2.0.1", + "version": "2.1.0", "private": true, "scripts": { "watch": "./scripts/build.sh watcher watch",