Skip to content

Commit

Permalink
Merge pull request #379 from tangem/release/3.11.0
Browse files Browse the repository at this point in the history
Release version 3.11.0
  • Loading branch information
tureck1y authored Oct 28, 2024
2 parents 62df39a + 3e133b7 commit eedb44b
Show file tree
Hide file tree
Showing 258 changed files with 1,028 additions and 1,111 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @tureck1y @tangem/ios-team
* @tureck1y @tangem/ios-sdk-reviewers
79 changes: 40 additions & 39 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@
* 5ba5f600 - (HEAD -> release/3.10.0, tag: develop-290, origin/develop, develop) Merge pull request #351 from tangem/IOS-6522_fix_alert_message
|\
| * 89e12add - IOS-6522 Fix alert message
* 80482b11 - (HEAD -> release/3.11.0, tag: develop-315, origin/develop, develop) Bundle update fastlane
* e8d1df69 - (tag: develop-314) Bundle update
* 673b4979 - (tag: develop-313) Merge pull request #378 from tangem/306.2_into_develop_sync
|\
| * b9175580 - Merge branch 'releases/develop-306' into 306.2_into_develop_sync
|/|
| * fb405124 - (tag: develop-306.2, origin/releases/develop-306) IOS-7734 Ring logic (#377)
| * fbea81eb - (tag: develop-306.1) IOS-8188 Open backup cards data (#375)
* | 9647e7b3 - (tag: develop-312) IOS-8114 Fix key window ios15 (#374)
* | 6e6f6ece - (tag: develop-311) Fix min target for example
* | 59943dfa - (tag: develop-310, tag: 42) IOS-7818 Bump deployment target up to 15 (#370)
* | 8df589c7 - (tag: develop-309) IOS-7148 Handle finalized card (#368)
* | 655fa816 - (tag: develop-308) IOS-7043 Return partial response (#367)
* | 1bcdef8f - (tag: develop-307) IOS-7867 Remove Published from services (#369)
|/
* d3f79b59 - (tag: develop-289, tag: 39) Merge pull request #349 from tangem/IOS-6620_update_privacy_manifest
|\
| * 22f5bcd5 - IOS-6620 Remove unsupported devices
| * 35c8b3d1 - IOS-6620 Add Privacy Manifest into example
| * 9cde2028 - IOS-6620 Update privacy manifest
* b9111e33 - (tag: develop-306) IOS-7810 Add es and sync fr (#366)
* 1b70a89e - (tag: develop-305) IOS-7652 Return the card in the callback (#365)
* 22272c7e - (tag: develop-304) Bump rexml from 3.2.8 to 3.3.6 in /Example (#363)
* 0858064b - (tag: develop-303) Bump rexml from 3.2.8 to 3.3.6 (#364)
* f999a446 - (tag: develop-302) IOS-7595 Sync localizations (#362)
* 883381f4 - (tag: develop-301) Feature/ios 7218 localize (#361)
* c932eefd - (tag: develop-300) Update README.md
* e011ee6f - (tag: develop-299) Update README.md
* d47b7ab6 - (tag: develop-298) Merge pull request #360 from tangem/IOS-6807_add_backupCount
|\
| * 98500c5f - IOS-6807 Add backup cards count
|/
* 7a1ff80a - (tag: develop-288) Merge pull request #347 from tangem/IOS-5193_refactor_extension
* 564a3c01 - (tag: develop-297) Bunldle update
* 1f78dc23 - (tag: develop-296) Merge pull request #358 from tangem/IOS-6859_fix_backup_condition
|\
| * 9cab3b95 - IOS-5193 Refactor extensions
| * 743c1aff - IOS-6859 Check for cards count
|/
* b2b15a41 - (tag: develop-287) Merge pull request #346 from tangem/IOS-5193_add_convenience_method
* d098ce04 - (tag: develop-295) Merge pull request #357 from tangem/IOS-6764_write_backup_data_update
|\
| * 5a77a2f3 - IOS-5193 Add convenience method
| * f66edef6 - IOS-6764 typo
| * 5a847ea9 - IOS-6764 Fix write backup data logic
|/
* 151522de - (tag: develop-286) Merge pull request #344 from tangem/feature/IOS-6296_backup_errors_update
* 659e6ee9 - (tag: develop-294) Merge pull request #356 from tangem/IOS-6784_add_interface_for_key_recovery
|\
| * 36fc8529 - Show separate messages for backupFailedAlreadyCreated and noActiveBackup errors
| * 40207a39 - IOS-6784 Add public key recovery interface
|/
* 24d07f57 - (tag: develop-285, tag: 37) Merge pull request #343 from tangem/IOS-6210_add_logs_backup
* bf339b48 - (tag: develop-293) Merge pull request #355 from tangem/tureck1y-patch-1
|\
| * d2fb40ea - IOS-6210 Add backup logs
| * f33afdcc - Update CODEOWNERS
|/
* 68fcf888 - (tag: develop-284) Merge pull request #341 from tangem/IOS-5986_skip_derivation_errors
|\
| * a205aca6 - Merge branch 'develop' into IOS-5986_skip_derivation_errors
| |\
| |/
|/|
* | 94c1a699 - (tag: develop-283) Merge pull request #342 from tangem/feature/IOS-6085-seed-make-words-count-public
|\ \
| * | 63546fbf - IOS-6085: Make EntropyLength words count public
|/ /
| * 25e83ac5 - IOS-5986 Ignore only concrete errors
| * 2ffb346e - IOS-5986 Skip derivation errors
|/
* 7ddce67f - (tag: develop-282) Merge pull request #338 from tangem/IOS-5674_fix_reader
|\
| * b6fadf9e - Merge branch 'develop' into IOS-5674_fix_reader
| |\
| |/
|/|
* | 5d860b54 - (tag: develop-281, origin/release/0.0.2) Merge pull request #339 from tangem/master
/
* 1517748d - IOS-5674 Refactor code
* 5c1a6ed1 - (origin/release/0.0.3, origin/release/0.0.1) IOS-5674 Fix reader
* ddb32bec - (tag: develop-292) Merge pull request #354 from tangem/master
* 7af7d454 - (tag: develop-291) Merge pull request #353 from tangem/bugfix/IOS-6680_backup_error_text
* 8303991c - Move internalCode check login into main switch
* a58f93f1 - Update noActiveBackup error display logic
* 60602b07 - Update error text for ru locale
2 changes: 1 addition & 1 deletion Example/Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "https://rubygems.org"

gem "cocoapods", "~> 1.14.0"
gem "cocoapods", "~> 1.15.2"
53 changes: 29 additions & 24 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (7.1.2)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
bigdecimal (3.1.5)
bigdecimal (3.1.8)
claide (1.1.0)
cocoapods (1.14.3)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -40,7 +43,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -60,48 +63,50 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.20.0)
json (2.7.2)
logger (1.6.1)
minitest (5.25.1)
molinillo (0.8.0)
mutex_m (0.2.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
rexml (3.3.7)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
securerandom (0.3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.23.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.2, < 4.0)

PLATFORMS
arm64-darwin-21
arm64-darwin-22
x86_64-linux

DEPENDENCIES
cocoapods (~> 1.14.0)
cocoapods (~> 1.15.2)

BUNDLED WITH
2.4.22
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use_frameworks!
install! 'cocoapods', :disable_input_output_paths => true

platform :ios, '13.0'
platform :ios, '15.0'

target 'TangemSdkExample' do
pod 'TangemSdk', :path => '../'
Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- TangemSdk (3.8.0)
- TangemSdk (3.10.0)

DEPENDENCIES:
- TangemSdk (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
TangemSdk: 61e07ff112d4095cfa688fa7d4694e59fa29f76d
TangemSdk: 943099314a07e448307f994dca6217bb27366b66

PODFILE CHECKSUM: fb4745483d8583db4c8ae8aa3ccbde86ca112a6b
PODFILE CHECKSUM: 2d95b9bdd729cea3714086cfd92024ae5b1bb1af

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
16 changes: 13 additions & 3 deletions Example/TangemSdkExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1120;
LastUpgradeCheck = 1510;
LastUpgradeCheck = 1540;
ORGANIZATIONNAME = "Tangem AG";
TargetAttributes = {
5D78C1B5234F435B008D7478 = {
Expand Down Expand Up @@ -522,7 +522,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -578,7 +577,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -598,12 +596,17 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = TangemSDKExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.tangem.TangemSDKExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_INCLUDE_PATHS = "$(inherited)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand All @@ -620,12 +623,17 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = TangemSDKExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.tangem.TangemSDKExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_INCLUDE_PATHS = "$(inherited)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand All @@ -641,6 +649,7 @@
CURRENT_PROJECT_VERSION = 15;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = "TangemSdkExample/Info-Development.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -665,6 +674,7 @@
CURRENT_PROJECT_VERSION = 15;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = "TangemSdkExample/Info-Development.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -17,7 +17,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -47,7 +47,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -64,7 +64,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit eedb44b

Please sign in to comment.