Merge pull request #619 from AzureAD/oldalton/flip_cocoapods_flags

Flip legacy accounts flag
AzureAD · Jul 31, 2019 · 69b7d2f · 69b7d2f
2 parents fce2fc6 + 7ecf6b1
commit 69b7d2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MSAL.podspec b/MSAL.podspec
@@ -37,6 +37,7 @@ Pod::Spec.new do |s|
 
   	app.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*"
   	app.requires_arc = true
+        app.prefix_header_contents = "#define MSAL_LEGACY_ACCOUNTS_DISABLED 1"
   end
 
   # Note, MSAL has limited support for running in app extensions.
@@ -50,7 +51,7 @@ Pod::Spec.new do |s|
   	# for both the platform and overall.
   	ext.ios.exclude_files = "MSAL/src/**/mac/*", "MSAL/IdentityCore/IdentityCore/src/**/mac/*"
   	ext.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*"
-  	
+        ext.prefix_header_contents = "#define MSAL_LEGACY_ACCOUNTS_DISABLED 1"
   	ext.requires_arc = true
   end
 
@@ -64,7 +65,6 @@ Pod::Spec.new do |s|
 
     legacyapp.osx.exclude_files = "MSAL/src/**/ios/*", "MSAL/IdentityCore/IdentityCore/src/**/ios/*", "MSAL/src-internal/public/ios/*"
     legacyapp.requires_arc = true
-    legacyapp.compiler_flags = '-DMSAL_LEGACY_ENABLED=1'
 
   end
 

diff --git a/MSAL/src/public/MSAL.h b/MSAL/src/public/MSAL.h
@@ -74,6 +74,6 @@ FOUNDATION_EXPORT const unsigned char MSAL__Framework_VersionString[];
 #import <MSAL/MSALAccountEnumerationParameters.h>
 #import <MSAL/MSALExternalAccountProviding.h>
 #import <MSAL/MSALSerializedADALCacheProvider.h>
-#ifdef MSAL_LEGACY_ENABLED
+#ifndef MSAL_LEGACY_ACCOUNTS_DISABLED
 #import <MSAL/MSALLegacySharedAccountsProvider.h>
 #endif