Skip to content

Commit 9ea144e

Browse files
ggurantzggurantz
committed
Create framework project for manual importing
1 parent 38c8df4 commit 9ea144e

File tree

18 files changed

+747
-12
lines changed

18 files changed

+747
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
All notable changes to this project will be documented in this file.
33
`LyftSDK` adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [1.0.3](https://github.com/lyft/Lyft-iOS-sdk/releases/tag/1.0.3)
6+
7+
- Create framework project that can be manually imported
8+
- Provide Carthage support
9+
510
## [1.0.2](https://github.com/lyft/Lyft-iOS-sdk/releases/tag/1.0.2)
611

712
Fix formatting mismatch in Lyft Button

‎Example/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PODS:
2-
- LyftSDK (1.0.2):
3-
- LyftSDK/Core (= 1.0.2)
4-
- LyftSDK/Core (1.0.2)
2+
- LyftSDK (1.0.3):
3+
- LyftSDK/Core (= 1.0.3)
4+
- LyftSDK/Core (1.0.3)
55
- OHHTTPStubs (5.2.1):
66
- OHHTTPStubs/Default (= 5.2.1)
77
- OHHTTPStubs/Core (5.2.1)
@@ -25,9 +25,9 @@ EXTERNAL SOURCES:
2525
:path: ../
2626

2727
SPEC CHECKSUMS:
28-
LyftSDK: 2dbb4a96fdbf26b6bdd2b14fd4f41509bf472942
28+
LyftSDK: 36cb780cacc423d36d54ea06649e07337409c5b8
2929
OHHTTPStubs: 3a42f25c00563b71355ac73112ba2324e9e6cef4
3030

3131
PODFILE CHECKSUM: 9ba4e26754fb7c0714263aaa9a831f1d0eeaa91e
3232

33-
COCOAPODS: 1.1.0.rc.3
33+
COCOAPODS: 1.1.1

‎LyftSDK.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Pod::Spec.new do |s|
22
s.name = 'LyftSDK'
3-
s.version = '1.0.2'
3+
s.version = '1.0.3'
44
s.summary = 'The official Lyft iOS SDK.'
55
s.homepage = 'https://github.com/lyft/lyft-iOS-sdk'
66
s.license = { :type => 'Apache', :file => 'LICENSE' }
7-
s.author = { 'Hyun Lim' => 'hlim@lyft.com' }
7+
s.author = { 'Gilad Gurantz' => 'gilad@lyft.com' }
88
s.source = { :git => 'https://github.com/lyft/lyft-iOS-sdk.git', :tag => s.version.to_s }
99
s.default_subspec = 'Core'
1010
s.ios.deployment_target = '8.0'

‎LyftSDK.xcodeproj/project.pbxproj‎

Lines changed: 570 additions & 0 deletions
Large diffs are not rendered by default.

‎LyftSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LyftSDK.xcodeproj/xcshareddata/xcschemes/LyftSDK.xcscheme‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0810"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "FB7CA7161DD1252800303FEB"
18+
BuildableName = "LyftSDK.framework"
19+
BlueprintName = "LyftSDK"
20+
ReferencedContainer = "container:LyftSDK.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "FB7CA71F1DD1252800303FEB"
36+
BuildableName = "LyftSDKTests.xctest"
37+
BlueprintName = "LyftSDKTests"
38+
ReferencedContainer = "container:LyftSDK.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "FB7CA7161DD1252800303FEB"
46+
BuildableName = "LyftSDK.framework"
47+
BlueprintName = "LyftSDK"
48+
ReferencedContainer = "container:LyftSDK.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<MacroExpansion>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "FB7CA7161DD1252800303FEB"
68+
BuildableName = "LyftSDK.framework"
69+
BlueprintName = "LyftSDK"
70+
ReferencedContainer = "container:LyftSDK.xcodeproj">
71+
</BuildableReference>
72+
</MacroExpansion>
73+
<AdditionalOptions>
74+
</AdditionalOptions>
75+
</LaunchAction>
76+
<ProfileAction
77+
buildConfiguration = "Release"
78+
shouldUseLaunchSchemeArgsEnv = "YES"
79+
savedToolIdentifier = ""
80+
useCustomWorkingDirectory = "NO"
81+
debugDocumentVersioning = "YES">
82+
<MacroExpansion>
83+
<BuildableReference
84+
BuildableIdentifier = "primary"
85+
BlueprintIdentifier = "FB7CA7161DD1252800303FEB"
86+
BuildableName = "LyftSDK.framework"
87+
BlueprintName = "LyftSDK"
88+
ReferencedContainer = "container:LyftSDK.xcodeproj">
89+
</BuildableReference>
90+
</MacroExpansion>
91+
</ProfileAction>
92+
<AnalyzeAction
93+
buildConfiguration = "Debug">
94+
</AnalyzeAction>
95+
<ArchiveAction
96+
buildConfiguration = "Release"
97+
revealArchiveInOrganizer = "YES">
98+
</ArchiveAction>
99+
</Scheme>

‎README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ $ pod install
4646
pod 'LyftSDK/API'
4747
```
4848

49+
### Carthage
50+
51+
[Carthage](https://github.com/Carthage/Carthage) is a simple, decentralized dependency manager for Cocoa. To import this SDK, add this to your Cartfile:
52+
53+
```
54+
github "lyft/Lyft-iOS-sdk"
55+
```
56+
57+
### Integrate without dependency manager
58+
59+
Drag the LyftSDK.xcodeproj project into your project's Project Navigator. In your project's Build Target, click on the General tab and then under Embedded Binaries click the + button. Select the LyftSDK.framework under your project.
60+
4961
## Usage
5062

5163
### SDK Configuration

‎Resources/Info.plist‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0.3</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
<key>NSPrincipalClass</key>
22+
<string></string>
23+
</dict>
24+
</plist>

‎Sources/LyftAPI/JSONMappable.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Foundation
2+
13
/// Represents an object that can be created from a json object
24
protocol JSONMappable {
35

@@ -13,11 +15,11 @@ protocol JSONMappable {
1315
/// - parameter json: The untyped json object to initialize this object with
1416
///
1517
/// - returns: An instance of this object if one can be created, or nil otherwise
16-
init?(json: Any)
18+
init?(json: Any?)
1719
}
1820

1921
extension JSONMappable {
20-
init?(json: Any) {
22+
init?(json: Any?) {
2123
if let json = json as? NSDictionary {
2224
self.init(json: json)
2325
} else {
@@ -33,7 +35,7 @@ extension Array where Element: JSONMappable {
3335
/// - parameter json: The json object representing the array of mappable items
3436
///
3537
/// - returns: An array of mapped items if one can be created, or nil otherwise
36-
init?(json: Any) {
38+
init?(json: Any?) {
3739
if let json = json as? [NSDictionary], json.count > 0 {
3840
self = json.flatMap { Element(json: $0) }
3941
} else {

‎Sources/LyftModels/Cost.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Foundation
2+
13
/// Cost and detail estimations for a pickup and destination
24
public struct RideCostEstimate {
35
/// Maximum estimated cost

0 commit comments

Comments
 (0)