Skip to content

Commit

Permalink
Merge branch 'release/2.0.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackjacx committed Sep 18, 2020
2 parents 876ad57 + f14d9ab commit 89e86e6
Show file tree
Hide file tree
Showing 69 changed files with 810 additions and 1,427 deletions.
3 changes: 0 additions & 3 deletions .codecov.yml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
37 changes: 37 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI
on: [push, pull_request]
env:
FRAMEWORK: "SHSearchBar"
XCOV_SCHEME: "SHSearchBar-iOS"
FRAMEWORK_WORKSPACE: "SHSearchBar.xcworkspace"
FASTLANE_XCODE_LIST_TIMEOUT: 999
FASTLANE_WORK_DIR: .
MINT_PATH: ${{ github.workspace }}/mint

jobs:
bootstrap-and-test:
name: Test
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Download Configuration Files
run: bash <(curl -s https://raw.githubusercontent.com/Blackjacx/Scripts/master/frameworks/bootstrap.sh) -d
- name: Cache RubyGems
uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: ${{ runner.os }}-gem-
- name: Cache Mint packages
uses: actions/cache@v2
with:
path: ${{ env.MINT_PATH }}
key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
restore-keys: ${{ runner.os }}-mint-
- name: Install dependencies
run: bash <(curl -s https://raw.githubusercontent.com/Blackjacx/Scripts/master/frameworks/bootstrap.sh)
- name: Run tests
run: bundle exec fastlane test framework:${{ env.FRAMEWORK }} run_danger:${{ github.event_name }}
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82 changes: 63 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
# OS X
.DS_Store

# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

# macos
**/.DS_Store
**/.env

## CI
codesigndoc_exports

# Carthage framework bundle - created during release process
*.framework.zip
# Fastlane config script is downloaded
fastlane/Fastfile
# Fastlane plugin config is downloaded
fastlane/Pluginfile
# Mint dependencies file which is downloaded
Mintfile
# Swiftlint config file which is downloaded
.swiftlint.yml
# Danger config file which is downloaded
Dangerfile
# Ruby gems config file which is downloaded
Gemfile
# Bundler configuration which is bootstrapped
.bundle
# Bundler vendor information which is bootstrapped
vendor

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -12,40 +42,54 @@ build/
*.perspectivev3
!default.perspectivev3
xcuserdata/
*.xccheckout
profile

## Other
*.moved-aside
DerivedData
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

# Auto generated
docs/
## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Bundler
.bundle

Carthage
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
# Note: if you ignore the Pods directory, make sure to uncomment
# `pod install` in .travis.yml
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Build

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
.build/
.swiftpm

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/.env
fastlane/README.md
fastlane/*.coverage.txt
fastlane/README.md
28 changes: 16 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

## [2.0.0] - 2020-09-18
* [#54](https://github.com/Blackjacx/SHSearchBar/pull/54): Swift 5.3 & swift package manager - [@Blackjacx](https://github.com/Blackjacx).
* [#50](https://github.com/Blackjacx/SHSearchBar/pull/50): Update readme badges - [@blackjacx](https://github.com/blackjacx).

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

Expand Down Expand Up @@ -36,25 +40,25 @@

## [1.2.1] - 2017-10-16
### Changed
* Update podspec by removing non-source from sources. - [@blackjacx](https://github.com/blackjacx).
* Update podspec by removing non-source from sources - [@blackjacx](https://github.com/blackjacx).

## [1.2.0] - 2017-09-29
### Added
* [#15](https://github.com/Blackjacx/SHSearchBar/pull/15): translations for DE, EN, ES, FR, IT, JA, ZH-HANS, RU - [@blackjacx](https://github.com/blackjacx).
* first responder handling by forwarding related calls directly to the textfield - [@blackjacx](https://github.com/blackjacx).
* [#15](https://github.com/Blackjacx/SHSearchBar/pull/15): Translations for DE EN ES FR IT JA ZHHANS and RU - [@blackjacx](https://github.com/blackjacx).
* First responder handling by forwarding related calls directly to the textfield - [@blackjacx](https://github.com/blackjacx).

### Changed
* [#26](https://github.com/Blackjacx/SHSearchBar/pull/26): Conversion to Swift 4 - [@blackjacx](https://github.com/blackjacx).
* [#2](https://github.com/Blackjacx/SHSearchBar/pull/2): improves code documentation - [@blackjacx](https://github.com/blackjacx).
* [#14](https://github.com/Blackjacx/SHSearchBar/pull/14): adopts swift 3 naming conventions - [@blackjacx](https://github.com/blackjacx).
* replaces non-swifty implementation of optional SHSearchBarDelegate methods by a default implementation of each method on a protocol extension - [@blackjacx](https://github.com/blackjacx).
* resigns and resets the textField per default when pressing cancel button - [@blackjacx](https://github.com/blackjacx).
* left and right view is now property of the config object - [@blackjacx](https://github.com/blackjacx).
* replaces textColor and textBackgroundColor with textAttributes in config - [@blackjacx](https://github.com/blackjacx).
* [#2](https://github.com/Blackjacx/SHSearchBar/pull/2): Improves code documentation - [@blackjacx](https://github.com/blackjacx).
* [#14](https://github.com/Blackjacx/SHSearchBar/pull/14): Adopts swift 3 naming conventions - [@blackjacx](https://github.com/blackjacx).
* Replaces non-swifty implementation of optional SHSearchBarDelegate methods by a default implementation of each method on a protocol extension - [@blackjacx](https://github.com/blackjacx).
* Resigns and resets the textField per default when pressing cancel button - [@blackjacx](https://github.com/blackjacx).
* Left and right view is now property of the config object - [@blackjacx](https://github.com/blackjacx).
* Replaces textColor and textBackgroundColor with textAttributes in config - [@blackjacx](https://github.com/blackjacx).

### Fixed
* cancellation in the example project - [@blackjacx](https://github.com/blackjacx).
* [#6](https://github.com/Blackjacx/SHSearchBar/pull/6): resolves but did not fix SPM support - [@blackjacx](https://github.com/blackjacx).
* Cancellation in the example project - [@blackjacx](https://github.com/blackjacx).
* [#6](https://github.com/Blackjacx/SHSearchBar/pull/6): Resolves but did not fix SPM support - [@blackjacx](https://github.com/blackjacx).

### Removed
* boxed type from specs since Swift3 uses Any for dictionary values that includes structs - [@blackjacx](https://github.com/blackjacx).
* Boxed type from specs since Swift3 uses Any for dictionary values that includes structs - [@blackjacx](https://github.com/blackjacx).
Loading

0 comments on commit 89e86e6

Please sign in to comment.