Skip to content

Commit 0a829d3

Browse files
authored
Merge pull request #644 from AzureAD/hotfix/build-ios-in-cpp-repo
Hotfix/build ios in cpp repo
2 parents f038109 + 49af094 commit 0a829d3

File tree

42 files changed

+161
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+161
-148
lines changed

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

IdentityCore/MSIDTestsHostApp/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ @interface AppDelegate ()
2929

3030
@implementation AppDelegate
3131

32-
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
32+
- (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWithOptions:(__unused NSDictionary *)launchOptions
3333
{
3434
return YES;
3535
}

IdentityCore/src/cache/MSIDKeychainTokenCache.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ - (BOOL)saveWipeInfoWithContext:(id<MSIDRequestContext>)context
584584
}
585585

586586
- (NSDictionary *)wipeInfo:(id<MSIDRequestContext>)context
587-
error:(NSError **)error;
587+
error:(NSError **)error
588588
{
589589
NSMutableDictionary *query = [self.defaultWipeQuery mutableCopy];
590590
[query setObject:@YES forKey:(id)kSecReturnData];
@@ -677,7 +677,7 @@ - (MSIDCacheKey *)overrideTokenKey:(MSIDCacheKey *)key
677677
return key;
678678
}
679679

680-
- (NSString *)extractAppKey:(NSString *)cacheKeyString
680+
- (NSString *)extractAppKey:(__unused NSString *)cacheKeyString
681681
{
682682
// no app key needs to be set here
683683
return nil;

IdentityCore/src/cache/mac/MSIDMacKeychainTokenCache.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,8 @@ - (MSIDCredentialCacheItem *)tokenWithKey:(MSIDCacheKey *)key
645645
}
646646

647647
- (NSMutableArray<MSIDCredentialCacheItem *> *)filterTokenItemsFromKeychainItems:(NSArray *)items
648-
serializer:(id<MSIDCacheItemSerializing>)serializer
649-
context:(id<MSIDRequestContext>)context
648+
serializer:(__unused id<MSIDCacheItemSerializing>)serializer
649+
context:(__unused id<MSIDRequestContext>)context
650650
{
651651
NSMutableArray *tokenItems = [[NSMutableArray<MSIDCredentialCacheItem *> alloc] initWithCapacity:items.count];
652652

@@ -685,7 +685,7 @@ - (MSIDCredentialCacheItem *)tokenWithKey:(MSIDCacheKey *)key
685685
*/
686686
- (BOOL)removeAllMatchingTokens:(MSIDCacheKey *)key
687687
context:(id<MSIDRequestContext>)context
688-
serializer:(id<MSIDCacheItemSerializing>)serializer
688+
serializer:(__unused id<MSIDCacheItemSerializing>)serializer
689689
isShared:(BOOL)isShared
690690
error:(NSError * _Nullable * _Nullable)error
691691
{
@@ -889,7 +889,7 @@ - (BOOL)removeItemsWithKey:(MSIDCacheKey *)key
889889
return [self removeStorageItem:key.isShared context:context error:error];
890890
}
891891

892-
- (NSDictionary *)primaryAttributesForItem:(BOOL)isShared context:(id<MSIDRequestContext>)context error:(NSError **)error
892+
- (NSDictionary *)primaryAttributesForItem:(BOOL)isShared context:(__unused id<MSIDRequestContext>)context error:(__unused NSError **)error
893893
{
894894
NSMutableDictionary *attributes = [NSMutableDictionary dictionary];
895895

IdentityCore/src/cache/mac/MSIDMacLegacyCachePersistenceHandler.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ - (void)willAccessCache:(nonnull MSIDMacTokenCache *)cache
6565
[self readAndDeserializeWithCache:cache];
6666
}
6767

68-
- (void)didAccessCache:(nonnull MSIDMacTokenCache *)cache
68+
- (void)didAccessCache:(nonnull __unused MSIDMacTokenCache *)cache
6969
{
7070

7171
}

IdentityCore/src/controllers/ios/MSIDBrokerInteractiveController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ + (void)startTrackingAppState
346346

347347
#if !AD_BROKER
348348

349-
+ (void)appEnteredForeground:(NSNotification *)notification
349+
+ (void)appEnteredForeground:(__unused NSNotification *)notification
350350
{
351351
[[NSNotificationCenter defaultCenter] removeObserver:self
352352
name:UIApplicationWillEnterForegroundNotification
@@ -360,7 +360,7 @@ + (void)appEnteredForeground:(NSNotification *)notification
360360
name:UIApplicationDidBecomeActiveNotification object:nil];
361361
}
362362

363-
+ (void)checkTokenResponse:(NSNotification *)notification
363+
+ (void)checkTokenResponse:(__unused NSNotification *)notification
364364
{
365365
[[NSNotificationCenter defaultCenter] removeObserver:self
366366
name:UIApplicationDidBecomeActiveNotification

IdentityCore/src/intune/MSIDIntuneApplicationStateManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
@implementation MSIDIntuneApplicationStateManager
2929

30-
+ (BOOL)isAppCapableForMAMCA:(MSIDAuthority *)authority
30+
+ (BOOL)isAppCapableForMAMCA:(__unused MSIDAuthority *)authority
3131
{
3232
#if TARGET_OS_IPHONE
3333

IdentityCore/src/requests/sdk/adal/MSIDLegacyBrokerResponseHandler.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
@implementation MSIDLegacyBrokerResponseHandler
4343

4444
- (id<MSIDCacheAccessor>)cacheAccessorWithKeychainGroup:(__unused NSString *)keychainGroup
45-
error:(NSError **)error
45+
error:(__unused NSError **)error
4646
{
4747
#if TARGET_OS_IPHONE
4848
MSIDKeychainTokenCache *dataSource = [[MSIDKeychainTokenCache alloc] initWithGroup:keychainGroup error:error];

IdentityCore/src/webview/MSIDWebviewAuthorization.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ + (void)cancelCurrentSession
194194
#endif
195195

196196
#if TARGET_OS_IPHONE && !MSID_EXCLUDE_SYSTEMWV
197-
+ (BOOL)handleURLResponseForSystemWebviewController:(NSURL *)url;
197+
+ (BOOL)handleURLResponseForSystemWebviewController:(NSURL *)url
198198
{
199199
@synchronized([MSIDWebviewAuthorization class])
200200
{

IdentityCore/src/webview/embeddedWebview/challangeHandlers/MSIDChallengeHandler.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ + (void)handleChallenge:(NSURLAuthenticationChallenge *)challenge
3333
webview:(WKWebView *)webview
3434
parentController:(UIViewController *)parentViewController
3535
context:(id<MSIDRequestContext>)context
36-
completionHandler:(ChallengeCompletionHandler)completionHandler;
36+
completionHandler:(ChallengeCompletionHandler)completionHandler
3737
#else
3838
+ (void)handleChallenge:(NSURLAuthenticationChallenge *)challenge
3939
webview:(WKWebView *)webview
4040
context:(id<MSIDRequestContext>)context
41-
completionHandler:(ChallengeCompletionHandler)completionHandler;
41+
completionHandler:(ChallengeCompletionHandler)completionHandler
4242
#endif
4343
{
4444
NSString *authMethod = [challenge.protectionSpace.authenticationMethod lowercaseString];

0 commit comments

Comments
 (0)