Skip to content
This repository has been archived by the owner on Feb 19, 2024. It is now read-only.

Merge develop with TangemCardSdk 3.5.0 #12

Merged
merged 26 commits into from
Jan 17, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4666a92
Update ios plugin to json-rpc version
tureck1y Aug 30, 2021
41bdf05
AND-1182 added jsonRPC
Aug 30, 2021
f679d87
Merge pull request #5 from tangem/AND-1182_add-jsonrpc
Aug 30, 2021
7d9e89e
Update gitignore
tureck1y Aug 30, 2021
a1ffd27
iOS example. Bump TangemSdk version
tureck1y Aug 31, 2021
d9d8c23
AND-1183 update example app and tangemSdk version
Sep 1, 2021
01f90b7
Merge pull request #6 from tangem/AND-1183_update-example-and-tangemSdk
Sep 1, 2021
7c4a2e5
iOS Example. Bump TangemSdk version
tureck1y Sep 1, 2021
ef1bb19
AND-1183 update tangemSdk version
Sep 1, 2021
6e21559
AND-1183 update tangemSdk version
Sep 2, 2021
c76cf21
temporary fix for release builds
Sep 2, 2021
022f183
AND-1183 update tangemSdk version
Sep 2, 2021
80fd5dc
AND-1183 update tangemSdk version
Sep 3, 2021
01003a3
AND-1186 bump dependencies versions
Sep 7, 2021
e665c46
Merge pull request #7 from tangem/AND-1186_update-dependencies
Sep 7, 2021
5393ae5
AND-800 update sdk version
Sep 14, 2021
189b8b4
Merge pull request #8 from tangem/AND-800_update-sdk-version
Sep 14, 2021
54925a6
IOS-1015 Update TangemSdk and example
tureck1y Sep 14, 2021
93f84a6
Merge pull request #9 from tangem/IOS-1015_update_tangemSdk
tureck1y Sep 14, 2021
11342a4
AND-800 downgraded the lower bounds of the dart sdk version to 2.12
Sep 15, 2021
36e4ce3
AND-800 bump tangemSdk version
Sep 15, 2021
a3dbb60
AND-1439 bump tangemCardSdk version to 3.4.1. Bump environment.sdk >=…
Dec 29, 2021
0ff15e7
IOS-1310 Bump CSS
tureck1y Dec 30, 2021
57123da
AND-1439 bump tangemCardSdk version to 3.5.0
Dec 31, 2021
6d94cca
AND-1439 up version to 0.7.0
Dec 31, 2021
8759421
AND-1439 fixes for publication
Dec 31, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ target 'Runner' do
use_frameworks!
use_modular_headers!

pod 'TangemSdk', :git => 'https://github.com/Tangem/tangem-sdk-ios.git', :tag => 'develop-55'
#pod 'TangemSdk', :git => 'https://github.com/Tangem/tangem-sdk-ios.git', :tag => 'develop-76'

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end
Expand Down
29 changes: 14 additions & 15 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ PODS:
- Flutter (1.0.0)
- fluttertoast (0.0.2):
- Flutter
- Toast
- tangem_sdk (0.1.0):
- Flutter
- TangemSdk
- TangemSdk (3.0.2)
- TangemSdk (~> 3.1.0)
- TangemSdk (3.1.0)
- Toast (4.0.0)

DEPENDENCIES:
- Flutter (from `Flutter`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- tangem_sdk (from `.symlinks/plugins/tangem_sdk/ios`)
- TangemSdk (from `https://github.com/Tangem/tangem-sdk-ios.git`, tag `develop-55`)

SPEC REPOS:
trunk:
- TangemSdk
- Toast

EXTERNAL SOURCES:
Flutter:
Expand All @@ -20,21 +26,14 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/fluttertoast/ios"
tangem_sdk:
:path: ".symlinks/plugins/tangem_sdk/ios"
TangemSdk:
:git: https://github.com/Tangem/tangem-sdk-ios.git
:tag: develop-55

CHECKOUT OPTIONS:
TangemSdk:
:git: https://github.com/Tangem/tangem-sdk-ios.git
:tag: develop-55

SPEC CHECKSUMS:
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
tangem_sdk: 97097cf99df1252c4973a7bebddbf9010595075c
TangemSdk: 7a03e776285f3582e36fa9f6036ad5800c9ae9f1
fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
tangem_sdk: 6eaaed5e7037bd513d3e740ac76cf5b89cafb3e7
TangemSdk: 1d84c9088994f712e94afec6f41a41ae690ebb50
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196

PODFILE CHECKSUM: 66136e2584a224afef9ed7ae42fa4b2014d38719
PODFILE CHECKSUM: 2b113425fe0508a6c735d13359e7ada4cb88df05

COCOAPODS: 1.10.1
2 changes: 2 additions & 0 deletions example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,14 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/TangemSdk/TangemSdk.framework",
"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
"${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
"${BUILT_PRODUCTS_DIR}/tangem_sdk/tangem_sdk.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TangemSdk.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/tangem_sdk.framework",
);
Expand Down
2 changes: 1 addition & 1 deletion ios/tangem_sdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ TangemSdk plugin for integration into flutter projects
# Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.swift_version = '5.0'
s.dependency 'TangemSdk'
s.dependency 'TangemSdk', '~> 3.1.0'
end