Skip to content

Commit

Permalink
Merge pull request #392 from nova-wallet/develop
Browse files Browse the repository at this point in the history
v3.7
  • Loading branch information
ERussel authored Sep 8, 2022
2 parents cf1386e + cfd5086 commit 6348c84
Show file tree
Hide file tree
Showing 238 changed files with 7,834 additions and 605 deletions.
1 change: 0 additions & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
${{ runner.os }}-pods-
- name: Install Cocoapods
if: steps.cache-cocoapods.outputs.cache-hit != 'true'
run: pod install --repo-update

- name: Test
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
${{ runner.os }}-pods-
- name: Install Cocoapods
if: steps.cache-cocoapods.outputs.cache-hit != 'true'
run: pod install --repo-update

- name: Set env BUILD_PROVISION_PROFILE_BASE64
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
${{ runner.os }}-pods-
- name: Install Cocoapods
if: steps.cache-cocoapods.outputs.cache-hit != 'true'
run: pod install --repo-update

- name: Set Default Scheme
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/push_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
${{ runner.os }}-pods-
- name: Install Cocoapods
if: steps.cache-cocoapods.outputs.cache-hit != 'true'
run: pod install --repo-update

# Source https://docs.github.com/en/actions/deployment/installing-an-apple-certificate-on-macos-runners-for-xcode-development#add-a-step-to-your-workflow
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '13.0'
abstract_target 'novawalletAll' do
use_frameworks!

pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.3.0'
pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.4.0'
pod 'SwiftLint'
pod 'R.swift', :inhibit_warnings => true
pod 'SoraKeystore', '~> 1.0.0'
Expand All @@ -27,7 +27,7 @@ abstract_target 'novawalletAll' do
inherit! :search_paths

pod 'Cuckoo'
pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.3.0'
pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.4.0'
pod 'SoraFoundation', '~> 1.0.0'
pod 'R.swift', :inhibit_warnings => true
pod 'FireMock', :inhibit_warnings => true
Expand Down
27 changes: 14 additions & 13 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ PODS:
- SoraUI/Skrull (1.11.1)
- Sourcery (1.4.1)
- Starscream (4.0.5)
- SubstrateSdk (1.3.0):
- SubstrateSdk (1.4.0):
- BigInt (~> 5.0)
- IrohaCrypto/ed25519 (~> 0.9.0)
- IrohaCrypto/Scrypt (~> 0.9.0)
Expand Down Expand Up @@ -137,38 +137,39 @@ DEPENDENCIES:
- SoraUI (from `https://github.com/ERussel/UIkit-iOS.git`, tag `1.11.1`)
- Sourcery (~> 1.4)
- Starscream (from `https://github.com/ERussel/Starscream.git`, tag `4.0.5`)
- SubstrateSdk (from `https://github.com/nova-wallet/substrate-sdk-ios.git`, tag `1.3.0`)
- SubstrateSdk (from `https://github.com/nova-wallet/substrate-sdk-ios.git`, tag `1.4.0`)
- SVGKit (from `https://github.com/SVGKit/SVGKit.git`, tag `3.0.0`)
- SwiftFormat/CLI (~> 0.47.13)
- SwiftLint
- SwiftRLP (from `https://github.com/ERussel/SwiftRLP.git`)
- SwiftyBeaver

SPEC REPOS:
trunk:
https://github.com/CocoaPods/Specs.git:
- BigInt
- IrohaCrypto
- keccak.c
- scrypt.c
- secp256k1.c
- TweetNacl
- xxHash-Swift
trunk:
- Charts
- CocoaLumberjack
- Cuckoo
- FireMock
- IrohaCrypto
- keccak.c
- Kingfisher
- R.swift
- R.swift.Library
- ReachabilitySwift
- RobinHood
- scrypt.c
- secp256k1.c
- SnapKit
- SoraFoundation
- SoraKeystore
- Sourcery
- SwiftFormat
- SwiftLint
- SwiftyBeaver
- TweetNacl
- xxHash-Swift

EXTERNAL SOURCES:
CommonWallet:
Expand All @@ -182,7 +183,7 @@ EXTERNAL SOURCES:
:tag: 4.0.5
SubstrateSdk:
:git: https://github.com/nova-wallet/substrate-sdk-ios.git
:tag: 1.3.0
:tag: 1.4.0
SVGKit:
:git: https://github.com/SVGKit/SVGKit.git
:tag: 3.0.0
Expand All @@ -201,7 +202,7 @@ CHECKOUT OPTIONS:
:tag: 4.0.5
SubstrateSdk:
:git: https://github.com/nova-wallet/substrate-sdk-ios.git
:tag: 1.3.0
:tag: 1.4.0
SVGKit:
:git: https://github.com/SVGKit/SVGKit.git
:tag: 3.0.0
Expand Down Expand Up @@ -231,7 +232,7 @@ SPEC CHECKSUMS:
SoraUI: e5ceb2cffe40145e589aa464e2e0a8d054011e0b
Sourcery: db66600e8b285c427701821598d07cf3c7e6c476
Starscream: 8cc648110705c09a15f0de84352c7f9595b7cb05
SubstrateSdk: 46a442c9b42c8e22b144ad1cb24127415bfd6f68
SubstrateSdk: 2335047caaddbd33b4cb38e0604d325989d1023c
SVGKit: 132b010efbf57ec345309fe4a7f627c0a40c5d63
SwiftFormat: 73573b89257437c550b03d934889725fbf8f75e5
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
Expand All @@ -240,6 +241,6 @@ SPEC CHECKSUMS:
TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7

PODFILE CHECKSUM: 025707058333b98cf537c9612cc7b2efc5e099aa
PODFILE CHECKSUM: 7f7a144b623e89cffdcf1bdc1bdbc2d88d2493df

COCOAPODS: 1.11.3
Loading

0 comments on commit 6348c84

Please sign in to comment.