From 88fbc5aa8ec5bbca9327a65e965c106bfcc760c2 Mon Sep 17 00:00:00 2001 From: Vicente Date: Tue, 23 Feb 2021 01:43:44 +0100 Subject: [PATCH] 3.4.2 (#1195) --- android/app/build.gradle | 4 +-- ios/Nightly-Info.plist | 2 +- ios/Staging-Info.plist | 2 +- ios/emurgo.xcodeproj/project.pbxproj | 48 ++++++++++++++-------------- ios/emurgo/Info.plist | 2 +- ios/emurgoTests/Info.plist | 2 +- ios/fastlane/Appfile | 5 +++ ios/fastlane/Fastfile | 4 +++ 8 files changed, 39 insertions(+), 30 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 83005156f3..e6d7f70311 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -128,8 +128,8 @@ android { applicationId "com.emurgo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 142 - versionName "3.4.1" + versionCode 150 + versionName "3.4.2" ndk { abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } diff --git a/ios/Nightly-Info.plist b/ios/Nightly-Info.plist index a350118605..e077a83836 100644 --- a/ios/Nightly-Info.plist +++ b/ios/Nightly-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 149 + 154 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/Staging-Info.plist b/ios/Staging-Info.plist index b6950c5658..48f051670d 100644 --- a/ios/Staging-Info.plist +++ b/ios/Staging-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 149 + 154 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/emurgo.xcodeproj/project.pbxproj b/ios/emurgo.xcodeproj/project.pbxproj index b06f20db64..38d039e4fa 100644 --- a/ios/emurgo.xcodeproj/project.pbxproj +++ b/ios/emurgo.xcodeproj/project.pbxproj @@ -820,7 +820,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -844,7 +844,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -869,7 +869,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -892,7 +892,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -915,7 +915,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -943,7 +943,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -966,7 +966,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -994,7 +994,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1019,7 +1019,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1046,7 +1046,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1069,7 +1069,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1096,7 +1096,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1282,7 +1282,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1306,7 +1306,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1420,7 +1420,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1443,7 +1443,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1503,7 +1503,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1527,7 +1527,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1550,7 +1550,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1574,7 +1574,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1599,7 +1599,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1622,7 +1622,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1645,7 +1645,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 149; + CURRENT_PROJECT_VERSION = 154; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1668,7 +1668,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.4.1; + MARKETING_VERSION = 3.4.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/emurgo/Info.plist b/ios/emurgo/Info.plist index 6b9216d9ff..0fe3fcb501 100644 --- a/ios/emurgo/Info.plist +++ b/ios/emurgo/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 149 + 154 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/emurgoTests/Info.plist b/ios/emurgoTests/Info.plist index 2949c25ba3..7274d0aead 100644 --- a/ios/emurgoTests/Info.plist +++ b/ios/emurgoTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 149 + 154 diff --git a/ios/fastlane/Appfile b/ios/fastlane/Appfile index 19b636d267..f04bfb26a4 100644 --- a/ios/fastlane/Appfile +++ b/ios/fastlane/Appfile @@ -1,4 +1,9 @@ +# For production builds: app_identifier("com.emurgo.yoroi") # The bundle identifier of your app + +# For nightly: +# app_identifier("com.emurgo.yoroi-nightly") + apple_id("vicente@emurgo.io") # Your Apple email address itc_team_id("119491519") # App Store Connect Team ID diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index b228c2690c..149821589c 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -15,6 +15,10 @@ default_platform(:ios) +# when building on BigSur, you may need to use Xcode11 to push to TestFlight +# as Xcode12 is still in beta +# xcode_select("/Applications/Xcode11.3.app") + platform :ios do desc "Push a new staging build to TestFlight" lane :staging do