Skip to content

Commit 82037b1

Browse files
committed
Add the Subspecs group to the Mergefile
1 parent 28d3911 commit 82037b1

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

PodMergeExample/MergeFile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,8 @@ group 'AlamofireGroup' do
2424
pod 'AlamofireImage', '3.6.0'
2525
pod 'AlamofireActivityLogger', '2.5.0'
2626
end
27+
28+
group 'Subspecs'
29+
pod 'AppAuth/Core'
30+
pod 'AppAuth/ExternalUserAgent'
31+
end

PodMergeExample/PodMergeExample/ViewController.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import UI.TTTAttributedLabel
1616

1717
import Networking.AFNetworking
1818
import Networking.SDWebImage
19+
import Subspecs.AppAuth
1920

2021
// Merged Swift Pods cannot be import individually, only all or none.
2122
import MergedSwiftPods
@@ -50,6 +51,11 @@ class ViewController: UIViewController {
5051
// SnapKit Usage
5152
let box = UIView()
5253
box.snp.makeConstraints { _ in }
54+
55+
let authorizationEndpoint = URL(string: "https://accounts.google.com/o/oauth2/v2/auth")!
56+
let tokenEndpoint = URL(string: "https://www.googleapis.com/oauth2/v4/token")!
57+
let configuration = OIDServiceConfiguration(authorizationEndpoint: authorizationEndpoint,
58+
tokenEndpoint: tokenEndpoint)
5359
}
5460
}
5561

PodMergeExample/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ target 'PodMergeExample' do
1212
pod 'UI', :path => 'MergedPods/UI'
1313
pod 'AlamofireGroup', :path => 'MergedPods/AlamofireGroup'
1414
pod 'MergedSwiftPods', :path => 'MergedPods/MergedSwiftPods'
15+
pod 'Subspecs', :path => 'MergedPods/Subspecs'
1516
end

PodMergeExample/Podfile.lock

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ PODS:
33
- MergedSwiftPods (1.0.0)
44
- Networking (1.0.0)
55
- Nuke (8.3.1)
6+
- Subspecs (1.0.0)
67
- UI (1.0.0)
78

89
DEPENDENCIES:
910
- AlamofireGroup (from `MergedPods/AlamofireGroup`)
1011
- MergedSwiftPods (from `MergedPods/MergedSwiftPods`)
1112
- Networking (from `MergedPods/Networking`)
1213
- Nuke
14+
- Subspecs (from `MergedPods/Subspecs`)
1315
- UI (from `MergedPods/UI`)
1416

1517
SPEC REPOS:
16-
https://cdn.cocoapods.org/:
18+
trunk:
1719
- Nuke
1820

1921
EXTERNAL SOURCES:
@@ -23,6 +25,8 @@ EXTERNAL SOURCES:
2325
:path: MergedPods/MergedSwiftPods
2426
Networking:
2527
:path: MergedPods/Networking
28+
Subspecs:
29+
:path: MergedPods/Subspecs
2630
UI:
2731
:path: MergedPods/UI
2832

@@ -31,8 +35,9 @@ SPEC CHECKSUMS:
3135
MergedSwiftPods: 86f52fdd7411987cd39e6c80e709ef0de0126fd3
3236
Networking: 844633d13d2328a829083b24ffaee99aea51c1de
3337
Nuke: 85fb80f8df0cb26c28d2f4e0cb7fb93bcd6548d3
38+
Subspecs: 634e12dffc5b250b231410781ffa7b7c2c665b7a
3439
UI: 2aa82721ee430cd2f0ab314904bbe1a281fa2ff9
3540

36-
PODFILE CHECKSUM: 88ffe01efb39e0f819cf88bf11786182ab6f4441
41+
PODFILE CHECKSUM: bd8310add23574b4f0321b19ffa6de67ba186782
3742

3843
COCOAPODS: 1.9.1

0 commit comments

Comments
 (0)