Skip to content

Commit 0fd6f5d

Browse files
authored
[macOS SDK] Add Native Auth features to the macOS framework (#2216)
* Latest commit * Reverted discarded files * Adding missing unit tests * Sort out warning around Swift 4.0 Fixced pob lint for extension * Changed link-time optimization to Incremental
1 parent 3b5fc6e commit 0fd6f5d

File tree

7 files changed

+607
-14
lines changed

7 files changed

+607
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## [TBD]:
22
* Increased macOS minimum version to 10.15 #2220
3+
* Added Native Auth feature for MacOS to interact with the Microsoft Entra ID services
34

45
## [1.4.2]
56
* Fix invalid cert auth request handling (hotfix). (#2278)

MSAL.podspec

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ Pod::Spec.new do |s|
1414
s.social_media_url = "https://twitter.com/azuread"
1515
s.platform = :ios, :osx
1616
s.ios.deployment_target = "14.0"
17-
s.osx.deployment_target = "10.13"
17+
s.osx.deployment_target = "10.15"
1818
s.source = {
1919
:git => "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
2020
:tag => s.version.to_s,
2121
:submodules => true
2222
}
23+
s.swift_versions = '5.0'
2324
s.resource_bundles = {"MSAL" => ["MSAL/PrivacyInfo.xcprivacy"]}
2425
s.default_subspecs ='app-lib'
2526

@@ -29,20 +30,20 @@ Pod::Spec.new do |s|
2930
s.subspec 'app-lib' do |app|
3031
app.pod_target_xcconfig = { 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF' => 'NO' }
3132
app.source_files = "MSAL/src/**/*.{h,m}", "MSAL/IdentityCore/IdentityCore/src/**/*.{h,m}"
32-
app.ios.public_header_files = "MSAL/src/public/*.h","MSAL/src/public/ios/**/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
33-
app.osx.public_header_files = "MSAL/src/public/mac/*.h","MSAL/src/public/*.h", "MSAL/src/public/configuration/**/*.h"
33+
app.ios.public_header_files = "MSAL/src/public/ios/**/*.h", "MSAL/src/public/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
34+
app.osx.public_header_files = "MSAL/src/public/mac/**/*.h", "MSAL/src/public/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
3435
app.ios.exclude_files = "MSAL/src/**/mac/*", "MSAL/IdentityCore/IdentityCore/src/**/mac/*"
35-
app.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*", "MSAL/src/native_auth/**/*"
36+
app.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*"
3637
app.requires_arc = true
3738
end
3839

3940
s.subspec 'native-auth' do |nat|
4041
nat.pod_target_xcconfig = { 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF' => 'NO', 'HEADER_SEARCH_PATHS' => "$SRCROOT/MSAL"}
4142
nat.source_files = "MSAL/src/**/*.{h,m}", "MSAL/src/native_auth/**/*.{h,m,swift}", "MSAL/IdentityCore/IdentityCore/src/**/*.{h,m}", "MSAL/module.modulemap"
4243
nat.ios.public_header_files = "MSAL/src/public/*.h","MSAL/src/public/ios/**/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
43-
nat.osx.public_header_files = "MSAL/src/public/mac/*.h","MSAL/src/public/*.h", "MSAL/src/public/configuration/**/*.h"
44+
nat.osx.public_header_files = "MSAL/src/public/*.h","MSAL/src/public/mac/**/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
4445
nat.ios.exclude_files = "MSAL/src/**/mac/*", "MSAL/IdentityCore/IdentityCore/src/**/mac/*"
45-
nat.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*", "MSAL/src/native_auth/**/*", "MSAL/module.modulemap"
46+
nat.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*"
4647
nat.requires_arc = true
4748
end
4849

@@ -51,13 +52,13 @@ Pod::Spec.new do |s|
5152
ext.pod_target_xcconfig = { 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF' => 'NO' }
5253
ext.compiler_flags = '-DADAL_EXTENSION_SAFE=1'
5354
ext.source_files = "MSAL/src/**/*.{h,m}", "MSAL/IdentityCore/IdentityCore/src/**/*.{h,m}"
54-
ext.ios.public_header_files = "MSAL/src/public/*.h","MSAL/src/public/ios/**/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
55-
ext.osx.public_header_files = "MSAL/src/public/mac/*.h","MSAL/src/public/*.h", "MSAL/src/public/configuration/**/*.h"
55+
ext.ios.public_header_files = "MSAL/src/public/*.h", "MSAL/src/public/ios/**/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
56+
ext.osx.public_header_files = "MSAL/src/public/*.h", "MSAL/src/public/mac/**/*.h", "MSAL/src/public/configuration/**/*.h", "MSAL/src/native_auth/public/*.h"
5657

5758
# There is currently a bug in CocoaPods where it doesn't combine the public headers
5859
# for both the platform and overall.
5960
ext.ios.exclude_files = "MSAL/src/**/mac/*", "MSAL/IdentityCore/IdentityCore/src/**/mac/*"
60-
ext.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*", "MSAL/src/native_auth/**/*"
61+
ext.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*"
6162
ext.requires_arc = true
6263
end
6364

0 commit comments

Comments
 (0)