Skip to content
This repository was archived by the owner on Apr 18, 2023. It is now read-only.

Commit a07f52b

Browse files
dadheech115dadheech115
authored
Merge pull request #14 from microsoftgraph/dev
Merge dev into master
2 parents 9bb8506 + 82de4ee commit a07f52b

File tree

78 files changed

+370
-249
lines changed

Some content is hidden

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

78 files changed

+370
-249
lines changed

‎MSGraphClientSDK.podspec‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
Pod::Spec.new do |s|
3+
4+
s.name = "MSGraphClientSDK"
5+
s.version = "0.1.2"
6+
s.summary = "Microsoft Graph ObjC SDK."
7+
8+
s.description = <<-DESC
9+
Integrate the Microsoft Graph API into your iOS App!
10+
DESC
11+
12+
s.homepage = "http://graph.microsoft.io"
13+
s.license = { :type => "MIT", :file => "LICENSE" }
14+
s.author = 'Microsoft Graph'
15+
16+
17+
s.ios.deployment_target = "9.0"
18+
s.osx.deployment_target = "10.10"
19+
20+
s.source = { :git => "https://github.com/microsoftgraph/msgraph-sdk-objc.git", :tag=> s.version }
21+
22+
s.source_files = "MSGraphClientSDK/MSGraphClientSDK/MSGraphClientSDK.h"
23+
s.exclude_files = "MSGraphClientSDK/MSGraphClientSDKTests/*"
24+
s.public_header_files = "MSGraphClientSDK/MSGraphClientSDK/MSGraphClientSDK.h"
25+
26+
s.subspec "Authentication" do |authentication|
27+
authentication.source_files = "MSGraphClientSDK/MSGraphClientSDK/Authentication/*.{h,m}"
28+
authentication.public_header_files = "MSGraphClientSDK/MSGraphClientSDK/Authentication/*.h"
29+
end
30+
31+
s.subspec "Common" do |common|
32+
common.dependency 'MSGraphClientSDK/Authentication'
33+
common.source_files = "MSGraphClientSDK/MSGraphClientSDK/{Common,Middleware,GraphContent,HTTPClient}/**/*.{h,m}"
34+
common.public_header_files = "MSGraphClientSDK/MSGraphClientSDK/{Common,Middleware,GraphContent,HTTPClient}/**/*.h"
35+
end
36+
37+
end

MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/project.pbxproj renamed to MSGraphClientSDK/MSGraphClientSDK.xcodeproj/project.pbxproj

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

MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to MSGraphClientSDK/MSGraphClientSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to MSGraphClientSDK/MSGraphClientSDK.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.

MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/xcshareddata/xcschemes/MSGraphCoreSDK.xcscheme renamed to MSGraphClientSDK/MSGraphClientSDK.xcodeproj/xcshareddata/xcschemes/MSGraphClientSDK.xcscheme

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "E5DC73D9211412BF0040BAB6"
18-
BuildableName = "MSGraphCoreSDK.framework"
19-
BlueprintName = "MSGraphCoreSDK"
20-
ReferencedContainer = "container:MSGraphCoreSDK.xcodeproj">
18+
BuildableName = "MSGraphClientSDK.framework"
19+
BlueprintName = "MSGraphClientSDK"
20+
ReferencedContainer = "container:MSGraphClientSDK.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -34,19 +34,19 @@
3434
<BuildableReference
3535
BuildableIdentifier = "primary"
3636
BlueprintIdentifier = "E5069AD5211C1AD500432372"
37-
BuildableName = "MSGraphCoreSDKTests.xctest"
38-
BlueprintName = "MSGraphCoreSDKTests"
39-
ReferencedContainer = "container:MSGraphCoreSDK.xcodeproj">
37+
BuildableName = "MSGraphClientSDKTests.xctest"
38+
BlueprintName = "MSGraphClientSDKTests"
39+
ReferencedContainer = "container:MSGraphClientSDK.xcodeproj">
4040
</BuildableReference>
4141
</TestableReference>
4242
</Testables>
4343
<MacroExpansion>
4444
<BuildableReference
4545
BuildableIdentifier = "primary"
4646
BlueprintIdentifier = "E5DC73D9211412BF0040BAB6"
47-
BuildableName = "MSGraphCoreSDK.framework"
48-
BlueprintName = "MSGraphCoreSDK"
49-
ReferencedContainer = "container:MSGraphCoreSDK.xcodeproj">
47+
BuildableName = "MSGraphClientSDK.framework"
48+
BlueprintName = "MSGraphClientSDK"
49+
ReferencedContainer = "container:MSGraphClientSDK.xcodeproj">
5050
</BuildableReference>
5151
</MacroExpansion>
5252
<AdditionalOptions>
@@ -66,9 +66,9 @@
6666
<BuildableReference
6767
BuildableIdentifier = "primary"
6868
BlueprintIdentifier = "E5DC73D9211412BF0040BAB6"
69-
BuildableName = "MSGraphCoreSDK.framework"
70-
BlueprintName = "MSGraphCoreSDK"
71-
ReferencedContainer = "container:MSGraphCoreSDK.xcodeproj">
69+
BuildableName = "MSGraphClientSDK.framework"
70+
BlueprintName = "MSGraphClientSDK"
71+
ReferencedContainer = "container:MSGraphClientSDK.xcodeproj">
7272
</BuildableReference>
7373
</MacroExpansion>
7474
<AdditionalOptions>
@@ -84,9 +84,9 @@
8484
<BuildableReference
8585
BuildableIdentifier = "primary"
8686
BlueprintIdentifier = "E5DC73D9211412BF0040BAB6"
87-
BuildableName = "MSGraphCoreSDK.framework"
88-
BlueprintName = "MSGraphCoreSDK"
89-
ReferencedContainer = "container:MSGraphCoreSDK.xcodeproj">
87+
BuildableName = "MSGraphClientSDK.framework"
88+
BlueprintName = "MSGraphClientSDK"
89+
ReferencedContainer = "container:MSGraphClientSDK.xcodeproj">
9090
</BuildableReference>
9191
</MacroExpansion>
9292
</ProfileAction>

