Skip to content

cedarmaps-sdk-ios-public
cedarmaps-sdk-ios-public
Commit 83bf43b0 authored by Deployer's avatar Deployer
Browse files
Options

Updated Mapbox to version 4.0

parent 44b07635
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 44 deletions
.gitignore
View file @ 83bf43b0
# Created by https://www.gitignore.io/api/swift,xcode,carthage,cocoapods,objective-c # Created by https://www.gitignore.io/api/xcode,macos,swift,carthage,cocoapods,objective-c
### Carthage ### ### Carthage ###
# Carthage # Carthage
...@@ -13,10 +13,37 @@ Carthage/Build ...@@ -13,10 +13,37 @@ Carthage/Build
## CocoaPods GitIgnore Template ## CocoaPods GitIgnore Template
# CocoaPods - Only use to conserve bandwidth / Save time on Pushing # CocoaPods - Only use to conserve bandwidth / Save time on Pushing
# - Also handy if you have a lage number of dependant pods # - Also handy if you have a large number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGONRE THE LOCK FILE # - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
Pods/ Pods/
### macOS ###
*.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### Objective-C ### ### Objective-C ###
# Xcode # Xcode
# #
...@@ -49,7 +76,7 @@ xcuserdata/ ...@@ -49,7 +76,7 @@ xcuserdata/
*.dSYM *.dSYM
# CocoaPods - Refactored to standalone file # CocoaPods - Refactored to standalone file
.bundle
# Carthage - Refactored to standalone file # Carthage - Refactored to standalone file
...@@ -128,4 +155,5 @@ playground.xcworkspace ...@@ -128,4 +155,5 @@ playground.xcworkspace
!*.xcworkspace/contents.xcworkspacedata !*.xcworkspace/contents.xcworkspacedata
/*.gcno /*.gcno
# End of https://www.gitignore.io/api/swift,xcode,carthage,cocoapods,objective-c
\ No newline at end of file # End of https://www.gitignore.io/api/xcode,macos,swift,carthage,cocoapods,objective-c
\ No newline at end of file
CedarMaps.podspec
View file @ 83bf43b0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'CedarMaps' s.name = 'CedarMaps'
s.version = '2.1.1' s.version = '3.0.0'
s.summary = 'CedarMaps iOS SDK' s.summary = 'CedarMaps iOS SDK'
# This description is used to generate tags and improve search results. # This description is used to generate tags and improve search results.
...@@ -28,9 +28,9 @@ Pod::Spec.new do |s| ...@@ -28,9 +28,9 @@ Pod::Spec.new do |s|
s.source = { :git => 'http://gitlab.cedar.ir/cedar.studios/cedarmaps-sdk-ios-public.git', :tag => s.version.to_s } s.source = { :git => 'http://gitlab.cedar.ir/cedar.studios/cedarmaps-sdk-ios-public.git', :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/cedarmaps' s.social_media_url = 'https://twitter.com/cedarmaps'
s.platform = :ios, '8.0' s.platform = :ios, '9.0'
s.requires_arc = true s.requires_arc = true
s.cocoapods_version = '>= 1.1' s.cocoapods_version = '>= 1.2'
s.source_files = 'CedarMaps/Classes/**/*' s.source_files = 'CedarMaps/Classes/**/*'
s.public_header_files = 'CedarMaps/Headers/Public/*.h' s.public_header_files = 'CedarMaps/Headers/Public/*.h'
...@@ -41,6 +41,6 @@ Pod::Spec.new do |s| ...@@ -41,6 +41,6 @@ Pod::Spec.new do |s|
s.public_header_files = 'CedarMaps/Classes/**/*.h' s.public_header_files = 'CedarMaps/Classes/**/*.h'
s.framework = 'UIKit' s.framework = 'UIKit'
s.dependency 'Mapbox-iOS-SDK', '~> 3.7' s.dependency 'Mapbox-iOS-SDK', '~> 4.0'
s.dependency 'JSONModel', '~> 1.7' s.dependency 'JSONModel', '~> 1.7'
end end
CedarMaps/Classes/CSAuthenticationManager.m
View file @ 83bf43b0
...@@ -89,14 +89,19 @@ static NSString * const kCurrentAccessToken = @"CedarMapsSDKUserAccessToken_v1"; ...@@ -89,14 +89,19 @@ static NSString * const kCurrentAccessToken = @"CedarMapsSDKUserAccessToken_v1";
NSAssert(self.clientSecret != nil, @"No Client Secret was specified. Set your given credentials before trying to get an access token."); NSAssert(self.clientSecret != nil, @"No Client Secret was specified. Set your given credentials before trying to get an access token.");
NSString *params = [NSString stringWithFormat:@"client_id=%@&client_secret=%@", self.clientID, self.clientSecret]; NSString *params = [NSString stringWithFormat:@"client_id=%@&client_secret=%@", self.clientID, self.clientSecret];
params = [params stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; params = [params stringByRemovingPercentEncoding];
NSURL *tokenURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@token", self.baseURL]]; NSURL *tokenURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@token", self.baseURL]];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:tokenURL]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:tokenURL];
[request setHTTPBody:[params dataUsingEncoding:NSUTF8StringEncoding]]; [request setHTTPBody:[params dataUsingEncoding:NSUTF8StringEncoding]];
[request setHTTPMethod:@"POST"]; [request setHTTPMethod:@"POST"];
__weak CSAuthenticationManager *weakSelf = self;
[[[CSAuthenticationManager sharedURLSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable token, NSURLResponse * _Nullable response, NSError * _Nullable responseError) { [[[CSAuthenticationManager sharedURLSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable token, NSURLResponse * _Nullable response, NSError * _Nullable responseError) {
if (!weakSelf) {
completion(nil, [CSError errorWithDescription:@"CSAuthenticationManager instance should be retained."]);
return;
}
if (responseError != nil) { if (responseError != nil) {
completion(nil, responseError); completion(nil, responseError);
...@@ -111,15 +116,15 @@ static NSString * const kCurrentAccessToken = @"CedarMapsSDKUserAccessToken_v1"; ...@@ -111,15 +116,15 @@ static NSString * const kCurrentAccessToken = @"CedarMapsSDKUserAccessToken_v1";
return; return;
} }
_accessToken = result[@"access_token"]; weakSelf.accessToken = result[@"access_token"];
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[defaults setObject:_accessToken forKey:kCurrentAccessToken]; [defaults setObject:weakSelf.accessToken forKey:kCurrentAccessToken];
if (_accessToken) { if (weakSelf.accessToken) {
[[NSNotificationCenter defaultCenter] postNotificationName:kCedarMapsAccessTokenIsReadeyNotification object:nil userInfo:@{kCedarMapsAccessTokenIsReadeyNotification: _accessToken}]; [[NSNotificationCenter defaultCenter] postNotificationName:kCedarMapsAccessTokenIsReadeyNotification object:nil userInfo:@{kCedarMapsAccessTokenIsReadeyNotification: weakSelf.accessToken}];
} }
completion(_accessToken, nil); completion(weakSelf.accessToken, nil);
return; return;
} else { } else {
completion(nil, [NSError errorWithDomain:NSURLErrorDomain code:statusCode userInfo:nil]); completion(nil, [NSError errorWithDomain:NSURLErrorDomain code:statusCode userInfo:nil]);
......
Example/CedarMaps.xcodeproj/project.pbxproj
View file @ 83bf43b0
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; }; 6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; }; 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
7C26AC23BAA974B0D1E0FEB6 /* CedarMaps.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = CedarMaps.podspec; path = ../CedarMaps.podspec; sourceTree = "<group>"; }; 7C26AC23BAA974B0D1E0FEB6 /* CedarMaps.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = CedarMaps.podspec; path = ../CedarMaps.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
7E0473B2174161FEB4C42124 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; }; 7E0473B2174161FEB4C42124 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
87ED8012135F2AE4C2708283 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; }; 87ED8012135F2AE4C2708283 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
9F1AF474DEEC83F236F8D56F /* Pods-CedarMaps_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CedarMaps_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-CedarMaps_Tests/Pods-CedarMaps_Tests.release.xcconfig"; sourceTree = "<group>"; }; 9F1AF474DEEC83F236F8D56F /* Pods-CedarMaps_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CedarMaps_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-CedarMaps_Tests/Pods-CedarMaps_Tests.release.xcconfig"; sourceTree = "<group>"; };
...@@ -209,7 +209,6 @@ ...@@ -209,7 +209,6 @@
6003F587195388D20070C39A /* Frameworks */, 6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */, 6003F588195388D20070C39A /* Resources */,
42A9BA7AE733D48BDE3FF622 /* [CP] Embed Pods Frameworks */, 42A9BA7AE733D48BDE3FF622 /* [CP] Embed Pods Frameworks */,
8630C21FA21B4972092E6220 /* [CP] Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
...@@ -227,7 +226,7 @@ ...@@ -227,7 +226,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
CLASSPREFIX = CS; CLASSPREFIX = CS;
LastUpgradeCheck = 0910; LastUpgradeCheck = 0930;
ORGANIZATIONNAME = "Saeed Taheri"; ORGANIZATIONNAME = "Saeed Taheri";
TargetAttributes = { TargetAttributes = {
6003F589195388D20070C39A = { 6003F589195388D20070C39A = {
...@@ -295,21 +294,6 @@ ...@@ -295,21 +294,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CedarMaps_Example/Pods-CedarMaps_Example-frameworks.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CedarMaps_Example/Pods-CedarMaps_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
8630C21FA21B4972092E6220 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CedarMaps_Example/Pods-CedarMaps_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D13FFB6027D2A9944C77AAA1 /* [CP] Check Pods Manifest.lock */ = { D13FFB6027D2A9944C77AAA1 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -404,12 +388,14 @@ ...@@ -404,12 +388,14 @@
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES; CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
...@@ -456,12 +442,14 @@ ...@@ -456,12 +442,14 @@
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES; CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
......
Example/CedarMaps.xcodeproj/xcshareddata/xcschemes/CedarMaps-Example.xcscheme
View file @ 83bf43b0
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0910" LastUpgradeVersion = "0930"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
buildConfiguration = "Debug" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"> shouldUseLaunchSchemeArgsEnv = "YES">
<Testables> <Testables>
<TestableReference <TestableReference
...@@ -56,7 +55,6 @@ ...@@ -56,7 +55,6 @@
buildConfiguration = "Debug" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0" launchStyle = "0"
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
......
Example/CedarMaps.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist 0 → 100644
View file @ 83bf43b0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Example/Podfile.lock
View file @ 83bf43b0
PODS: PODS:
- CedarMaps (2.0.2): - CedarMaps (3.0.0):
- JSONModel (~> 1.7) - JSONModel (~> 1.7)
- Mapbox-iOS-SDK (~> 3.7) - Mapbox-iOS-SDK (~> 4.0)
- JSONModel (1.7.0) - JSONModel (1.7.0)
- Mapbox-iOS-SDK (3.7.0) - Mapbox-iOS-SDK (4.0.0)
DEPENDENCIES: DEPENDENCIES:
- CedarMaps (from `../`) - CedarMaps (from `../`)
SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- JSONModel
- Mapbox-iOS-SDK
EXTERNAL SOURCES: EXTERNAL SOURCES:
CedarMaps: CedarMaps:
:path: ../ :path: "../"
SPEC CHECKSUMS: SPEC CHECKSUMS:
CedarMaps: c9aca5ebbd3c2cdb43e0841a95d3497b7c1e80b2 CedarMaps: 504c3eb3a8e16edc09e47b4584a06b7315e1bb10
JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
Mapbox-iOS-SDK: 699818d30e1ed4985d3efc6a06c40b90907c586d Mapbox-iOS-SDK: 271754e96eb4434ba1b0a8c68432e1ea26fe9841
PODFILE CHECKSUM: ad43b9956cf1f58bff64834a5e21f42f322108fa PODFILE CHECKSUM: ad43b9956cf1f58bff64834a5e21f42f322108fa
COCOAPODS: 1.3.1 COCOAPODS: 1.5.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment