From 9b34687c6658c7c0ba3d9071212e50b06290070c Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 20:43:41 -0400 Subject: [PATCH 01/14] Update the changelog with post-2.0 changes --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbdff759..d27797ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog - +## [In development][master] +- Update badge images and links in the README. (#69) +- Reorganize source and test files following the conventions the Swift Package Manager. (#70) +- Isolate the CommonCrypto dependency inside a custom wrapper function. (#71) +- Update the project to support Xcode 8 and Swift 2.3. (#73, #75, #84) +- Disable broken keychain tests on iOS 10. (#77) +- Clean up whitespace. (#79) +- Integrate with codecov.io for automated code coverage reporting. (#82) ## [2.0.0][] (2016-02-07) @@ -75,4 +82,4 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be [2.0.0-beta]: https://github.com/mattrubin/OneTimePassword/compare/1.1.1...2.0.0-beta [1.1.1]: https://github.com/mattrubin/OneTimePassword/compare/1.1.0...1.1.1 [1.1.0]: https://github.com/mattrubin/OneTimePassword/compare/1.0.0...1.1.0 -[1.0.0]: https://github.com/mattrubin/OneTimePassword/tree/1.0.0 \ No newline at end of file +[1.0.0]: https://github.com/mattrubin/OneTimePassword/tree/1.0.0 From 1afcbb56ac63f15bcad1933fb344ac8574abb6b3 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 20:57:27 -0400 Subject: [PATCH 02/14] Group changelog entries into "Added" and "Changed" --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d27797ea..28a7dac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ # Changelog ## [In development][master] +Added: +- Update the project to support Xcode 8 and Swift 2.3. (#73, #75, #84) +- Disable broken keychain tests on iOS 10. (#77) + +Changed: - Update badge images and links in the README. (#69) - Reorganize source and test files following the conventions the Swift Package Manager. (#70) - Isolate the CommonCrypto dependency inside a custom wrapper function. (#71) -- Update the project to support Xcode 8 and Swift 2.3. (#73, #75, #84) -- Disable broken keychain tests on iOS 10. (#77) - Clean up whitespace. (#79) - Integrate with codecov.io for automated code coverage reporting. (#82) From 6ae7a18c4f50647c72ff89ae285e8920f30422e7 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:00:32 -0400 Subject: [PATCH 03/14] Reorganize changelog entries into "Enhancements", "Fixes", and "Other Changes" --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a7dac1..50f0be27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ # Changelog ## [In development][master] -Added: +Enhancements: - Update the project to support Xcode 8 and Swift 2.3. (#73, #75, #84) + +Fixes: - Disable broken keychain tests on iOS 10. (#77) -Changed: +Other Changes: - Update badge images and links in the README. (#69) - Reorganize source and test files following the conventions the Swift Package Manager. (#70) - Isolate the CommonCrypto dependency inside a custom wrapper function. (#71) From ed28e969685eac0319962ddb6e621067bb621f10 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:03:31 -0400 Subject: [PATCH 04/14] Add links to pull requests for recent changelog entries --- CHANGELOG.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50f0be27..e3ef0018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,17 +2,17 @@ ## [In development][master] Enhancements: -- Update the project to support Xcode 8 and Swift 2.3. (#73, #75, #84) +- Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84)) Fixes: -- Disable broken keychain tests on iOS 10. (#77) +- Disable broken keychain tests on iOS 10. ([#77](https://github.com/mattrubin/OneTimePassword/pull/77)) Other Changes: -- Update badge images and links in the README. (#69) -- Reorganize source and test files following the conventions the Swift Package Manager. (#70) -- Isolate the CommonCrypto dependency inside a custom wrapper function. (#71) -- Clean up whitespace. (#79) -- Integrate with codecov.io for automated code coverage reporting. (#82) +- Update badge images and links in the README. ([#69](https://github.com/mattrubin/OneTimePassword/pull/69)) +- Reorganize source and test files following the conventions the Swift Package Manager. ([#70](https://github.com/mattrubin/OneTimePassword/pull/70)) +- Isolate the CommonCrypto dependency inside a custom wrapper function. ([#71](https://github.com/mattrubin/OneTimePassword/pull/71)) +- Clean up whitespace. ([#79](https://github.com/mattrubin/OneTimePassword/pull/79)) +- Integrate with codecov.io for automated code coverage reporting. ([#82](https://github.com/mattrubin/OneTimePassword/pull/82)) ## [2.0.0][] (2016-02-07) From 19fc5d3645dfc8ae35007e99c880b94a06f1d2e6 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:07:24 -0400 Subject: [PATCH 05/14] Style subheadings in the changelog --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ef0018..8d3a1d2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,20 @@ # Changelog ## [In development][master] -Enhancements: +#### Enhancements - Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84)) -Fixes: +#### Fixes - Disable broken keychain tests on iOS 10. ([#77](https://github.com/mattrubin/OneTimePassword/pull/77)) -Other Changes: +#### Other Changes - Update badge images and links in the README. ([#69](https://github.com/mattrubin/OneTimePassword/pull/69)) - Reorganize source and test files following the conventions the Swift Package Manager. ([#70](https://github.com/mattrubin/OneTimePassword/pull/70)) - Isolate the CommonCrypto dependency inside a custom wrapper function. ([#71](https://github.com/mattrubin/OneTimePassword/pull/71)) - Clean up whitespace. ([#79](https://github.com/mattrubin/OneTimePassword/pull/79)) - Integrate with codecov.io for automated code coverage reporting. ([#82](https://github.com/mattrubin/OneTimePassword/pull/82)) + ## [2.0.0][] (2016-02-07) Version 2 of the OneTimePassword library has been completely redesigned and rewritten with a modern Swift API. The new library source differs too greatly from its predecessor for the changes to be representable in a changelog. The README has a usage guide for the new API. From 96f7fe9effe798480a6b31e22f5f0e3f53cfb255 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:10:49 -0400 Subject: [PATCH 06/14] Add a section for 2.0.1 to the changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d3a1d2a..8e6f235c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [In development][master] + +## [2.0.1][] (2016-09-18) #### Enhancements - Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84)) @@ -76,8 +78,9 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be ## [1.0.0][] (2014-07-17) -[master]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0...master +[master]: https://github.com/mattrubin/OneTimePassword/compare/2.0.1...master +[2.0.1]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/mattrubin/OneTimePassword/compare/1.1.0...2.0.0 [2.0.0-rc]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0-beta.5...2.0.0 [2.0.0-beta.5]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0-beta.4...2.0.0-beta.5 From 75a809a5fcdc128d68b7407bfeac15719e52a53b Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:12:07 -0400 Subject: [PATCH 07/14] Add the project name to the top of the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6f235c..6c100ee4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changelog +# OneTimePassword Changelog ## [In development][master] From 25c99cfebfcb3f4388c145f354570910ab548848 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:13:43 -0400 Subject: [PATCH 08/14] Hide the (currently empty) "In development" section from the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c100ee4..9c44c5f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # OneTimePassword Changelog -## [In development][master] + ## [2.0.1][] (2016-09-18) #### Enhancements From c5dca2b47dd5ed5d9c9ba87a3194474b660db054 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 21:44:33 -0400 Subject: [PATCH 09/14] Add changelog entry for PR #87 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c44c5f6..e14ac543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Isolate the CommonCrypto dependency inside a custom wrapper function. ([#71](https://github.com/mattrubin/OneTimePassword/pull/71)) - Clean up whitespace. ([#79](https://github.com/mattrubin/OneTimePassword/pull/79)) - Integrate with codecov.io for automated code coverage reporting. ([#82](https://github.com/mattrubin/OneTimePassword/pull/82)) +- Update SwiftLint configuration. ([#87](https://github.com/mattrubin/OneTimePassword/pull/87)) ## [2.0.0][] (2016-02-07) From 2f755c0df5797df48a9108e8a15259a5fceba783 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 18 Sep 2016 22:07:21 -0400 Subject: [PATCH 10/14] Add a changelog link to PR #88 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e14ac543..10e398e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84)) #### Fixes -- Disable broken keychain tests on iOS 10. ([#77](https://github.com/mattrubin/OneTimePassword/pull/77)) +- Disable broken keychain tests on iOS 10. ([#77](https://github.com/mattrubin/OneTimePassword/pull/77), [#88](https://github.com/mattrubin/OneTimePassword/pull/88)) #### Other Changes - Update badge images and links in the README. ([#69](https://github.com/mattrubin/OneTimePassword/pull/69)) From fea652294ce35184f449430479c7efd6ce10499e Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Mon, 19 Sep 2016 12:33:48 -0400 Subject: [PATCH 11/14] Add changelog entry for updated Travis configuration --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10e398e5..66e220c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Clean up whitespace. ([#79](https://github.com/mattrubin/OneTimePassword/pull/79)) - Integrate with codecov.io for automated code coverage reporting. ([#82](https://github.com/mattrubin/OneTimePassword/pull/82)) - Update SwiftLint configuration. ([#87](https://github.com/mattrubin/OneTimePassword/pull/87)) +- Update Travis configuration to use Xcode 8 ([#89](https://github.com/mattrubin/OneTimePassword/pull/89)) ## [2.0.0][] (2016-02-07) From 708a514bc8e2225a7c99f941768af40f40571b48 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Mon, 19 Sep 2016 12:34:55 -0400 Subject: [PATCH 12/14] Replace "2.0.1" with "In development" in the Changelog until release --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e220c5..45281afe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # OneTimePassword Changelog - +## [In development][master] -## [2.0.1][] (2016-09-18) + #### Enhancements - Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84)) From 187251a17f7901eb83e32e87b91bbd5690a6b901 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Mon, 19 Sep 2016 12:36:09 -0400 Subject: [PATCH 13/14] Fix "In Development" diff link in the changelog --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45281afe..9d7a6d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ # OneTimePassword Changelog ## [In development][master] - - #### Enhancements - Update the project to support Xcode 8 and Swift 2.3. ([#73](https://github.com/mattrubin/OneTimePassword/pull/73), [#75](https://github.com/mattrubin/OneTimePassword/pull/75), [#84](https://github.com/mattrubin/OneTimePassword/pull/84)) @@ -80,7 +78,7 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be ## [1.0.0][] (2014-07-17) -[master]: https://github.com/mattrubin/OneTimePassword/compare/2.0.1...master +[master]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0...master [2.0.1]: https://github.com/mattrubin/OneTimePassword/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/mattrubin/OneTimePassword/compare/1.1.0...2.0.0 From 53bf5378106d667805961e5ec843ba9d15a2295f Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Mon, 19 Sep 2016 12:38:29 -0400 Subject: [PATCH 14/14] Correct changelog punctuation --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d7a6d85..e2c849ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - Clean up whitespace. ([#79](https://github.com/mattrubin/OneTimePassword/pull/79)) - Integrate with codecov.io for automated code coverage reporting. ([#82](https://github.com/mattrubin/OneTimePassword/pull/82)) - Update SwiftLint configuration. ([#87](https://github.com/mattrubin/OneTimePassword/pull/87)) -- Update Travis configuration to use Xcode 8 ([#89](https://github.com/mattrubin/OneTimePassword/pull/89)) +- Update Travis configuration to use Xcode 8. ([#89](https://github.com/mattrubin/OneTimePassword/pull/89)) ## [2.0.0][] (2016-02-07)