From ef9eecfe701a3488954f424fb0f359451bfc3f22 Mon Sep 17 00:00:00 2001 From: David Lashkhi Date: Thu, 28 Jul 2016 20:49:41 +0400 Subject: [PATCH 1/4] Update README.md Added description on how to run example projects without Carthage --- README.md | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c31ce5b9..e321b4d0 100755 --- a/README.md +++ b/README.md @@ -919,13 +919,42 @@ extension your_class : RideRequestViewControllerDelegate { ## Example Apps -Example apps can be found in the `examples` folder. To run build them, you need to use Carthage. (A quick overview of installing Carthage can be found in the **Getting Started** section.) From inside the `examples/Swift SDK` or `examples/Obj-C SDK` folder, run: +Example apps can be found in the `examples` folder. To run build them, you can use Carthage or Cocoapods. + +### Carthage +(A quick overview of installing Carthage can be found in the **Getting Started** section.) From inside the `examples/Swift SDK` or `examples/Obj-C SDK` folder, run: ``` carthage update --platform iOS ``` This will build the required dependencies. Once you do that, open `Swift SDK.xcodeproj` or `Obj-C SDK.xcodeproj` in Xcode and run it. +### CocoaPods +You will have to remove Carthage dependencies. Remove Cartfile and Cartfile.resolved. + +From `examples/Swift SDK` or `examples/Obj-C SDK` folder, run: +To integrate Uber Rides into your Xcode project, navigate to the directory `examples/Swift SDK` or `examples/Obj-C SDK` and create a new **Podfile** with `pod init`, then add `pod 'UberRides'` to the main loop. If you are using the Swift SDK, make sure to add the line `use_frameworks!`. + +```ruby +use_frameworks! + +target 'Your Project Name' do +pod 'UberRides' +end +``` + +Then, run the following command to install the dependency: + +```bash +$ pod install +``` + +For Objective-C projects, set the **Embedded Content Contains Swift Code** flag in your project to **Yes** (found under **Build Options** in the **Build Settings** tab). + +Open .xcworkspace and navigate to **General** tab, scroll to **Embedded Binaries** select ObjectMapper.framework and click the `-` button, do the same for UberRides.framework. Now go to **Build Settings** tab and scroll to **Search Paths**, click on *Framework Search Paths** and remove the line $(PROJECT_DIR)/Carthage/Build/iOS. +Now got to **Build Phases** find the **Copy Carthage Frameworks** and remove it. +Now you can build the project. + Don’t forget to set `UberClientID`, `UberDisplayName`, and `UberCallbackURIs` in your `Info.plist` file.

From 93ae8ebc5edb35189f77c50a8f5524a0acd97e1c Mon Sep 17 00:00:00 2001 From: David Lashkhi Date: Wed, 10 Aug 2016 11:41:25 +0400 Subject: [PATCH 2/4] README update Text clean up: removed copy & paste issues, added more attention to removing Carthage --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e321b4d0..c9d23413 100755 --- a/README.md +++ b/README.md @@ -930,9 +930,8 @@ carthage update --platform iOS This will build the required dependencies. Once you do that, open `Swift SDK.xcodeproj` or `Obj-C SDK.xcodeproj` in Xcode and run it. ### CocoaPods -You will have to remove Carthage dependencies. Remove Cartfile and Cartfile.resolved. +First, you will have to remove Carthage dependencies. Navigate to `examples/Swift SDK` or `examples/Obj-C SDK` and remove `Cartfile` and `Cartfile.resolved`. If you see a `Carthage` folder, remove that as well. -From `examples/Swift SDK` or `examples/Obj-C SDK` folder, run: To integrate Uber Rides into your Xcode project, navigate to the directory `examples/Swift SDK` or `examples/Obj-C SDK` and create a new **Podfile** with `pod init`, then add `pod 'UberRides'` to the main loop. If you are using the Swift SDK, make sure to add the line `use_frameworks!`. ```ruby @@ -951,7 +950,7 @@ $ pod install For Objective-C projects, set the **Embedded Content Contains Swift Code** flag in your project to **Yes** (found under **Build Options** in the **Build Settings** tab). -Open .xcworkspace and navigate to **General** tab, scroll to **Embedded Binaries** select ObjectMapper.framework and click the `-` button, do the same for UberRides.framework. Now go to **Build Settings** tab and scroll to **Search Paths**, click on *Framework Search Paths** and remove the line $(PROJECT_DIR)/Carthage/Build/iOS. +Open .xcworkspace and navigate to **General** tab, scroll to **Embedded Binaries** select ObjectMapper.framework and click the `-` button, do the same for UberRides.framework. Now go to **Build Settings** tab and scroll to **Search Paths**, click on **Framework Search Paths** and remove the line $(PROJECT_DIR)/Carthage/Build/iOS. Now got to **Build Phases** find the **Copy Carthage Frameworks** and remove it. Now you can build the project. From 3936812a1253af68614ce1b1c0f3ef90efb69905 Mon Sep 17 00:00:00 2001 From: David Lashkhi Date: Thu, 11 Aug 2016 12:20:20 +0400 Subject: [PATCH 3/4] updated readme Put the section for removing Carthage together, some text changes for better understanding --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c9d23413..f2b0c5f4 100755 --- a/README.md +++ b/README.md @@ -930,9 +930,11 @@ carthage update --platform iOS This will build the required dependencies. Once you do that, open `Swift SDK.xcodeproj` or `Obj-C SDK.xcodeproj` in Xcode and run it. ### CocoaPods -First, you will have to remove Carthage dependencies. Navigate to `examples/Swift SDK` or `examples/Obj-C SDK` and remove `Cartfile` and `Cartfile.resolved`. If you see a `Carthage` folder, remove that as well. +First, you will have to remove Carthage dependencies. Navigate to `examples/Swift SDK` or `examples/Obj-C SDK` and remove `Cartfile` and `Cartfile.resolved`. If you see a `Carthage` folder, remove that as well. Open .xcworkspace and navigate to **General** tab, scroll to **Embedded Binaries** select `ObjectMapper.framework` and click the `-` button, do the same for `UberRides.framework`. Now go to **Build Settings** tab and scroll to **Search Paths**, click on **Framework Search Paths** and remove the line $(PROJECT_DIR)/Carthage/Build/iOS. +Now got to **Build Phases** find the **Copy Carthage Frameworks** and remove it. + +Now, still inside either `examples/Swift SDK` or `examples/Obj-C SDK`, create a new **Podfile** by running `pod init`, then add `pod 'UberRides'` to your main target. If you are using the Swift SDK, make sure to add the line `use_frameworks!`. Your **Podfile** should look something like this: -To integrate Uber Rides into your Xcode project, navigate to the directory `examples/Swift SDK` or `examples/Obj-C SDK` and create a new **Podfile** with `pod init`, then add `pod 'UberRides'` to the main loop. If you are using the Swift SDK, make sure to add the line `use_frameworks!`. ```ruby use_frameworks! @@ -950,8 +952,6 @@ $ pod install For Objective-C projects, set the **Embedded Content Contains Swift Code** flag in your project to **Yes** (found under **Build Options** in the **Build Settings** tab). -Open .xcworkspace and navigate to **General** tab, scroll to **Embedded Binaries** select ObjectMapper.framework and click the `-` button, do the same for UberRides.framework. Now go to **Build Settings** tab and scroll to **Search Paths**, click on **Framework Search Paths** and remove the line $(PROJECT_DIR)/Carthage/Build/iOS. -Now got to **Build Phases** find the **Copy Carthage Frameworks** and remove it. Now you can build the project. Don’t forget to set `UberClientID`, `UberDisplayName`, and `UberCallbackURIs` in your `Info.plist` file. From e8fa928f27c652628ae33a574e12b2c1546179a4 Mon Sep 17 00:00:00 2001 From: David Lashkhi Date: Tue, 23 Aug 2016 14:40:49 +0400 Subject: [PATCH 4/4] Spelling --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2b0c5f4..13d6b684 100755 --- a/README.md +++ b/README.md @@ -931,7 +931,7 @@ This will build the required dependencies. Once you do that, open `Swift SDK.xco ### CocoaPods First, you will have to remove Carthage dependencies. Navigate to `examples/Swift SDK` or `examples/Obj-C SDK` and remove `Cartfile` and `Cartfile.resolved`. If you see a `Carthage` folder, remove that as well. Open .xcworkspace and navigate to **General** tab, scroll to **Embedded Binaries** select `ObjectMapper.framework` and click the `-` button, do the same for `UberRides.framework`. Now go to **Build Settings** tab and scroll to **Search Paths**, click on **Framework Search Paths** and remove the line $(PROJECT_DIR)/Carthage/Build/iOS. -Now got to **Build Phases** find the **Copy Carthage Frameworks** and remove it. +Now go to **Build Phases** find the **Copy Carthage Frameworks** and remove it. Now, still inside either `examples/Swift SDK` or `examples/Obj-C SDK`, create a new **Podfile** by running `pod init`, then add `pod 'UberRides'` to your main target. If you are using the Swift SDK, make sure to add the line `use_frameworks!`. Your **Podfile** should look something like this: