Skip to content

Commit

Permalink
Merge branch 'release/1.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Blackjacx
Blackjacx committed May 5, 2019
2 parents e45aedb + 2c74a86 commit 876ad57
Show file tree
Hide file tree
Showing 13 changed files with 126 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .swift-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [Unreleased]

## [1.7.0] - 2019-05-05
* [#49](https://github.com/Blackjacx/SHSearchBar/pull/49): Swift 5 Compatibility - [@blackjacx](https://github.com/blackjacx).

## [1.6.0] - 2018-12-18
* [#47](https://github.com/Blackjacx/SHSearchBar/pull/47): Carthage Support - [@blackjacx](https://github.com/blackjacx).
* [#46](https://github.com/Blackjacx/SHSearchBar/pull/46): Extending Example App - [@blackjacx](https://github.com/blackjacx).
Expand Down
5 changes: 3 additions & 2 deletions Example/SHSearchBarExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
TargetAttributes = {
B9C8325C21C84F3D0008ED90 = {
CreatedOnToolsVersion = 10.1;
LastSwiftMigration = 1020;
};
};
};
Expand Down Expand Up @@ -395,7 +396,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.codingcobra.SHSearchBarExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -412,7 +413,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.codingcobra.SHSearchBarExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
128 changes: 71 additions & 57 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.10)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
atomos (0.1.3)
babosa (1.0.2)
Expand All @@ -16,35 +16,35 @@ GEM
cork
nap
open4 (~> 1.3)
cocoapods (1.5.3)
cocoapods (1.6.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.2.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.1)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
Expand All @@ -53,65 +53,68 @@ GEM
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.6.7)
danger (6.0.6)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 1.0)
git (~> 1.5)
kramdown (~> 1.5)
kramdown (~> 2.0)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-changelog (0.3.0)
danger-changelog (0.4.2)
danger-plugin-api (~> 1.0)
danger-commit_lint (0.0.7)
danger-plugin-api (~> 1.0)
danger-commit_lint (0.0.6)
danger (~> 5.0)
danger-plugin-api (1.0.0)
danger (> 2.0)
danger-swiftlint (0.17.3)
danger-swiftlint (0.21.0)
danger
rake (> 10)
thor (~> 0.19)
declarative (0.0.10)
declarative-option (0.1.0)
digest-crc (0.4.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.5.0)
emoji_regex (0.1.1)
dotenv (2.7.2)
emoji_regex (1.0.1)
escape (0.0.4)
excon (0.62.0)
faraday (0.15.3)
excon (0.64.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
faraday_middleware (0.12.2)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.4)
fastlane (2.105.2)
fastimage (2.1.5)
fastlane (2.122.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (~> 0.1)
emoji_regex (>= 0.1, < 2.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.24.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
Expand All @@ -124,16 +127,16 @@ GEM
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.6.0, < 2.0.0)
xcodeproj (>= 1.8.1, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-changelog (0.9.0)
fourflusher (2.0.1)
fastlane-plugin-changelog (0.14.0)
fourflusher (2.2.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.5.0)
Expand All @@ -145,10 +148,19 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
googleauth (0.6.6)
google-cloud-core (1.3.0)
google-cloud-env (~> 1.0)
google-cloud-env (1.0.5)
faraday (~> 0.11)
google-cloud-storage (1.16.0)
digest-crc (~> 0.4)
google-api-client (~> 0.23)
google-cloud-core (~> 1.2)
googleauth (>= 0.6.2, < 0.10.0)
googleauth (0.6.7)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.12)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
Expand All @@ -158,13 +170,15 @@ GEM
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.1.0)
json (2.2.0)
jwt (2.1.0)
kramdown (1.17.0)
kramdown (2.1.0)
kramdown-parser-gfm (1.0.1)
kramdown (~> 2.0)
memoist (0.16.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mime-types-data (3.2019.0331)
mini_magick (4.5.1)
minitest (5.11.3)
molinillo (0.6.6)
Expand All @@ -176,26 +190,26 @@ GEM
naturally (2.2.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (4.12.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
os (1.0.0)
plist (3.4.0)
os (1.0.1)
plist (3.5.0)
public_suffix (2.0.5)
rake (12.3.1)
rake (12.3.2)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rouge (2.0.7)
ruby-macho (1.2.0)
ruby-macho (1.4.0)
rubyzip (1.2.2)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
security (0.1.3)
signet (0.10.0)
signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
Expand All @@ -204,24 +218,24 @@ GEM
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (1.8.0)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tty-cursor (0.6.0)
tty-cursor (0.6.1)
tty-screen (0.6.5)
tty-spinner (0.8.0)
tty-cursor (>= 0.5.0)
tty-spinner (0.9.0)
tty-cursor (~> 0.6.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
unf_ext (0.0.7.6)
unicode-display_width (1.5.0)
word_wrap (1.0.0)
xcodeproj (1.6.0)
xcodeproj (1.9.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down Expand Up @@ -252,4 +266,4 @@ DEPENDENCIES
xcov

BUNDLED WITH
1.16.1
2.0.1
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2018 Stefan Herold <[email protected]>
Copyright (c) 2019 Stefan Herold <[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 Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- Nimble (7.3.1)
- Quick (1.3.2)
- Nimble (8.0.1)
- Quick (2.1.0)

DEPENDENCIES:
- Nimble
Expand All @@ -12,9 +12,9 @@ SPEC REPOS:
- Quick

SPEC CHECKSUMS:
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d

PODFILE CHECKSUM: 9f907140054c0e19b3f3d6d685db43e2d0a6f3f5

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
17 changes: 11 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,17 @@
<img alt="Github Current Release" src="https://img.shields.io/github/release/blackjacx/SHSearchBar.svg" />
<img alt="Cocoapods Platforms" src="https://img.shields.io/cocoapods/p/SHSearchBar.svg"/>
<img alt="Xcode 10.0+" src="https://img.shields.io/badge/Xcode-10.0%2B-blue.svg"/>
<img alt="iOS 9.0+" src="https://img.shields.io/badge/iOS-9.0%2B-blue.svg"/>
<img alt="iOS 10.0+" src="https://img.shields.io/badge/iOS-10.0%2B-blue.svg"/>
<img alt="Swift 4.2+" src="https://img.shields.io/badge/Swift-4.2%2B-orange.svg"/>
<img alt="Github Repo Size" src="https://img.shields.io/github/repo-size/blackjacx/SHSearchBar.svg" />
<img alt="Github Code Size" src="https://img.shields.io/github/languages/code-size/blackjacx/SHSearchBar.svg" />
<img alt="Github Closed PR's" src="https://img.shields.io/github/issues-pr-closed/blackjacx/SHSearchBar.svg" />
<!-- <a href="https://github.com/Carthage/Carthage">
<a href="https://github.com/Carthage/Carthage">
<img alt="Carthage compatible" src="https://img.shields.io/badge/Carthage-Compatible-brightgreen.svg?style=flat"/>
</a> -->
</a>
<a href="https://github.com/Blackjacx/SHSearchBar/blob/develop/LICENSE?raw=true">
<img alt="License" src="https://img.shields.io/cocoapods/l/SHSearchBar.svg?style=flat"/>
</a>
<a href="https://codecov.io/gh/Blackjacx/SHSearchBar">
<img src="https://codecov.io/gh/Blackjacx/SHSearchBar/branch/develop/graph/badge.svg" />
</a>
<a href="https://codebeat.co/projects/github-com-blackjacx-shsearchbar">
<img alt="Codebeat" src="https://codebeat.co/badges/44539071-5029-4379-9d33-99dd721915c8" />
</a>
Expand Down Expand Up @@ -60,6 +57,14 @@ To install it, simply add the following line to your Podfile:
pod "SHSearchBar"
```

### Carthage

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

```ruby
github "Blackjacx/SHSearchBar"
```

## Examples

The repo includes an example project. It shows shows different use cases of
Expand Down
2 changes: 1 addition & 1 deletion SHSearchBar.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SHSearchBar'
s.version = '1.6.0'
s.version = '1.7.0'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'The search bar that does not suck.'
s.description = <<-DESC
Expand Down
Loading

0 comments on commit 876ad57

Please sign in to comment.