diff --git a/android/app/build.gradle b/android/app/build.gradle index e51e1296f..bbd4e0249 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -79,7 +79,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 - versionName "6.5.7" + versionName "6.5.8" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index f56dc51c5..9598cc94f 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/ios/BlueWallet.xcodeproj/project.pbxproj @@ -83,8 +83,8 @@ B4A29A322B55C990002A67DF /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B468CC34D5B41F3950078EF /* libsqlite3.0.tbd */; }; B4A29A352B55C990002A67DF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6DF25A9E249DB97E001D06F5 /* LaunchScreen.storyboard */; }; B4A29A372B55C990002A67DF /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; - B4A29A3A2B55C990002A67DF /* BlueWalletWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = B40D4E30225841EC00428FCC /* BlueWalletWatch.app */; platformFilter = ios; }; - B4A29A3C2B55C990002A67DF /* Stickers.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6D2A6461258BA92C0092292B /* Stickers.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + B4A29A3A2B55C990002A67DF /* BlueWalletWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = B40D4E30225841EC00428FCC /* BlueWalletWatch.app */; }; + B4A29A3C2B55C990002A67DF /* Stickers.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6D2A6461258BA92C0092292B /* Stickers.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; B4A29A3D2B55C990002A67DF /* WidgetsExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6DD4109C266CADF10087DE03 /* WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; B4AB21072B61D8CA0080440C /* SplashScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4AB21062B61D8CA0080440C /* SplashScreen.swift */; }; B4AB21092B61DC3F0080440C /* SplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = B4AB21082B61DC3F0080440C /* SplashScreen.m */; }; @@ -92,7 +92,7 @@ B4AB225E2B02AD12001F4328 /* XMLParserDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4AB225C2B02AD12001F4328 /* XMLParserDelegate.swift */; }; B4EE583C226703320003363C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E35225841ED00428FCC /* Assets.xcassets */; }; C59F90CE0D04D3E4BB39BC5D /* libPods-BlueWalletUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F02C2F7CA3591E4E0B06EBA /* libPods-BlueWalletUITests.a */; }; - C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + C978A716948AB7DEC5B6F677 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; E5D4794B26781FC0007838C1 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = 6DD410AD266CAF1F0087DE03 /* fiatUnits.json */; }; E5D4794C26781FC1007838C1 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = 6DD410AD266CAF1F0087DE03 /* fiatUnits.json */; }; /* End PBXBuildFile section */ @@ -407,7 +407,7 @@ files = ( 782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */, 764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */, - C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */, + C978A716948AB7DEC5B6F677 /* (null) in Frameworks */, 773E382FE62E836172AAB98B /* libPods-BlueWallet.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1031,7 +1031,7 @@ ); mainGroup = 83CBB9F61A601CBA00E9B192; packageReferences = ( - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */, + 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */, B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */, ); productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; @@ -1536,7 +1536,6 @@ }; B4A29A222B55C990002A67DF /* PBXTargetDependency */ = { isa = PBXTargetDependency; - platformFilter = ios; target = B40D4E2F225841EC00428FCC /* BlueWalletWatch */; targetProxy = B4A29A232B55C990002A67DF /* PBXContainerItemProxy */; }; @@ -1546,7 +1545,6 @@ }; B4A29A262B55C990002A67DF /* PBXTargetDependency */ = { isa = PBXTargetDependency; - platformFilter = ios; target = 6D2A6460258BA92C0092292B /* Stickers */; targetProxy = B4A29A272B55C990002A67DF /* PBXContainerItemProxy */; }; @@ -1602,7 +1600,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; @@ -1627,7 +1625,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1662,7 +1660,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; @@ -1682,7 +1680,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1732,7 +1730,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -1776,7 +1774,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers; @@ -1827,7 +1825,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -1884,7 +1882,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.MarketWidget; @@ -2037,7 +2035,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; @@ -2054,7 +2052,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -2087,7 +2085,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; @@ -2104,7 +2102,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch.extension; @@ -2136,7 +2134,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; @@ -2149,7 +2147,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -2184,7 +2182,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; @@ -2197,7 +2195,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; MTL_FAST_MATH = YES; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch; @@ -2261,7 +2259,7 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 2; + TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = "BlueWallet-NoLDK"; }; name = Debug; @@ -2306,7 +2304,7 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 2; + TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = "BlueWallet-NoLDK"; }; name = Release; @@ -2320,7 +2318,7 @@ CODE_SIGN_ENTITLEMENTS = BlueWallet/BlueWallet.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = A7W54YZ4WU; ENABLE_BITCODE = NO; @@ -2344,7 +2342,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -2360,7 +2358,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "BlueWallet-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "2,6"; + TARGETED_DEVICE_FAMILY = "1,2,6"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -2374,7 +2372,7 @@ CODE_SIGN_ENTITLEMENTS = BlueWallet/BlueWalletRelease.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1703114000; + CURRENT_PROJECT_VERSION = 1703115000; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = A7W54YZ4WU; ENABLE_BITCODE = NO; @@ -2393,7 +2391,7 @@ "$(SDKROOT)/System/iOSSupport/usr/lib/swift", "$(inherited)", ); - MARKETING_VERSION = 6.5.7; + MARKETING_VERSION = 6.5.8; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -2408,7 +2406,7 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "BlueWallet-Bridging-Header.h"; SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "2,6"; + TARGETED_DEVICE_FAMILY = "1,2,6"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -2491,7 +2489,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */ = { + 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/EFPrefix/EFQRCode.git"; requirement = { @@ -2512,7 +2510,7 @@ /* Begin XCSwiftPackageProductDependency section */ 6DFC806F24EA0B6C007B8700 /* EFQRCode */ = { isa = XCSwiftPackageProductDependency; - package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */; + package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */; productName = EFQRCode; }; B41B76842B66B2FF002C48D5 /* Bugsnag */ = { diff --git a/package-lock.json b/package-lock.json index 3deae7d70..135c520c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluewallet", - "version": "6.5.7", + "version": "6.5.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bluewallet", - "version": "6.5.7", + "version": "6.5.8", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index b4ff2fef8..4ad129c7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluewallet", - "version": "6.5.7", + "version": "6.5.8", "license": "MIT", "repository": { "type": "git",