Skip to content

Commit 9014a67

Browse files
committed
Merge branch 'develop' into trello.com/c/AvS5QpYb
2 parents 25bae9a + da2e542 commit 9014a67

File tree

6 files changed

+259
-3811
lines changed

6 files changed

+259
-3811
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
run: make configure
2828
- name: Setup project dependencies
2929
run: ./scripts/AdamantCLI/adamant-cli setup
30+
- name: Pod Install
31+
run: pod install
3032
- name: Generate mocks for tests
3133
run: ./scripts/AdamantCLI/adamant-cli mocks
3234
- name: Run tests

Adamant.xcodeproj/project.pbxproj

Lines changed: 255 additions & 3700 deletions
Large diffs are not rendered by default.

Adamant/ServiceProtocols/LskApiServiceProtocol.swift

Lines changed: 0 additions & 43 deletions
This file was deleted.

Adamant/ServiceProtocols/TransactionDetailsProtocol.swift

Lines changed: 0 additions & 66 deletions
This file was deleted.

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ post_install do |installer|
1111
installer.generated_projects.each do |project|
1212
project.targets.each do |target|
1313
target.build_configurations.each do |config|
14-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
14+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
1515
end
1616
end
1717
end

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ SPEC CHECKSUMS:
1515
FreakingSimpleRoundImageView: 0d687cb05da8684e85c4c2ae9945bafcbe89d2a2
1616
MyLittlePinpad: d75682f2d817b490c49acc70a9ebd37da752281b
1717

18-
PODFILE CHECKSUM: bd05db6ccb88ff423b34c0943e5f030807b413c4
18+
PODFILE CHECKSUM: 8e9944b5cb2a51ad287543269d72da9608440839
1919

2020
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)