Skip to content

Commit

Permalink
Merge branch 'version-3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Joachim Bondo committed Mar 14, 2018
2 parents 3da26b6 + 00b4894 commit 84658bc
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

This project uses [semantic versioning](http://semver.org/). Change log is also reflected under [Releases](https://github.com/osteslag/Changeset/releases) on GitHub, inspired by [Keep a CHANGELOG](http://keepachangelog.com).

## [3.1]: 2018-03-14(π) Custom Comparator
### Added
- Support custom comparator function for comparing collection elements (defaults to `==`)

## [3.0]: 2017-11-03 Swift 4.0
### Changed
- Update to Swift 4; most noticeably, `String` is now a `Collection`
Expand Down Expand Up @@ -68,6 +72,7 @@ This project uses [semantic versioning](http://semver.org/). Change log is also

## [1.0]: 2015-12-29 Initial Release

[3.1]: https://github.com/osteslag/Changeset/compare/v3.0...v3.1
[3.0]: https://github.com/osteslag/Changeset/compare/v2.1.2...v3.0
[2.1.2]: https://github.com/osteslag/Changeset/compare/v2.1.1...v2.1.2
[2.1.1]: https://github.com/osteslag/Changeset/compare/v2.1...v2.1.1
Expand Down
2 changes: 1 addition & 1 deletion Changeset.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Changeset'
spec.version = '3.0'
spec.version = '3.1'
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
spec.homepage = 'https://github.com/osteslag/Changeset'
spec.author = { 'Joachim Bondo' => '[email protected]' }
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License

Copyright © 2015-17 [Joachim Bondo](mailto:[email protected])
Copyright © 2015-18 [Joachim Bondo](mailto:[email protected])

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 0 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Package.swift
// Changeset
//
// Copyright (c) 2015-16 Joachim Bondo. All rights reserved.
//

import PackageDescription

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ This uses the extensions mentioned above to animate transitions based on the edi
## License

This project is available under [The MIT License](http://opensource.org/licenses/MIT).
Copyright © 2015-17, [Joachim Bondo](mailto:[email protected]). See [LICENSE](LICENSE.md) file.
Copyright © 2015-18, [Joachim Bondo](mailto:[email protected]). See [LICENSE](LICENSE.md) file.
1 change: 0 additions & 1 deletion Sources/Changeset.Edit.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//
// Changeset.Edit.swift
// Copyright (c) 2015-17 Joachim Bondo. All rights reserved.
//

/// Defines an atomic edit on a `Collection` of `Equatable` where we can do basic arithmetic on the `IndexDistance`.
Expand Down
1 change: 0 additions & 1 deletion Sources/Changeset.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//
// Changeset.swift
// Copyright (c) 2015-17 Joachim Bondo. All rights reserved.
//

/** A `Changeset` describes the edits required to go from one set of data to another.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
1 change: 0 additions & 1 deletion Sources/UIKit+Changeset.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//
// UIKit+Changeset.swift
// Copyright (c) 2016 Joachim Bondo. All rights reserved.
//

#if os(iOS)
Expand Down
1 change: 0 additions & 1 deletion Tests/ChangesetTests.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

//
// ChangesetTests.swift
// Changeset
Expand Down

0 comments on commit 84658bc

Please sign in to comment.