Skip to content

Commit

Permalink
Bug Fixes (#24)
Browse files Browse the repository at this point in the history
* Update copyright

* Remove URLTransform and DateTransform

* Bump version

* Fix SwiftPackageManager support

* Update CHANGELOG.md

* Update CHANGELOG.md
  • Loading branch information
chrisdhaan authored May 30, 2021
1 parent 6e1f3bf commit 909e2a9
Show file tree
Hide file tree
Showing 43 changed files with 90 additions and 71 deletions.
2 changes: 1 addition & 1 deletion CDYelpFusionKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'CDYelpFusionKit'
s.version = '2.1.0'
s.version = '2.1.1'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'An extensive Swift wrapper for the Yelp Fusion API.'
s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions CDYelpFusionKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@
INFOPLIST_FILE = Source/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.1;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.christopherdehaan.CDYelpFusionKit;
PRODUCT_NAME = CDYelpFusionKit;
Expand Down Expand Up @@ -1195,7 +1195,7 @@
INFOPLIST_FILE = Source/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 2.1.0;
MARKETING_VERSION = 2.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.christopherdehaan.CDYelpFusionKit;
PRODUCT_NAME = CDYelpFusionKit;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
`CDYelpFusionKit` adheres to [Semantic Versioning](https://semver.org/).

#### 2.x Releases
- `2.1.x` Releases - [2.1.0](#210)
- `2.1.x` Releases - [2.1.0](#210) | [2.1.1](#211)
- `2.0.x` Releases - [2.0.0](#200)

#### 1.x Releases
Expand All @@ -16,6 +16,20 @@ All notable changes to this project will be documented in this file.

---

## [2.1.1](https://github.com/chrisdhaan/CDYelpFusionKit/releases/tag/2.1.1)
## Bug Fixes
Released on 2021-05-30.

#### Updated

- [x] Models
- [x] `URL` types to `String`
- [x] `Date` types to `String`
- [x] Switch Package Manager
- [x] To build with `swift-tools-version:5.1`

---

## [2.1.0](https://github.com/chrisdhaan/CDYelpFusionKit/releases/tag/2.1.0)
## SDK Support
Released on 2020-08-31.
Expand Down
17 changes: 11 additions & 6 deletions Example/Resources/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -23,7 +23,7 @@
<constraint firstAttribute="height" constant="43" id="LaE-vT-1UZ"/>
</constraints>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" systemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="iOS Example" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="PVG-pz-erk">
Expand All @@ -32,16 +32,16 @@
<constraint firstAttribute="height" constant="34" id="KLO-Su-xYQ"/>
</constraints>
<fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" systemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2016-2020 Christopher de Haan. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="Wfq-wn-afO">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2016-2021 Christopher de Haan. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="Wfq-wn-afO">
<rect key="frame" x="5" y="559" width="590" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="kw4-hn-3g1"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" systemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
Expand All @@ -65,4 +65,9 @@
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</scene>
</scenes>
<resources>
<systemColor name="darkTextColor">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
2 changes: 1 addition & 1 deletion Example/Source/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/06/2016.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Source/CDYelpFusionKitManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/6/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Source/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/06/2016.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright © 2016-2020 Christopher de Haan <[email protected]>
Copyright © 2016-2021 Christopher de Haan <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// swift-tools-version:5.1
//
// Package.swift
// CDYelpFusionKit
//
// Created by Christopher de Haan on 05/07/2017.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -50,4 +51,3 @@ let package = Package(
path: "CDYelpFusionKit")
],
swiftLanguageVersions: [.v5])
)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ For a demonstration of the capabilities of CDYelpFusionKit; run the iOS Example
[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`:

```ruby
pod 'CDYelpFusionKit', '2.1.0'
pod 'CDYelpFusionKit', '2.1.1'
```

### Carthage

[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`:

```ogdl
github "chrisdhaan/CDYelpFusionKit" == 2.1.0
github "chrisdhaan/CDYelpFusionKit" == 2.1.1
```

### Swift Package Manager
Expand Down
2 changes: 1 addition & 1 deletion Source/Alamofire+ObjectMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 8/30/20.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDColor+CDYelpFusionKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/9/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDColor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/28/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDImage+CDYelpFusionKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/9/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDImage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/28/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpAPIClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/7/16.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpAutoCompleteResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/7/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 5 additions & 5 deletions Source/CDYelpBusiness.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 11/29/16.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand All @@ -31,9 +31,9 @@ public class CDYelpBusiness: Mappable {

public var id: String?
public var name: String?
public var imageUrl: URL?
public var imageUrl: String?
public var isClosed: Bool?
public var url: URL?
public var url: String?
public var price: String?
public var phone: String?
public var displayPhone: String?
Expand All @@ -53,9 +53,9 @@ public class CDYelpBusiness: Mappable {
public func mapping(map: Map) {
id <- map["id"]
name <- map["name"]
imageUrl <- (map["image_url"], URLTransform())
imageUrl <- map["image_url"]
isClosed <- map["is_closed"]
url <- (map["url"], URLTransform())
url <- map["url"]
price <- map["price"]
phone <- map["phone"]
displayPhone <- map["display_phone"]
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpBusinessResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/7/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpCategoriesResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 9/27/19.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpCategory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/6/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpCategoryResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 9/27/19.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpCenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/6/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/7/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpCoordinates.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/6/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpEnums.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 7/25/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/CDYelpError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by Christopher de Haan on 5/7/17.
//
// Copyright © 2016-2020 Christopher de Haan <[email protected]>
// Copyright © 2016-2021 Christopher de Haan <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 909e2a9

Please sign in to comment.