Merge release/2.7.0 into master

AzureAD · Sep 13, 2018 · dd06475 · dd06475
2 parents 68fb5ad + a12ac29
commit dd06475
Show file tree

Hide file tree

Showing 379 changed files with 20,292 additions and 15,167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ ADAL/Security.gcno
 .DS_Store
 \.scannerwork/
 bw-output/
+*.pyc
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ADAL/IdentityCore"]
+	path = ADAL/IdentityCore
+	url = https://github.com/AzureAD/microsoft-authentication-library-common-for-objc
diff --git a/.slather.yml b/.slather.yml
@@ -1,5 +1,8 @@
 # .slather.yml
 
-coverage_service: coveralls
-xcodeproj: ADALiOS/ADALiOS.xcodeproj
-ignore: ADALiOS/ADALiOSTests/*
+coverage_service: cobertura_xml
+workspace: ADAL.xcworkspace
+xcodeproj: ADAL/ADAL.xcodeproj
+source_directory: ADAL/src
+output_directory: reports/codecov
+ignore: ADAL/tests/**
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 #dist: trusty
 language: objective-c
-osx_image: xcode9.1
+osx_image: xcode9.4
 
 # set up SonarCube
 #addons:

diff --git a/ADAL.podspec b/ADAL.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "ADAL"
   s.module_name  = "ADAL"
-  s.version      = "2.6.5"
+  s.version      = "2.7.0"
   s.summary      = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
 
   s.description  = <<-DESC
@@ -19,8 +19,10 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.10"
   s.source       = { 
     :git => "https://github.com/AzureAD/azure-activedirectory-library-for-objc.git", 
-    :tag => s.version.to_s
+    :tag => s.version.to_s,
+    :submodules => true
   }
+
   s.pod_target_xcconfig = { 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF' => 'NO' }
 
   s.default_subspecs ='app-lib'
@@ -30,13 +32,13 @@ Pod::Spec.new do |s|
   s.module_map = "ADAL/resources/mac/adal_mac.modulemap"
 
   s.subspec 'app-lib' do |app|
-  	app.source_files = "ADAL/src/**/*.{h,m}"
+  	app.source_files = "ADAL/src/**/*.{h,m}", "ADAL/IdentityCore/IdentityCore/src/**/*.{h,m}"
   	app.ios.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/ios/*.h"
   	app.osx.public_header_files = "ADAL/src/public/mac/*.h","ADAL/src/public/*.h"
 
-  	app.ios.exclude_files = "ADAL/src/**/mac/*"
+  	app.ios.exclude_files = "ADAL/src/**/mac/*", "ADAL/IdentityCore/IdentityCore/src/**/mac/*"
 
-  	app.osx.exclude_files = "ADAL/src/**/ios/*"
+  	app.osx.exclude_files = "ADAL/src/**/ios/*", "ADAL/IdentityCore/IdentityCore/src/**/ios/*"
   	app.osx.resources = "ADAL/resources/mac/ADCredentialViewController.xib"
 
   	app.requires_arc = true
@@ -56,14 +58,14 @@ Pod::Spec.new do |s|
   # Note, ADAL has limited support for running in app extensions.
   s.subspec 'extension' do |ext|
   	ext.compiler_flags = '-DADAL_EXTENSION_SAFE=1'
-  	ext.source_files = "ADAL/src/**/*.{h,m}"
+  	ext.source_files = "ADAL/src/**/*.{h,m}", "ADAL/IdentityCore/IdentityCore/src/**/*.{h,m}"
   	ext.ios.public_header_files = "ADAL/src/public/*.h","ADAL/src/public/ios/*.h"
   	ext.osx.public_header_files = "ADAL/src/public/mac/*.h","ADAL/src/public/*.h"
 
   	# There is currently a bug in CocoaPods where it doesn't combine the public headers
   	# for both the platform and overall.
-  	ext.ios.exclude_files = "ADAL/src/**/mac/*"
-  	ext.osx.exclude_files = "ADAL/src/**/ios/*"
+  	ext.ios.exclude_files = "ADAL/src/**/mac/*", "ADAL/IdentityCore/IdentityCore/src/**/mac/*"
+  	ext.osx.exclude_files = "ADAL/src/**/ios/*", "ADAL/IdentityCore/IdentityCore/src/**/ios/*"
 
   	ext.requires_arc = true
 

diff --git a/ADAL.xcworkspace/contents.xcworkspacedata b/ADAL.xcworkspace/contents.xcworkspacedata
diff --git a/...stMacOSApp.xcdatamodeld/.xccurrentversion → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...stMacOSApp.xcdatamodeld/.xccurrentversion → ...ace/xcshareddata/IDEWorkspaceChecks.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>_XCCurrentVersionName</key>
-	<string>MyTestMacOSApp.xcdatamodel</string>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
 </dict>
 </plist>
