Skip to content

Commit 6e1f3bf

Browse files
authored
Add Swift 5.1 Support (#20)
* Update CHANGELOG.md * Update gitmodules * Reactivate modules * Update modules * Remove stale submodule * Update version * Update build settings
1 parent 8224545 commit 6e1f3bf

File tree

10 files changed

+37
-28
lines changed

10 files changed

+37
-28
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "Carthage/Checkouts/Alamofire"]
22
path = Carthage/Checkouts/Alamofire
33
url = https://github.com/Alamofire/Alamofire.git
4-
[submodule "Carthage/Checkouts/AlamofireObjectMapper"]
5-
path = Carthage/Checkouts/AlamofireObjectMapper
6-
url = https://github.com/tristanhimmelman/AlamofireObjectMapper.git
74
[submodule "Carthage/Checkouts/ObjectMapper"]
85
path = Carthage/Checkouts/ObjectMapper
96
url = https://github.com/tristanhimmelman/ObjectMapper.git

CDYelpFusionKit.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'CDYelpFusionKit'
3-
s.version = '2.0.0'
3+
s.version = '2.1.0'
44
s.license = { :type => 'MIT', :file => 'LICENSE' }
55
s.summary = 'An extensive Swift wrapper for the Yelp Fusion API.'
66
s.description = <<-DESC
@@ -15,11 +15,11 @@ Pod::Spec.new do |s|
1515
s.tvos.deployment_target = '10.0'
1616
s.watchos.deployment_target = '3.0'
1717

18-
s.swift_versions = ['5.0', '5.1']
18+
s.swift_versions = ['5.1', '5.2']
1919

2020
s.source_files = 'Source/*.swift'
2121
s.resources = ['Resources/*.xcassets']
2222

23-
s.dependency 'Alamofire', '5.0.5'
24-
s.dependency 'ObjectMapper', '4.0.0'
23+
s.dependency 'Alamofire', '5.2.2'
24+
s.dependency 'ObjectMapper', '4.2.0'
2525
end

