Skip to content

Commit db5feb0

Browse files
authored
Merge branch 'master' into derived-folder-used
2 parents cf3eb39 + b9d0c54 commit db5feb0

File tree

330 files changed

+38927
-32062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+38927
-32062
lines changed

Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source = 'https://github.com/CocoaPods/Specs.git'
2-
minimum_target = '13.0'
2+
minimum_target = '14.5'
33

44
platform :ios, minimum_target
55

@@ -29,13 +29,13 @@ target 'XcodeBenchmark' do
2929
pod 'MagicalRecord', :git => 'https://github.com/magicalpanda/MagicalRecord'
3030
pod 'RxBluetoothKit'
3131
pod 'ReactiveCocoa', '~> 10.1'
32-
pod 'CryptoSwift', '~> 1.0'
32+
pod 'CryptoSwift', '~> 1.4.0'
3333
pod 'R.swift.Library'
3434
pod 'ObjectMapper'
3535

3636
pod 'TRON', '~> 5.0.0'
37-
pod 'DTCollectionViewManager'
38-
pod 'DTTableViewManager'
37+
pod 'DTCollectionViewManager', '~> 8.0.0'
38+
pod 'DTTableViewManager', '~> 8.0.0'
3939
pod 'Ariadne'
4040
pod 'LoadableViews'
4141

Podfile.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,14 @@ PODS:
240240
- BoringSSL-GRPC/Implementation (0.0.7):
241241
- BoringSSL-GRPC/Interface (= 0.0.7)
242242
- BoringSSL-GRPC/Interface (0.0.7)
243-
- CryptoSwift (1.3.1)
244-
- DTCollectionViewManager (7.2.0):
245-
- DTModelStorage (~> 8.1.0)
246-
- DTModelStorage (8.1.0):
247-
- DTModelStorage/Core (= 8.1.0)
248-
- DTModelStorage/Core (8.1.0)
249-
- DTTableViewManager (7.2.0):
250-
- DTModelStorage (~> 8.1.0)
243+
- CryptoSwift (1.4.0)
244+
- DTCollectionViewManager (8.0.1):
245+
- DTModelStorage (~> 9.0.0)
246+
- DTModelStorage (9.0.1):
247+
- DTModelStorage/Core (= 9.0.1)
248+
- DTModelStorage/Core (9.0.1)
249+
- DTTableViewManager (8.0.1):
250+
- DTModelStorage (~> 9.0)
251251
- Eureka (5.3.2)
252252
- FacebookCore (0.9.0):
253253
- FBSDKCoreKit (~> 5.0)
@@ -512,9 +512,9 @@ PODS:
512512
DEPENDENCIES:
513513
- AFNetworking (~> 4.0)
514514
- Ariadne
515-
- CryptoSwift (~> 1.0)
516-
- DTCollectionViewManager
517-
- DTTableViewManager
515+
- CryptoSwift (~> 1.4.0)
516+
- DTCollectionViewManager (~> 8.0.0)
517+
- DTTableViewManager (~> 8.0.0)
518518
- Eureka (~> 5.3.2)
519519
- FacebookCore
520520
- FacebookLogin
@@ -644,10 +644,10 @@ SPEC CHECKSUMS:
644644
AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
645645
Ariadne: 1449ab4c3aa796d3f2ae14ff325a0f6d67917b95
646646
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
647-
CryptoSwift: f12f037f6d0fcd6d48c96db0071b653de64e6c4d
648-
DTCollectionViewManager: 7a63899c6f917d7d69fa4a186390b77accf91c3c
649-
DTModelStorage: 4d95b242464719155d5068eebb881d96c707a415
650-
DTTableViewManager: 67c48a338dfe7a5d1aa54f2bd6116fce22063909
647+
CryptoSwift: 7cc902df1784de3b389a387756c7d710f197730c
648+
DTCollectionViewManager: 3cef3a7d925dd76035bd9a5cab4aa34ea8a3f46e
649+
DTModelStorage: 114a4b10f7c9600fa52398e4c201893b23e56303
650+
DTTableViewManager: 4dc4ad299b17090c9e53fa22f20f17373e7e136e
651651
Eureka: 1c2b8b5892bfb0e972d0fe05f8c09fd89f8625ec
652652
FacebookCore: ba86524b66cfa86d0f8e65d08faa8504a9f732dd
653653
FacebookLogin: 6cee9fd6e1fe976fe8f7eec199e27b28b14f5d63
@@ -712,6 +712,6 @@ SPEC CHECKSUMS:
712712
TRON: 3cb6a8c19230177c97225860d2ff38b618d51a53
713713
VK-ios-sdk: 62a10b6571fbcda0657f455fedce7fedf55b4cd0
714714

715-
PODFILE CHECKSUM: 7f2b3c92cbd3de2bb8b9bfa82069c33fc588fb46
715+
PODFILE CHECKSUM: 565f3da0ac53c7537087d956a9a46cf71f1932fa
716716

717-
COCOAPODS: 1.9.3
717+
COCOAPODS: 1.10.1

Pods/CryptoSwift/README.md

Lines changed: 89 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/AES.Cryptors.swift

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)