diff --git a/...TestiOSApp.xcdatamodeld/.xccurrentversion → ...xcshareddata/WorkspaceSettings.xcsettings b/...TestiOSApp.xcdatamodeld/.xccurrentversion → ...xcshareddata/WorkspaceSettings.xcsettings
diff --git a/ADAL/ADAL.xcodeproj/project.pbxproj b/ADAL/ADAL.xcodeproj/project.pbxproj
diff --git a/ADAL/ADAL.xcodeproj/xcshareddata/xcschemes/ADAL Mac.xcscheme b/ADAL/ADAL.xcodeproj/xcshareddata/xcschemes/ADAL Mac.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0830"
-   version = "1.3">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -20,20 +20,35 @@
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D626FF671FBA6EDF00EE4487"
+               BuildableName = "IdentityCoreTests.xctest"
+               BlueprintName = "IdentityCoreTests Mac"
+               ReferencedContainer = "container:IdentityCore/IdentityCore/IdentityCore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "94DD18E01C5ACFBF00F80C62"
-               BuildableName = "ADAL_Mac_UTs.xctest"
+               BuildableName = "ADAL-Unit-Tests.xctest"
                BlueprintName = "ADAL_Mac_UTs"
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
@@ -43,11 +58,21 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "B20DC5AF1F0D96A700957806"
-               BuildableName = "ADAL_Mac_ITs.xctest"
+               BuildableName = "ADAL-Integration-Tests.xctest"
                BlueprintName = "ADAL_Mac_ITs"
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D626FF671FBA6EDF00EE4487"
+               BuildableName = "IdentityCoreTests.xctest"
+               BlueprintName = "IdentityCoreTests Mac"
+               ReferencedContainer = "container:IdentityCore/IdentityCore/IdentityCore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

diff --git a/...proj/xcshareddata/xcschemes/ADAL.xcscheme → .../xcshareddata/xcschemes/ADAL iOS.xcscheme b/...proj/xcshareddata/xcschemes/ADAL.xcscheme → .../xcshareddata/xcschemes/ADAL iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9453C3CB1C583E07006B9E79"
                BuildableName = "ADAL.framework"
-               BlueprintName = "ADAL"
+               BlueprintName = "ADAL iOS"
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -28,12 +28,22 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B20DC5811F0D96A100957806"
+               BuildableName = "ADAL-Integration-Tests.xctest"
+               BlueprintName = "ADAL_iOS_ITs"
+               ReferencedContainer = "container:ADAL.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8B0965B917F25770002BDFB8"
-               BuildableName = "ADAL_iOS_UTs.xctest"
+               BuildableName = "ADAL-Unit-Tests.xctest"
                BlueprintName = "ADAL_iOS_UTs"
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
@@ -42,10 +52,10 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B20DC5811F0D96A100957806"
-               BuildableName = "ADAL_iOS_ITs.xctest"
-               BlueprintName = "ADAL_iOS_ITs"
-               ReferencedContainer = "container:ADAL.xcodeproj">
+               BlueprintIdentifier = "D626FF491FBA6DFC00EE4487"
+               BuildableName = "IdentityCoreTests.xctest"
+               BlueprintName = "IdentityCoreTests iOS"
+               ReferencedContainer = "container:IdentityCore/IdentityCore/IdentityCore.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -54,7 +64,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9453C3CB1C583E07006B9E79"
             BuildableName = "ADAL.framework"
-            BlueprintName = "ADAL"
+            BlueprintName = "ADAL iOS"
             ReferencedContainer = "container:ADAL.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -76,7 +86,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9453C3CB1C583E07006B9E79"
             BuildableName = "ADAL.framework"
-            BlueprintName = "ADAL"
+            BlueprintName = "ADAL iOS"
             ReferencedContainer = "container:ADAL.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -94,7 +104,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9453C3CB1C583E07006B9E79"
             BuildableName = "ADAL.framework"
-            BlueprintName = "ADAL"
+            BlueprintName = "ADAL iOS"
             ReferencedContainer = "container:ADAL.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/ADAL/ADAL.xcodeproj/xcshareddata/xcschemes/ADAL-core.xcscheme b/ADAL/ADAL.xcodeproj/xcshareddata/xcschemes/ADAL-core.xcscheme
@@ -26,14 +26,15 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8B0965B917F25770002BDFB8"
-               BuildableName = "ADAL_iOS_UTs.xctest"
+               BuildableName = "ADAL-Unit-Tests.xctest"
                BlueprintName = "ADAL_iOS_UTs"
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
@@ -43,7 +44,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "B20DC5811F0D96A100957806"
-               BuildableName = "ADAL_iOS_ITs.xctest"
+               BuildableName = "ADAL-Integration-Tests.xctest"
                BlueprintName = "ADAL_iOS_ITs"
                ReferencedContainer = "container:ADAL.xcodeproj">
             </BuildableReference>
@@ -65,6 +66,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/ADAL/ADAL.xcodeproj/xcshareddata/xcschemes/ADALAutomation.xcscheme b/ADAL/ADAL.xcodeproj/xcshareddata/xcschemes/ADALAutomation.xcscheme
@@ -28,6 +28,36 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "23658C7C201023F70055CE7D"
+               BuildableName = "ADALiOSUITests.xctest"
+               BlueprintName = "InteractiveIOSTests"
+               ReferencedContainer = "container:ADAL.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B2A409D220D36524004AA9B7"
+               BuildableName = "MultiAppIOSTests.xctest"
+               BlueprintName = "MultiAppIOSTests"
+               ReferencedContainer = "container:ADAL.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B2D32CF720E9C317002C39AD"
+               BuildableName = "StressIOSTests.xctest"
+               BlueprintName = "StressIOSTests"
+               ReferencedContainer = "container:ADAL.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference