diff --git a/android/app/build.gradle b/android/app/build.gradle index 3de3dcca96..cd5c94f40f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,8 +143,8 @@ android { applicationId "com.emurgo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 220 - versionName "4.0.2" + versionCode 233 + versionName "4.1.0" ndk { abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } diff --git a/ios/Nightly-Info.plist b/ios/Nightly-Info.plist index 0a53ee5ff2..eba86aadae 100644 --- a/ios/Nightly-Info.plist +++ b/ios/Nightly-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 220 + 233 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS @@ -63,6 +63,19 @@ Enable speech recognition RCTAsyncStorageExcludeFromBackup + UIAppFonts + + Rubik-Bold.ttf + Rubik-BoldItalic.ttf + Rubik-Italic.ttf + Rubik-Light.ttf + Rubik-LightItalic.ttf + Rubik-Medium.ttf + Rubik-MediumItalic.ttf + Rubik-Regular.ttf + Rubik-SemiBold.ttf + Rubik-SemiBoldItalic.ttf + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities @@ -79,18 +92,5 @@ Light UIViewControllerBasedStatusBarAppearance - UIAppFonts - - Rubik-Bold.ttf - Rubik-BoldItalic.ttf - Rubik-Italic.ttf - Rubik-Light.ttf - Rubik-LightItalic.ttf - Rubik-Medium.ttf - Rubik-MediumItalic.ttf - Rubik-Regular.ttf - Rubik-SemiBold.ttf - Rubik-SemiBoldItalic.ttf - diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4b0b3b53db..40de4f0511 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -552,7 +552,7 @@ SPEC CHECKSUMS: BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 + DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 @@ -563,7 +563,7 @@ SPEC CHECKSUMS: Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d Folly: b73c3869541e86821df3c387eb0af5f65addfab4 - glog: 1f3da668190260b06b429bb211bfbee5cd790c28 + glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 MultiplatformBleAdapter: 975cfb2a333b2c42b7a11628bd100ccb61872da2 OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd Permission-Camera: 5d2aaf95592660b6dcb5e8d1d90ed5d0156cad02 diff --git a/ios/Staging-Info.plist b/ios/Staging-Info.plist index 8947f2f110..d01e3d6fc0 100644 --- a/ios/Staging-Info.plist +++ b/ios/Staging-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 220 + 233 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS @@ -59,6 +59,19 @@ Enable photo library NSSpeechRecognitionUsageDescription Enable speech recognition + UIAppFonts + + Rubik-Bold.ttf + Rubik-BoldItalic.ttf + Rubik-Italic.ttf + Rubik-Light.ttf + Rubik-LightItalic.ttf + Rubik-Medium.ttf + Rubik-MediumItalic.ttf + Rubik-Regular.ttf + Rubik-SemiBold.ttf + Rubik-SemiBoldItalic.ttf + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities @@ -75,18 +88,5 @@ Light UIViewControllerBasedStatusBarAppearance - UIAppFonts - - Rubik-Bold.ttf - Rubik-BoldItalic.ttf - Rubik-Italic.ttf - Rubik-Light.ttf - Rubik-LightItalic.ttf - Rubik-Medium.ttf - Rubik-MediumItalic.ttf - Rubik-Regular.ttf - Rubik-SemiBold.ttf - Rubik-SemiBoldItalic.ttf - diff --git a/ios/emurgo.xcodeproj/project.pbxproj b/ios/emurgo.xcodeproj/project.pbxproj index 17c6ae57b5..c78241799b 100644 --- a/ios/emurgo.xcodeproj/project.pbxproj +++ b/ios/emurgo.xcodeproj/project.pbxproj @@ -971,7 +971,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -995,7 +995,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1020,7 +1020,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1043,7 +1043,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1066,7 +1066,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1094,7 +1094,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1117,7 +1117,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1145,7 +1145,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1170,7 +1170,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1197,7 +1197,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1220,7 +1220,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1247,7 +1247,7 @@ "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", ); - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1455,7 +1455,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1479,7 +1479,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1601,7 +1601,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1624,7 +1624,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1684,7 +1684,7 @@ BUNDLE_DISPLAY_NAME = Yoroi; BUNDLE_ID_SUFFIX = ""; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1708,7 +1708,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1731,7 +1731,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1755,7 +1755,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1780,7 +1780,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1803,7 +1803,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1826,7 +1826,7 @@ BUNDLE_DISPLAY_NAME = "Yoroi Staging"; BUNDLE_ID_SUFFIX = .staging; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 220; + CURRENT_PROJECT_VERSION = 233; DEVELOPMENT_TEAM = F8NVT2G2L4; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -1849,7 +1849,7 @@ INFOPLIST_PREPROCESS = NO; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 4.0.2; + MARKETING_VERSION = 4.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/emurgo/Info.plist b/ios/emurgo/Info.plist index 164e1724a8..f4a0f8e27e 100644 --- a/ios/emurgo/Info.plist +++ b/ios/emurgo/Info.plist @@ -2,8 +2,8 @@ - - + + CFBundleDevelopmentRegion en CFBundleDisplayName @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 220 + 233 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS @@ -65,6 +65,19 @@ Enable speech recognition RCTAsyncStorageExcludeFromBackup + UIAppFonts + + Rubik-Bold.ttf + Rubik-BoldItalic.ttf + Rubik-Italic.ttf + Rubik-Light.ttf + Rubik-LightItalic.ttf + Rubik-Medium.ttf + Rubik-MediumItalic.ttf + Rubik-Regular.ttf + Rubik-SemiBold.ttf + Rubik-SemiBoldItalic.ttf + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities @@ -81,18 +94,5 @@ Light UIViewControllerBasedStatusBarAppearance - UIAppFonts - - Rubik-Bold.ttf - Rubik-BoldItalic.ttf - Rubik-Italic.ttf - Rubik-Light.ttf - Rubik-LightItalic.ttf - Rubik-Medium.ttf - Rubik-MediumItalic.ttf - Rubik-Regular.ttf - Rubik-SemiBold.ttf - Rubik-SemiBoldItalic.ttf - diff --git a/ios/emurgoTests/Info.plist b/ios/emurgoTests/Info.plist index 7adcee6c7a..98e3d40441 100644 --- a/ios/emurgoTests/Info.plist +++ b/ios/emurgoTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 220 + 233