Skip to content

Commit ab0f8df

Browse files
author
Ryan Pangrle
committed
Update ADAL podspec. Hack around a CocoaPod issue where it stopped combining public headers.
1 parent 1adabcf commit ab0f8df

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

ADAL.podspec

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "ADAL"
33
s.module_name = "ADAL"
4-
s.version = "2.1.0-beta.5"
4+
s.version = "2.1.0"
55
s.summary = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
66

77
s.description = <<-DESC
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
1515
s.authors = { "Brandon Werner" => "brandwe@microsoft.com" }
1616
s.social_media_url = "https://twitter.com/azuread"
1717
s.platform = :ios, :osx
18-
s.ios.deployment_target = "7.0"
18+
s.ios.deployment_target = "8.0"
1919
s.osx.deployment_target = "10.10"
2020
s.source = {
2121
:git => "https://github.com/AzureAD/azure-activedirectory-library-for-objc.git",
@@ -29,10 +29,12 @@ Pod::Spec.new do |s|
2929
s.source_files = "ADAL/src/**/*.{h,m}"
3030
s.public_header_files = "ADAL/src/public/*.h"
3131

32-
s.ios.public_header_files = "ADAL/src/public/ios/*.h"
32+
# There is currently a bug in CocoaPods where it doesn't combine the public headers
33+
# for both the platform and overall.
34+
s.ios.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/ios/*.h"
3335
s.ios.exclude_files = "ADAL/src/**/mac/*"
3436

35-
s.osx.public_header_files = "ADAL/src/public/mac/*.h"
37+
s.osx.public_header_files = "ADAL/src/public/mac/*.h","ADAL/src/public/*.h"
3638
s.osx.exclude_files = "ADAL/src/**/ios/*"
3739
s.osx.module_map = "ADAL/resources/mac/adal_mac.modulemap"
3840
s.osx.resources = "ADAL/resources/mac/ADCredentialViewController.xib"
@@ -46,23 +48,23 @@ Pod::Spec.new do |s|
4648
ph.ios.source_files = "ADAL/src/public/mac/ADTokenCache.h","ADAL/src/public/ios/*.h"
4749
# This extra nonsense is so that it doesn't make ADTokenCache.h a public header on iOS
4850
# And also doesn't generate a podspec warning
49-
ph.ios.public_header_files = "ADAL/src/public/ios/*.h"
51+
ph.ios.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/ios/*.h"
5052
end
5153

5254
s.subspec 'iosinternalheaders' do |hds|
5355
hds.platform = :osx
5456
hds.osx.source_files = "ADAL/src/workplacejoin/ios/ADWorkplaceJoinConstants.h","ADAL/src/broker/ios/*.h","ADAL/src/public/mac/*.h"
55-
hds.osx.public_header_files = "ADAL/src/public/mac/*.h"
57+
hds.osx.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/mac/*.h"
5658
end
5759

5860
# This is the only way cocoapods has of dealing with a handful of files that don't use
5961
# ARC. Why they make this significantly more difficult, I don't know.
6062
s.subspec 'no-arc' do |noarc|
6163
noarc.platform = :ios
6264
noarc.ios.source_files = "ADAL/src/**/*.h","ADAL/src/broker/ios/ADBrokerKeyHelper.m","ADAL/src/cache/ios/ADKeychainTokenCache.m","ADAL/src/workplacejoin/ios/ADWorkPlaceJoinUtil.m"
63-
noarc.ios.public_header_files = "ADAL/src/public/*.h"
65+
noarc.ios.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/*.h"
6466

65-
noarc.ios.public_header_files = "ADAL/src/public/ios/*.h"
67+
noarc.ios.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/ios/*.h"
6668
noarc.ios.exclude_files = "ADAL/src/**/mac/*"
6769

6870
noarc.requires_arc = false

0 commit comments

Comments
 (0)