Skip to content

Commit

Permalink
Merge d66b913 into 6cd499b
Browse files Browse the repository at this point in the history
  • Loading branch information
FabrizioBrancati committed Sep 16, 2018
2 parents 6cd499b + d66b913 commit 5019eb5
Show file tree
Hide file tree
Showing 28 changed files with 263 additions and 695 deletions.
6 changes: 0 additions & 6 deletions .codecov.yml

This file was deleted.

13 changes: 4 additions & 9 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Contributing
============
I'd love to see your ideas for improving this library.
I'd love to see your ideas for improving this project.

## Pull requests
The best way to contribute is by submitting a pull request.
Expand All @@ -9,18 +9,13 @@ I'll do my best to respond to you as soon as possible.
## Issues
If you find a bug or you have a suggestion create an issue.

## Coding style
Please make sure to follow my general coding style for new features.

#### Comment everything
Every function or variable (outside of a function) has to be commented.
Every line of the project must to be commented.

#### Writing code
Please follow my coding style.

Please follow [Ray Wenderlich - Swift Style Guide](https://github.com/raywenderlich/swift-style-guide#correctness) codestyle. Comment every public methods, properties, classes. Make commits as atomic as possible with understandable comment. If you are developing feature or fixing a bug, please mention the issue number (e.g. #1) in commit text.
Use ```MARK``` to separate each section type.
Example: Global variables, Global functions, Class variables, Instance variables, Class functions, Instance functions & Init functions.

#### Test everything
Add tests for every added functions.<br>
The aim is to have 100% test coverage.
Add tests for every added function. The aim is to have 100% of code coverage.
2 changes: 0 additions & 2 deletions .hound.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
coverage_service: coveralls
xcodeproj: Queuer.xcodeproj
scheme: Queuer iOS
ignore:
- Tests/*
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1
4.2
8 changes: 2 additions & 6 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ included:
- Tests

opt_in_rules:
- anyobject_protocol
- array_init
- attributes
- closure_end_indentation
Expand All @@ -27,6 +28,7 @@ opt_in_rules:
- literal_expression_end_indentation
- lower_acl_than_parent
- mark
- missing_docs
- modifier_order
- multiline_arguments
- multiline_function_chains
Expand Down Expand Up @@ -145,12 +147,6 @@ custom_rules:
regex: '\(\S+\?\.\S+\)!'
message: "Don't use ? first to force unwrap later – directly unwrap within the parantheses."
severity: warning
missing_docs:
included: ".*.swift"
name: "Missing Docs"
regex: '\n *(?!\/\/\/)(\/\/)?[^\n\/]*\n *(?:@\S+ )*(?!override)(?:public|open)'
message: "Types, properties and methods with public or open access level should be documented."
severity: warning
redundant_parentheses:
included: ".*.swift"
name: "Redundant Parentheses"
Expand Down
55 changes: 28 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,68 +14,69 @@ matrix:
env: SPM="YES"
- os: osx
language: objective-c
osx_image: xcode9.4
osx_image: xcode10
env: SPM="YES"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=11.4,name=iPhone X" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="YES"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=12.0,name=iPhone X" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="YES"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=11.1,name=iPhone 7 Plus" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="YES" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=11.4,name=iPhone 7 Plus" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="YES" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=10.3.1,name=iPhone 6" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=10.3.1,name=iPhone 6" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=9.0,name=iPhone 5s" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=9.0,name=iPhone 5s" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.2
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=11.2,name=Apple TV 4K" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=11.2,name=Apple TV 4K" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=9.0,name=Apple TV 1080p" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=9.0,name=Apple TV 1080p" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=4.2,name=Apple Watch Series 3 - 42mm" SCHEME="$WATCHOS_SCHEME" RUN_TESTS="NO" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=4.2,name=Apple Watch Series 3 - 42mm" SCHEME="$WATCHOS_SCHEME" RUN_TESTS="NO" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_SCHEME" RUN_TESTS="NO" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_SCHEME" RUN_TESTS="NO" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=2.0,name=Apple Watch - 38mm" SCHEME="$WATCHOS_SCHEME" RUN_TESTS="NO" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="OS=2.0,name=Apple Watch - 38mm" SCHEME="$WATCHOS_SCHEME" RUN_TESTS="NO" LINT="NO" COVERAGE="NO"
- os: osx
language: objective-c
osx_image: xcode9.4
env: PROJ="Queuer.xcodeproj" DESTINATION="arch=x86_64" SCHEME="$MACOS_SCHEME" RUN_TESTS="YES" LINT="NO" CODECOV="NO"
osx_image: xcode10
env: PROJ="Queuer.xcodeproj" DESTINATION="arch=x86_64" SCHEME="$MACOS_SCHEME" RUN_TESTS="YES" LINT="NO" COVERAGE="NO"

before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
gem install xcpretty -N --no-ri --no-rdoc;
gem install cocoapods --pre --no-rdoc --no-ri --no-document;
brew update;
brew outdated carthage || brew upgrade carthage;
gem install slather;
fi

install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)";
eval "$(curl -sL https://swiftenv.fuller.li/install.sh)";
fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
./install_swiftlint.sh;
Expand Down Expand Up @@ -110,6 +111,6 @@ script:
fi

after_success:
- if [ "$CODECOV" == "YES" ]; then
bash <(curl -s https://codecov.io/bash) -X xcodeplist;
- if [ "$COVERAGE" == "YES" ]; then
slather;
fi
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,24 @@ All notable changes to this project will be documented in this file.<br>

---

## Swift 4.2
### Added
- Added support to Xcode 10 and Swift 4.2

### Changed
- Changed from Codecov to Coveralls service for code coverage

---

## Develop
### Improved
- Updated SwiftLint to 0.27.0

### Removed
- Removed Hound CI

---

## [1.3.2](https://github.com/FabrizioBrancati/Queuer/releases/tag/1.3.2) - Linux Quality
### 7 Jul 2018
### Added
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:4.2
//
// Package.swift
// Queuer
Expand Down
2 changes: 1 addition & 1 deletion Queuer.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/FabrizioBrancati/Queuer.git', :tag => s.version }
s.documentation_url = 'https://github.fabriziobrancati.com/documentation/Queuer/'

s.swift_version = '4.1'
s.swift_version = '4.2'

s.source_files = 'Sources/**/*.swift'

Expand Down

0 comments on commit 5019eb5

Please sign in to comment.