Merge pull request #1597 from AzureAD/release/6.0.4

mipetriu · web-flow · commit 6196f4a8da5a · 2022-11-30T13:10:32.000-08:00
Release - 6.0.4
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      = "6.0.2"
+  s.version      = "6.0.4"
   s.summary      = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
 
   s.description  = <<-DESC
diff --git a/ADAL/resources/ios/Framework/Info.plist b/ADAL/resources/ios/Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.2</string>
+	<string>6.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ADAL/src/ADAL_Internal.h b/ADAL/src/ADAL_Internal.h
@@ -28,7 +28,7 @@
 
 #define ADAL_VER_HIGH       6
 #define ADAL_VER_LOW        0
-#define ADAL_VER_PATCH      2
+#define ADAL_VER_PATCH      4
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
diff --git a/ADAL/src/public/ADALErrorCodes.h b/ADAL/src/public/ADALErrorCodes.h
@@ -188,8 +188,10 @@ typedef NS_ENUM(NSInteger, ADALErrorCode)
     
 };
 
+#ifndef HTTP_UNAUTHORIZED
 /* HTTP status codes used by the library */
 typedef enum
 {
     HTTP_UNAUTHORIZED = 401,
 } HTTPStatusCodes;
+#endif
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+Version 6.0.4
+------
+* Fixes to support XCode 14+
+------
+
 Version 6.0.2
 ------
 * Update python version in order to support macOS 12.3 

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,10 @@ typedef NS_ENUM(NSInteger, ADALErrorCode)`
`188`	`188`
`189`	`189`	`};`
`190`	`190`
	`191`	`+#ifndef HTTP_UNAUTHORIZED`
`191`	`192`	`/* HTTP status codes used by the library */`
`192`	`193`	`typedef enum`
`193`	`194`	`{`
`194`	`195`	`HTTP_UNAUTHORIZED = 401,`
`195`	`196`	`} HTTPStatusCodes;`
	`197`	`+#endif`