Skip to content

Commit

Permalink
Merge 83b28f3 into 07db751
Browse files Browse the repository at this point in the history
  • Loading branch information
@FabrizioBrancati
FabrizioBrancati committed Oct 22, 2018
2 parents 07db751 + 83b28f3 commit 1ad7fdc
Show file tree
Hide file tree
Showing 39 changed files with 1,210 additions and 951 deletions.
6 changes: 0 additions & 6 deletions .codecov.yml
View file

This file was deleted.

5 changes: 5 additions & 0 deletions .slather.yml
View file
@@ -0,0 +1,5 @@
coverage_service: coveralls
xcodeproj: Queuer.xcodeproj
scheme: Queuer iOS
ignore:
- Tests/*
2 changes: 1 addition & 1 deletion .swift-version
View file
@@ -1 +1 @@
4.1
4.2
64 changes: 35 additions & 29 deletions .travis.yml
View file
Expand Up @@ -14,68 +14,73 @@ 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=12.0,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=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=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=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=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=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=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=5.0,name=Apple Watch Series 4 - 44mm" 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=4.2,name=Apple Watch Series 3 - 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="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: 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 All @@ -87,8 +92,9 @@ script:
- swift -version

- if [ "$SPM" == "YES" ]; then
swift build;
swift test --parallel;
swift package clean;
ruby generate_linux_tests.rb;
swift test;
fi

- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
Expand All @@ -110,6 +116,6 @@ script:
fi

after_success:
- if [ "$CODECOV" == "YES" ]; then
bash <(curl -s https://codecov.io/bash) -X xcodeplist;
- if [ "$COVERAGE" == "YES" ]; then
slather;
fi
28 changes: 26 additions & 2 deletions CHANGELOG.md
View file
Expand Up @@ -8,6 +8,9 @@ All notable changes to this project will be documented in this file.<br>

---

### 2.x Releases
- `2.0.x` Releases - [2.0.0](#200---let-me-retry)

### 1.x Releases
- `1.3.x` Releases - [1.3.0](#130---open-everything) | [1.3.1](#131---swift-41-support) | [1.3.2](#132---linux-quality)
- `1.2.x` Releases - [1.2.0](#120---swift-4-support) | [1.2.1](#121---unwanted-alert)
Expand All @@ -16,13 +19,34 @@ All notable changes to this project will be documented in this file.<br>

---

## Develop
## [2.0.0](https://github.com/FabrizioBrancati/Queuer/releases/tag/2.0.0) - Let Me Retry
### XX XXX 2018
### Added
- Added support to Xcode 10 and Swift 4.2
- Added retry feature to `ConcurrentOperation` class [#10](https://github.com/FabrizioBrancati/BFKit-Swift/issues/10), more info on how to use it [here](https://github.com/FabrizioBrancati/Queuer#automatically-retry-an-operation) and [here](https://github.com/FabrizioBrancati/Queuer#manually-retry-an-operation)
- Added `addCompletionHandler(_:)` function to `Queuer` class
- Added a `Scheduler` class to better schedule your tasks

### Changed
- Changed watchOS target to watchOS 3.0 instead of 2.0, thanks to an App Store submission rule [#11](https://github.com/FabrizioBrancati/BFKit-Swift/issues/11)
- Changed `executionBlock` of `ConcurrentOperation` to pass the `concurrentOperation` variable inside the closure to be able to use the retry feature. If you don't need it simply put `_ in` after the block creation:
```swift
let concurrentOperation = ConcurrentOperation { _ in
/// Your task here
}
```
This also affects `SynchronousOperation`
- Changed from Codecov to Coveralls service for code coverage

### Improved
- Improved `Semaphore` with timeout handling
- Updated SwiftLint to 0.27.0

### Removed
- Removed Hound CI

Thanks to [@zykloman](https://github.com/zykloman) and [@debjitk](https://github.com/debjitk) for this release

---

## [1.3.2](https://github.com/FabrizioBrancati/Queuer/releases/tag/1.3.2) - Linux Quality
Expand Down Expand Up @@ -96,7 +120,7 @@ Thanks to [@BabyAzerty](https://github.com/BabyAzerty) for this release
- Updated SwiftLint to 0.21.0

### Fixed
- Now `ConcurrentOperation` is subclassable with `open` instead of `public` Access Control [#2](https://github.com/FabrizioBrancati/Queuer/issue/2)
- Now `ConcurrentOperation` is subclassable with `open` instead of `public` Access Control [#2](https://github.com/FabrizioBrancati/Queuer/issues/2)
- Fixed tests that sometimes fails

---
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:4.2
//
// Package.swift
// Queuer
Expand Down
6 changes: 3 additions & 3 deletions Queuer.podspec
View file
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'Queuer'
s.module_name = 'Queuer'
s.version = '1.3.2'
s.version = '2.0.0'
s.summary = 'Queuer is a queue manager, built on top of OperationQueue and Dispatch (aka GCD).'
s.homepage = 'https://github.com/FabrizioBrancati/Queuer'
s.screenshots = 'https://github.fabriziobrancati.com/queuer/resources/queuer-screenshot.png'
Expand All @@ -11,12 +11,12 @@ 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'

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
s.watchos.deployment_target = '2.0'
s.watchos.deployment_target = '3.0'
end

0 comments on commit 1ad7fdc

Please sign in to comment.