Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Swift 5 #158

Merged
merged 4 commits into from
Mar 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,13 @@ cache:

env:
global:
- LANG=en_US.UTF-8

- WORKSPACE="ReactiveLists.xcworkspace"

- FRAMEWORK_SCHEME="ReactiveLists"
- EXAMPLE_SCHEME="Example"

matrix:
- DESTINATION="OS=10.3.1,name=iPhone 7" SCHEME="$FRAMEWORK_SCHEME" POD_LINT="YES" CODE_COVERAGE="NO"
- DESTINATION="OS=11.4,name=iPhone X" SCHEME="$FRAMEWORK_SCHEME" POD_LINT="NO" CODE_COVERAGE="YES"
- DESTINATION="OS=12.0,name=iPhone 6s" SCHEME="$FRAMEWORK_SCHEME" POD_LINT="NO" CODE_COVERAGE="NO"
- 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

Expand All @@ -37,7 +33,7 @@ script:
bundle exec pod lib lint;
fi

- xcodebuild test -workspace "$WORKSPACE" -scheme "$FRAMEWORK_SCHEME" -sdk "iphonesimulator" -destination "$DESTINATION" -configuration Debug -enableCodeCoverage "$CODE_COVERAGE" ONLY_ACTIVE_ARCH=NO | bundle exec xcpretty -c
- xcodebuild test -workspace "$WORKSPACE" -scheme "$FRAMEWORK_SCHEME" -sdk "iphonesimulator" -destination "$DESTINATION" -configuration Debug -enableCodeCoverage YES 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;
Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,19 @@ The changelog for `ReactiveLists`. Also see the [releases](https://github.com/pl
NEXT
----

0.5.0
-----

This release closes the [0.5.0 milestone](https://github.com/plangrid/ReactiveLists/milestone/12?closed=1).

### Breaking

- Migrated to Swift 5.0
- Dropped support for iOS 10. iOS 11 and above now required.

### Changed
- Upgrades DifferenceKit to 1.0.0 ([#156](https://github.com/plangrid/ReactiveLists/pull/156), [@anayini](https://github.com/anayini))

jessesquires marked this conversation as resolved.
Show resolved Hide resolved
- Upgraded to DifferenceKit to 1.1.0

0.4.0
-----
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '10.0'
platform :ios, '11.0'
use_frameworks!
inhibit_all_warnings!

target 'ReactiveLists' do
project 'ReactiveLists.xcodeproj'

pod 'DifferenceKit', '1.0.0'
pod 'DifferenceKit', '1.1.0'
pod 'SwiftLint', '0.30.1'

target 'ReactiveListsExample' do
Expand Down
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PODS:
- DifferenceKit (1.0.0):
- DifferenceKit/Core (= 1.0.0)
- DifferenceKit/UIKitExtension (= 1.0.0)
- DifferenceKit/Core (1.0.0)
- DifferenceKit/UIKitExtension (1.0.0):
- DifferenceKit (1.1.0):
- DifferenceKit/Core (= 1.1.0)
- DifferenceKit/UIKitExtension (= 1.1.0)
- DifferenceKit/Core (1.1.0)
- DifferenceKit/UIKitExtension (1.1.0):
- DifferenceKit/Core
- SwiftLint (0.30.1)

DEPENDENCIES:
- DifferenceKit (= 1.0.0)
- DifferenceKit (= 1.1.0)
- SwiftLint (= 0.30.1)

SPEC REPOS:
Expand All @@ -17,9 +17,9 @@ SPEC REPOS:
- SwiftLint

SPEC CHECKSUMS:
DifferenceKit: d501e37b866e98a8aaee0f61ceb02ad98e52b9c1
DifferenceKit: 7726ceeff4ec3748788e4b01396861b283797440
SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7

PODFILE CHECKSUM: bfad59a1cf3109662a4bc67043009ea60c8542aa
PODFILE CHECKSUM: f4d525d7ba27317176274dd214708a367af86650

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
213 changes: 196 additions & 17 deletions Pods/DifferenceKit/LICENSE

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

39 changes: 36 additions & 3 deletions Pods/DifferenceKit/README.md

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

Loading