Update version to 0.11

.swift-version

@@ -1 +1 @@
-4.0
+4.2

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [0.11.0] 2018-10-22
+
+0.11 updates the Uber Rides SDK for Xcode 10/Swift 4.2 compatibility. ([Pull #245](https://github.com/uber/rides-ios-sdk/pull/245), thanks @rmuhamedgaliev!)
+
+### Changes
+* [Pull #248](https://github.com/uber/rides-ios-sdk/pull/248) You can now use custom string scopes, with the initializer `UberScope(scopeString:)`
+* [Pull #242 & #243](https://github.com/uber/rides-ios-sdk/pull/242) add support for authenticating with Uber Eats
+
 ## [0.10.0] 2018-04-27
 
 0.10 updates the Uber Rides SDK for Xcode 9.3/Swift 4.1 compatibility.

PodspecShared.rb

@@ -1,6 +1,6 @@
 def configure_podspec(spec, module_name)
   spec.name         = module_name
-  spec.version      = "0.10.0"
+  spec.version      = "0.11.0"
   spec.summary      = "The Official Uber Rides iOS SDK."
   spec.description  = <<-DESC
     This Swift library allows you to integrate Uber into your iOS app. It is designed to make it quick and easy to add a 'Request a Ride' button in your application, seamlessly connecting your users with Uber.
@@ -12,6 +12,7 @@ def configure_podspec(spec, module_name)
   spec.platform     = :ios, "8.0"
   spec.source       = { :git => "https://github.com/uber/rides-ios-sdk.git", :tag => 'v' + spec.version.to_s }
   spec.source_files = ["source/" + module_name + "/**/*.{swift,h,m}"]
+  spec.swift_version = '4.2'
   spec.resource     = "source/" + module_name + "/Resources/**"
   spec.requires_arc = true
   spec.ios.deployment_target = '8.0'

README.md

@@ -5,22 +5,20 @@ This [Swift library](https://developer.apple.com/library/ios/documentation/Gener
 ## Requirements
 
 - iOS 8.0+
-- Xcode 9.0+
-- Swift 3.2 / 4.0+
+- Xcode 10.0+
+- Swift 4.2+
 
 ## Installing the Uber Rides SDK
 
 To install the Uber Rides SDK, you may use [CocoaPods](http://cocoapods.org), [Carthage](https://github.com/Carthage/Carthage), or add it to your project manually
 
 ```ruby
-pod 'UberRides', '~> 0.9'
+pod 'UberRides', '~> 0.11'
 ```
 
-If you get compilation errors with CocoaPods, you may be using Swift 3.2 or no Swift at all in your main target. In that scenario, CocoaPods will set the swift version incorrectly. [See issue](https://github.com/CocoaPods/CocoaPods/issues/6791). To fix this, click on your Pods project and select the `UberRides` target. Search for the `Swift Language Version` property, and change it to "Swift 4.0".
-
 ### Carthage
 ```
-github "uber/rides-ios-sdk" ~> 0.9
+github "uber/rides-ios-sdk" ~> 0.11
 ```
 
 ## Getting Started
@@ -308,7 +306,7 @@ If you want to provide a more custom experience in your app, there are a few cla
 ### Uber Rides API Endpoints
 The SDK exposes all the endpoints available in the [Uber Developers documentation](https://developer.uber.com/docs). Some endpoints can be authenticated with a server token, but for most endpoints, you will require a bearer token. A bearer token can be retrieved via implicit grant, authorization code grant, or SSO. To authorize [privileged scopes](https://developer.uber.com/docs/scopes#section-privileged-scopes), you must use authorization code grant or SSO.
 
-Read the full API documentation at [CocoaDocs](http://cocoadocs.org/docsets/UberRides/0.9.0/)
+Read the full API documentation at [CocoaDocs](http://cocoadocs.org/docsets/UberRides/0.11.0/)
 
 The `RidesClient` is your source to access all the endpoints available in the Uber Rides API. With just your server token, you can get a list of Uber products as well as price and time estimates. 
 

examples/Obj-C SDK/Obj-C SDK.xcodeproj/project.pbxproj

@@ -260,6 +260,7 @@
 				AC0404EB1BFB82CC00AC1501 /* Resources */,
 				AC0405781BFBB32500AC1501 /* Embed Frameworks */,
 				15F8745A671B49A0061B3C79 /* [CP] Embed Pods Frameworks */,
+				9835B1DAC203785D98424FCA /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -400,6 +401,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Obj-C SDK/Pods-Obj-C SDK-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		9835B1DAC203785D98424FCA /* [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-Obj-C SDK/Pods-Obj-C SDK-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		DA2812E3F2C3469BD2EBA6F2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

examples/Obj-C SDK/Podfile.lock

@@ -9,14 +9,14 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   UberCore:
-    :path: "../../"
+    :path: ../../
   UberRides:
-    :path: "../../"
+    :path: ../../
 
 SPEC CHECKSUMS:
   UberCore: bbeec9cb7b92de9f292df2f8a345f2e290212746
   UberRides: ed61c8d3de1211f0e4b6568d36abc877fdfee2fb
 
 PODFILE CHECKSUM: 245f1d465fbbc4baa291260b541d36e5a0949a0a
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.4.0

examples/Swift SDK/Podfile.lock

@@ -9,14 +9,14 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   UberCore:
-    :path: "../../"
+    :path: ../../
   UberRides:
-    :path: "../../"
+    :path: ../../
 
 SPEC CHECKSUMS:
   UberCore: bbeec9cb7b92de9f292df2f8a345f2e290212746
   UberRides: ed61c8d3de1211f0e4b6568d36abc877fdfee2fb
 
 PODFILE CHECKSUM: 1d713d30b94c4238ccc4571330ddf2a95fe4daf5
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.4.0

examples/Swift SDK/Swift SDK.xcodeproj/project.pbxproj

@@ -199,6 +199,7 @@
 				AC0404A21BFAD0C800AC1501 /* Resources */,
 				DCEB80851D078BB500899810 /* Embed Frameworks */,
 				E6835DE2B81B6684590AD161 /* [CP] Embed Pods Frameworks */,
+				FEDC5CB1732B3B5AA0B562ED /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -252,7 +253,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = Uber;
 				TargetAttributes = {
 					AC0404A31BFAD0C800AC1501 = {
@@ -360,6 +361,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Swift SDK/Pods-Swift SDK-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		FEDC5CB1732B3B5AA0B562ED /* [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-Swift SDK/Pods-Swift SDK-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -444,14 +460,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_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_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -491,14 +515,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_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_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

examples/Swift SDK/Swift SDK/ButtonExampleViewController.swift

@@ -29,8 +29,8 @@ import CoreLocation
 /// This class is a base class for all the button examples (two tone background ViewController)
 open class ButtonExampleViewController : UIViewController {
 
-    open let topView = UIView()
-    open let bottomView = UIView()
+    public let topView = UIView()
+    public let bottomView = UIView()
 
     override open func viewDidLoad() {
         super.viewDidLoad()

source/UberCore/Authentication/UberAppDelegate.swift

@@ -31,7 +31,7 @@
 
     //MARK: Class variables
 
-    @objc open static let shared = UberAppDelegate()
+    @objc public static let shared = UberAppDelegate()
 
     //MARK: Public variables
 

source/UberCore/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.10.0</string>
+	<string>0.11.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

source/UberRides/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.10.0</string>
+	<string>0.11.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>