Skip to content

Commit 1ad5690

Browse files
author
Siddharth Gupta
committed
Add swift_version! flag in Example Project
1 parent a56b832 commit 1ad5690

File tree

4 files changed

+27
-9
lines changed

4 files changed

+27
-9
lines changed

PodMergeExample/MergeFile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ group 'UI'
1111
end
1212

1313
group 'MergedSwiftPods' do
14-
pod 'Alamofire'
14+
pod 'SnapKit'
1515
pod 'SwiftyJSON'
1616
end
17+
18+
group 'AlamofireGroup' do
19+
swift_version! '5.0'
20+
has_dependencies!
21+
22+
pod 'Alamofire'
23+
pod 'AlamofireImage'
24+
pod 'AlamofireActivityLogger'
25+
end

PodMergeExample/PodMergeExample/ViewController.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ import Networking.SDWebImage
1919

2020
// Merged Swift Pods cannot be import individually, only all or none.
2121
import MergedSwiftPods
22+
import AlamofireGroup
2223

2324
// Unmerged pods are unaffected
24-
import SnapKit
25+
import Nuke
2526

2627
// Cannot import individual pods anymore, uncomment to check:
2728
// import MBProgressHUD
@@ -41,6 +42,8 @@ class ViewController: UIViewController {
4142
let error: AFError = .invalidURL(url: "")
4243
let json: SwiftyJSONError = .elementTooDeep
4344

45+
let request = ImageRequest(url: URL(string: "https://github.com/grab/cocoapods-pod-merge")!)
46+
4447
override func viewDidLoad() {
4548
super.viewDidLoad()
4649

PodMergeExample/Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ plugin 'cocoapods-pod-merge'
55
target 'PodMergeExample' do
66
use_frameworks!
77

8-
pod 'SnapKit' # Unmerged pods are unaffected
8+
pod 'Nuke' # Unmerged pods are unaffected
99

1010
# Merged Pods:
1111
pod 'Networking', :path => 'MergedPods/Networking'
1212
pod 'UI', :path => 'MergedPods/UI'
13+
pod 'AlamofireGroup', :path => 'MergedPods/AlamofireGroup'
1314
pod 'MergedSwiftPods', :path => 'MergedPods/MergedSwiftPods'
1415
end

PodMergeExample/Podfile.lock

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
PODS:
2+
- AlamofireGroup (1.0.0)
23
- MergedSwiftPods (1.0.0)
34
- Networking (1.0.0)
4-
- SnapKit (5.0.1)
5+
- Nuke (8.3.1)
56
- UI (1.0.0)
67

78
DEPENDENCIES:
9+
- AlamofireGroup (from `MergedPods/AlamofireGroup`)
810
- MergedSwiftPods (from `MergedPods/MergedSwiftPods`)
911
- Networking (from `MergedPods/Networking`)
10-
- SnapKit
12+
- Nuke
1113
- UI (from `MergedPods/UI`)
1214

1315
SPEC REPOS:
1416
https://cdn.cocoapods.org/:
15-
- SnapKit
17+
- Nuke
1618

1719
EXTERNAL SOURCES:
20+
AlamofireGroup:
21+
:path: MergedPods/AlamofireGroup
1822
MergedSwiftPods:
1923
:path: MergedPods/MergedSwiftPods
2024
Networking:
@@ -23,11 +27,12 @@ EXTERNAL SOURCES:
2327
:path: MergedPods/UI
2428

2529
SPEC CHECKSUMS:
26-
MergedSwiftPods: 3eb331e4e97471520b4d82f76615095cc101fce3
30+
AlamofireGroup: 113f3ab321b31b75a748378909f3f96305b771a2
31+
MergedSwiftPods: 86f52fdd7411987cd39e6c80e709ef0de0126fd3
2732
Networking: 844633d13d2328a829083b24ffaee99aea51c1de
28-
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
33+
Nuke: 85fb80f8df0cb26c28d2f4e0cb7fb93bcd6548d3
2934
UI: 2aa82721ee430cd2f0ab314904bbe1a281fa2ff9
3035

31-
PODFILE CHECKSUM: 23e410ea04d160bdbb75d10ffd2b294046a2fa82
36+
PODFILE CHECKSUM: 88ffe01efb39e0f819cf88bf11786182ab6f4441
3237

3338
COCOAPODS: 1.8.1

0 commit comments

Comments
 (0)