CDYelpFusionKit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -647,22 +647,22 @@
647647
5FBF0E661EBFFEB0004C1F6B = {
648648
CreatedOnToolsVersion = 8.3.2;
649649
LastSwiftMigration = 1010;
650-
ProvisioningStyle = Manual;
650+
ProvisioningStyle = Automatic;
651651
};
652652
B285D9E71FBD34F400FA9ABB = {
653653
CreatedOnToolsVersion = 9.1;
654654
LastSwiftMigration = 0910;
655-
ProvisioningStyle = Manual;
655+
ProvisioningStyle = Automatic;
656656
};
657657
B285DA281FBE1AA600FA9ABB = {
658658
CreatedOnToolsVersion = 9.1;
659659
LastSwiftMigration = 1010;
660-
ProvisioningStyle = Manual;
660+
ProvisioningStyle = Automatic;
661661
};
662662
B2C6E1E51FBCF25A00FE8462 = {
663663
CreatedOnToolsVersion = 9.1;
664664
LastSwiftMigration = 1010;
665-
ProvisioningStyle = Manual;
665+
ProvisioningStyle = Automatic;
666666
};
667667
};
668668
};
@@ -1107,7 +1107,7 @@
11071107
CLANG_WARN_SUSPICIOUS_MOVE = YES;
11081108
CLANG_WARN_UNREACHABLE_CODE = YES;
11091109
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1110-
CODE_SIGN_STYLE = Manual;
1110+
CODE_SIGN_STYLE = Automatic;
11111111
COPY_PHASE_STRIP = NO;
11121112
CURRENT_PROJECT_VERSION = 1;
11131113
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1131,7 +1131,7 @@
11311131
INFOPLIST_FILE = Source/Info.plist;
11321132
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
11331133
MACOSX_DEPLOYMENT_TARGET = 10.12;
1134-
MARKETING_VERSION = 2.0.0;
1134+
MARKETING_VERSION = 2.1.0;
11351135
ONLY_ACTIVE_ARCH = YES;
11361136
PRODUCT_BUNDLE_IDENTIFIER = com.christopherdehaan.CDYelpFusionKit;
11371137
PRODUCT_NAME = CDYelpFusionKit;
@@ -1177,7 +1177,7 @@
11771177
CLANG_WARN_SUSPICIOUS_MOVE = YES;
11781178
CLANG_WARN_UNREACHABLE_CODE = YES;
11791179
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1180-
CODE_SIGN_STYLE = Manual;
1180+
CODE_SIGN_STYLE = Automatic;
11811181
COPY_PHASE_STRIP = YES;
11821182
CURRENT_PROJECT_VERSION = 1;
11831183
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1195,7 +1195,7 @@
11951195
INFOPLIST_FILE = Source/Info.plist;
11961196
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
11971197
MACOSX_DEPLOYMENT_TARGET = 10.12;
1198-
MARKETING_VERSION = 2.0.0;
1198+
MARKETING_VERSION = 2.1.0;
11991199
PRODUCT_BUNDLE_IDENTIFIER = com.christopherdehaan.CDYelpFusionKit;
12001200
PRODUCT_NAME = CDYelpFusionKit;
12011201
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
33
`CDYelpFusionKit` adheres to [Semantic Versioning](https://semver.org/).
44

55
#### 2.x Releases
6+
- `2.1.x` Releases - [2.1.0](#210)
67
- `2.0.x` Releases - [2.0.0](#200)
78

89
#### 1.x Releases
@@ -15,12 +16,23 @@ All notable changes to this project will be documented in this file.
1516

1617
---
1718

19+
## [2.1.0](https://github.com/chrisdhaan/CDYelpFusionKit/releases/tag/2.1.0)
20+
## SDK Support
21+
Released on 2020-08-31.
22+
23+
#### Added
24+
25+
- [x] Swift 5.1
26+
27+
---
28+
1829
## [2.0.0](https://github.com/chrisdhaan/CDYelpFusionKit/releases/tag/2.0.0)
19-
## API Endpoints
30+
## SDK Support and API Endpoints
2031
Released on 2020-08-30.
2132

2233
#### Added
2334

35+
- [x] Swift 5.0
2436
- [x] API Endpoints
2537
- [x] All Categories
2638
- [x] Category Details

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Alamofire/Alamofire" == 5.0.5
2-
github "tristanhimmelman/ObjectMapper" == 4.0.0
1+
github "Alamofire/Alamofire" == 5.2.2
2+
github "tristanhimmelman/ObjectMapper" == 4.2.0

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Alamofire/Alamofire" "5.0.5"
2-
github "tristanhimmelman/ObjectMapper" "4.0.0"
1+
github "Alamofire/Alamofire" "5.2.2"
2+
github "tristanhimmelman/ObjectMapper" "4.2.0"

Carthage/Checkouts/Alamofire

Submodule Alamofire updated 350 files

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ let package = Package(
4141
targets: ["CDYelpFusionKit"])
4242
],
4343
dependencies: [
44-
.package(url: "https://github.com/Alamofire/Alamofire.git", "5.0.5")
45-
.package(url: "https://github.com/tristanhimmelman/ObjectMapper", "4.0.0")
44+
.package(url: "https://github.com/Alamofire/Alamofire.git", "5.2.2")
45+
.package(url: "https://github.com/tristanhimmelman/ObjectMapper", "4.2.0")
4646
],
4747
targets: [
4848
.target(

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ For a demonstration of the capabilities of CDYelpFusionKit; run the iOS Example
9898
## Requirements
9999

100100
- iOS 10.0+ / macOS 10.12+ / tvOS 10.0+ / watchOS 3.0+
101-
- Xcode 10.2+
102-
- Swift 5+
101+
- Xcode 11+
102+
- Swift 5.1+
103103
- [Yelp API Access](https://www.yelp.com/developers/v3/manage_app)
104104

105105
---
@@ -118,15 +118,15 @@ For a demonstration of the capabilities of CDYelpFusionKit; run the iOS Example
118118
[CocoaPods](https://cocoapods.org) is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate CDYelpFusionKit into your Xcode project using CocoaPods, specify it in your `Podfile`:
119119

120120
```ruby
121-
pod 'CDYelpFusionKit', '2.0.0'
121+
pod 'CDYelpFusionKit', '2.1.0'
122122
```
123123

124124
### Carthage
125125

126126
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. To integrate CDYelpFusionKit into your Xcode project using Carthage, specify it in your `Cartfile`:
127127

128128
```ogdl
129-
github "chrisdhaan/CDYelpFusionKit" == 2.0.0
129+
github "chrisdhaan/CDYelpFusionKit" == 2.1.0
130130
```
131131

132132
### Swift Package Manager

0 commit comments

Comments
 (0)