Skip to content

Commit

Permalink
[0.5.1] Allow swift 4.2 support via cocoapods (#161)
Browse files Browse the repository at this point in the history
We technically support Swift 4.2 (it compiles fine).
Dropping this support was too aggressive.
This will make transitioning easier.

- update travis.yml
- run pod update
- run bundle update
  • Loading branch information
jessesquires authored Mar 28, 2019
1 parent 40fe60a commit 7b14918
Show file tree
Hide file tree
Showing 11 changed files with 320 additions and 281 deletions.
35 changes: 20 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
language: objective-c
osx_image: xcode10
gemfile: Gemfile
os: osx
osx_image: xcode10.1
rvm: 2.6.0

branches:
only:
- master
addons:
homebrew:
packages:
- swiftlint
update: true

cache:
- bundler
- cocoapods

branches:
only:
- master

env:
global:
- WORKSPACE="ReactiveLists.xcworkspace"
- FRAMEWORK_SCHEME="ReactiveLists"
- EXAMPLE_SCHEME="Example"
- SDK=iphonesimulator12.1

matrix:
- DESTINATION="OS=11.4,name=iPhone X" SCHEME="$FRAMEWORK_SCHEME" POD_LINT="YES"
- DESTINATION="OS=12.0,name=iPhone X" SCHEME="$FRAMEWORK_SCHEME" POD_LINT="NO"

# Note: travis installs ruby dependencies using bundler automatically, when there's a Gemfile
- DEST="OS=11.4,name=iPhone X" POD_LINT="YES"
- DEST="OS=12.1,name=iPhone X" POD_LINT="NO"

before_install:
- pod repo update # don't use 'bundle exec' because bundler deps haven't been installed yet
- gem update --system
- gem install bundler
- gem install cocoapods --pre

script:
- set -o pipefail
Expand All @@ -33,11 +40,9 @@ script:
bundle exec pod lib lint;
fi

- xcodebuild test -workspace "$WORKSPACE" -scheme "$FRAMEWORK_SCHEME" -sdk "iphonesimulator" -destination "$DESTINATION" -configuration Debug -enableCodeCoverage YES ONLY_ACTIVE_ARCH=NO | bundle exec xcpretty -c
- xcodebuild build -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DEST" ONLY_ACTIVE_ARCH=NO | bundle exec xcpretty -c;

- if [ $BUILD_EXAMPLE == "YES" ]; then
xcodebuild build -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "iphonesimulator" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO | bundle exec xcpretty -c;
fi
- xcodebuild test -workspace "$WORKSPACE" -scheme "$FRAMEWORK_SCHEME" -sdk "$SDK" -destination "$DEST" -configuration Debug -enableCodeCoverage YES ONLY_ACTIVE_ARCH=NO | bundle exec xcpretty -c

- bundle exec danger

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ The changelog for `ReactiveLists`. Also see the [releases](https://github.com/pl
NEXT
----

0.5.1
-----

Re-add support for Swift 4.2 to make transitioning easier.

0.5.0
-----

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 1.4'
gem 'cocoapods', '~> 1.7.0.beta3'
gem 'danger', '~> 5.0'
gem 'danger-swiftlint', '~> 0.12.1'
gem 'xcpretty'
40 changes: 20 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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)
Expand All @@ -15,41 +15,41 @@ GEM
cork
nap
open4 (~> 1.3)
cocoapods (1.5.3)
cocoapods (1.7.0.beta.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-core (= 1.7.0.beta.3)
cocoapods-deintegrate (>= 1.0.3, < 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.2, < 2.0)
cocoapods-core (1.7.0.beta.3)
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)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.5.11)
Expand All @@ -73,7 +73,7 @@ GEM
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
fourflusher (2.0.1)
fourflusher (2.2.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.3.0)
Expand All @@ -93,7 +93,7 @@ GEM
public_suffix (3.0.2)
rake (12.3.1)
rouge (2.0.7)
ruby-macho (1.2.0)
ruby-macho (1.4.0)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
Expand All @@ -104,7 +104,7 @@ GEM
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)
xcodeproj (1.6.0)
xcodeproj (1.8.2)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -117,10 +117,10 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.4)
cocoapods (~> 1.7.0.beta3)
danger (~> 5.0)
danger-swiftlint (~> 0.12.1)
xcpretty

BUNDLED WITH
1.16.3
2.0.1
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: f4d525d7ba27317176274dd214708a367af86650

COCOAPODS: 1.6.1
COCOAPODS: 1.7.0.beta.3
2 changes: 1 addition & 1 deletion Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7b14918

Please sign in to comment.