Skip to content

Commit 2ced8a4

Browse files
committed
Update the ios.deployment_target from the Podfile
The `ios.deployment_target` was set to a default value causing that pods with a minimum deployment target greater than iOS 8 were throwing errors.
1 parent 5092d1f commit 2ced8a4

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

PodMergeExample/MergeFile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ end
1212

1313
group 'MergedSwiftPods' do
1414
pod 'SnapKit', '5.0.1'
15+
pod 'Kingfisher', '~> 5.0'
1516
pod 'SwiftyJSON', '5.0.0'
17+
1618
end
1719

1820
group 'AlamofireGroup' do

PodMergeExample/PodMergeExample/ViewController.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,17 @@ class ViewController: UIViewController {
4444

4545
let request = ImageRequest(url: URL(string: "https://github.com/grab/cocoapods-pod-merge")!)
4646

47+
let url = URL(string: "https://example.com/image.png")
48+
4749
override func viewDidLoad() {
4850
super.viewDidLoad()
4951

5052
// SnapKit Usage
5153
let box = UIView()
5254
box.snp.makeConstraints { _ in }
55+
56+
let imageView = UIImageView(frame: .zero)
57+
imageView.kf.setImage(with: url)
5358
}
5459
}
5560

PodMergeExample/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DEPENDENCIES:
1313
- UI (from `MergedPods/UI`)
1414

1515
SPEC REPOS:
16-
https://cdn.cocoapods.org/:
16+
trunk:
1717
- Nuke
1818

1919
EXTERNAL SOURCES:
@@ -27,11 +27,11 @@ EXTERNAL SOURCES:
2727
:path: MergedPods/UI
2828

2929
SPEC CHECKSUMS:
30-
AlamofireGroup: 113f3ab321b31b75a748378909f3f96305b771a2
31-
MergedSwiftPods: 86f52fdd7411987cd39e6c80e709ef0de0126fd3
32-
Networking: 844633d13d2328a829083b24ffaee99aea51c1de
30+
AlamofireGroup: c7af15f9d1f646dd2d5793dd470efc1942bfc20b
31+
MergedSwiftPods: 90c36ec9c0177f0cd19776a428e6e22d6df267a4
32+
Networking: 63b67ccfde89eaf06f6e01218d294ec2c8b6c628
3333
Nuke: 85fb80f8df0cb26c28d2f4e0cb7fb93bcd6548d3
34-
UI: 2aa82721ee430cd2f0ab314904bbe1a281fa2ff9
34+
UI: 82623fb675f17ffe5a5cd00602619ee4f2040cd7
3535

3636
PODFILE CHECKSUM: 88ffe01efb39e0f819cf88bf11786182ab6f4441
3737

lib/cocoapods-pod-merge/Main.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def merge(merged_framework_name, group_contents, podfile_info)
337337

338338
# Create the local podspec
339339
Pod::UI.puts "\tCreating Podspec for the merged framework".magenta
340-
create_podspec(merged_framework_name, pods_to_merge, PodspecInfo.new(frameworks.uniq, prefix_header_contents.uniq, private_header_files.uniq, resources.uniq, script_phases.uniq, compiler_flags.uniq, libraries.uniq, prepare_command.uniq, resource_bundles, vendored_libraries.uniq, swift_version), mixed_language_group)
340+
create_podspec(merged_framework_name, pods_to_merge, PodspecInfo.new(frameworks.uniq, prefix_header_contents.uniq, private_header_files.uniq, resources.uniq, script_phases.uniq, compiler_flags.uniq, libraries.uniq, prepare_command.uniq, resource_bundles, vendored_libraries.uniq, swift_version), mixed_language_group, podfile_info)
341341

342342
Pod::UI.puts 'Cleaning up cache'.cyan
343343
FileUtils.rm_rf(CacheDirectory)
@@ -487,7 +487,7 @@ def generate_module_map(merged_framework_name, public_headers)
487487
module_map.close
488488
end
489489

490-
def create_podspec(merged_framework_name, pods_to_merge, podspec_info, mixed_language_group)
490+
def create_podspec(merged_framework_name, pods_to_merge, podspec_info, mixed_language_group, podfile_info)
491491
frameworks = podspec_info.frameworks
492492
prefix_header_contents = podspec_info.prefix_header_contents
493493
private_header_files = podspec_info.private_header_files
@@ -499,6 +499,7 @@ def create_podspec(merged_framework_name, pods_to_merge, podspec_info, mixed_lan
499499
resource_bundles = podspec_info.resource_bundles
500500
vendored_libraries = podspec_info.vendored_libraries
501501
swift_versions = podspec_info.swift_versions
502+
ios_deployment_target = podfile_info.platforms.find { |platform| platform.include? "ios"}.split(',')[1]
502503

503504
mergedPodspec = %(
504505
Pod::Spec.new do |s|
@@ -510,7 +511,7 @@ def create_podspec(merged_framework_name, pods_to_merge, podspec_info, mixed_lan
510511
s.license = { :type => 'MIT', :text => 'Merged Pods by cocoapods-pod-merge plugin ' }
511512
s.author = { 'GrabTaxi Pte Ltd' => '[email protected]' }
512513
s.source = { :git => 'https://github.com/grab/cocoapods-pod-merge', :tag => '1.0.0' }
513-
s.ios.deployment_target = '8.0'
514+
s.ios.deployment_target = #{ios_deployment_target}
514515
s.source_files = 'Sources/**/*.{h,m,mm,swift}'
515516
)
516517

0 commit comments

Comments
 (0)