MSGraphCoreSDK/MSGraphCoreSDK/Authentication/MSAuthenticationProvider.h renamed to MSGraphClientSDK/MSGraphClientSDK/Authentication/MSAuthenticationProvider.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//
44

55
#import <Foundation/Foundation.h>
6-
#import <UIKit/UIKit.h>
76

87
typedef void(^MSAuthenticationCompletion)(NSMutableURLRequest *request, NSError *error);
98

MSGraphCoreSDK/MSGraphCoreSDK/Common/MSConstants.h renamed to MSGraphClientSDK/MSGraphClientSDK/Common/MSConstants.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ typedef NS_ENUM(NSInteger, MSClientErrorCode)
2626
MSClientErrorCodeInternalServerError = 500,
2727
MSClientErrorCodeNotImplemented = 501,
2828
MSClientErrorCodeServiceUnavailable = 503,
29+
MSClientErrorCodeGatewayTimeout = 504,
2930
MSClientErrorCodeInsufficientStorage = 507,
3031
MSClientErrorCodeUnknownError = 999,
3132
};
@@ -44,7 +45,8 @@ typedef NS_ENUM(NSInteger, MSExpectedResponseCodes)
4445

4546
extern NSString *const MSGraphBaseURL;
4647
extern NSString *const MSHeaderSdkVersion;
47-
extern NSString *const MSGraphSdkVersionHeaderPrefix;
48+
extern NSString *const MSGraphiOSSdkVersionHeaderPrefix;
49+
extern NSString *const MSGraphMacSdkVersionHeaderPrefix;
4850

4951
extern NSString *const MSErrorDomain;
5052

MSGraphCoreSDK/MSGraphCoreSDK/Common/MSConstants.m renamed to MSGraphClientSDK/MSGraphClientSDK/Common/MSConstants.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
NSString *const MSGraphBaseURL = @"https://graph.microsoft.com/v1.0";
88
NSString *const MSHeaderSdkVersion = @"SdkVersion";
9-
NSString *const MSGraphSdkVersionHeaderPrefix = @"graph-ios-";
9+
NSString *const MSGraphiOSSdkVersionHeaderPrefix = @"graph-objc-ios-";
10+
NSString *const MSGraphMacSdkVersionHeaderPrefix = @"graph-objc-mac-";
11+
1012

1113
NSString *const MSErrorDomain = @"com.microsoft.graph.errors";
1214

MSGraphCoreSDK/MSGraphCoreSDK/Common/MSErrorCodes.h renamed to MSGraphClientSDK/MSGraphClientSDK/Common/MSErrorCodes.h

File renamed without changes.

MSGraphCoreSDK/MSGraphCoreSDK/Common/MSErrorCodes.m renamed to MSGraphClientSDK/MSGraphClientSDK/Common/MSErrorCodes.m

File renamed without changes.

0 commit comments

Comments
 (0)