From 5db7f3dac8cb663d1e1c98185d3e45448b8dccf7 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Fri, 26 May 2017 11:28:41 +0200 Subject: [PATCH] Preparing for release 0.5.0. --- CHANGELOG.md | 6 +- FBSnapshotsViewer/Info.plist | 4 +- .../Models/DerivedDataFolder.swift | 4 +- .../Interactor/PreferencesInteractor.swift | 4 +- Gemfile.lock | 2 +- Podfile.lock | 4 +- Sparkle.xml | 12 +- fastlane/Fastfile | 5 +- fastlane/README.md | 2 +- fastlane/test_output/report.junit | 224 +++++++++--------- 10 files changed, 137 insertions(+), 130 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15649b5..234fe5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ ## Changelog -### 0.5.0 (Next) +### 0.5.0 (26.05.2017) -* Your contribution here. -* [#37](https://github.com/Antondomashnev/FBSnapshotsViewer/pull/37): Add AppCode snapshot testing support - [@antondomashnev](https://github.com/antondomashnev). +* [#39](https://github.com/Antondomashnev/FBSnapshotsViewer/pull/39): Update RELEASING process with some new cool automation - [@antondomashnev](https://github.com/antondomashnev). +* [#37](https://github.com/Antondomashnev/FBSnapshotsViewer/pull/37): Initial Sparkle setup for autoupdates - [@antondomashnev](https://github.com/antondomashnev). ### 0.4.0 (21.05.2017) diff --git a/FBSnapshotsViewer/Info.plist b/FBSnapshotsViewer/Info.plist index dae4507..1b03a1a 100644 --- a/FBSnapshotsViewer/Info.plist +++ b/FBSnapshotsViewer/Info.plist @@ -31,8 +31,6 @@ NSPrincipalClass NSApplication SUFeedURL - https://whispering-savannah-78358.herokuapp.com/FBSnapshotsViewer/appcast.xml - SUPublicDSAKeyFile - dsa_pub.pem + https://raw.githubusercontent.com/Antondomashnev/FBSnapshotsViewerSparkle/master/appcast.xml diff --git a/FBSnapshotsViewer/Models/DerivedDataFolder.swift b/FBSnapshotsViewer/Models/DerivedDataFolder.swift index 227a2e2..eb83699 100644 --- a/FBSnapshotsViewer/Models/DerivedDataFolder.swift +++ b/FBSnapshotsViewer/Models/DerivedDataFolder.swift @@ -13,9 +13,9 @@ enum DerivedDataFolder: AutoEquatable { switch self { case .xcodeDefault: return DerivedDataFolderType.xcodeDefault - case .xcodeCustom(_): + case .xcodeCustom: return DerivedDataFolderType.xcodeCustom - case .appcode(_): + case .appcode: return DerivedDataFolderType.appcode } } diff --git a/FBSnapshotsViewer/Preferences/Interactor/PreferencesInteractor.swift b/FBSnapshotsViewer/Preferences/Interactor/PreferencesInteractor.swift index b8c6ddf..d7f503e 100644 --- a/FBSnapshotsViewer/Preferences/Interactor/PreferencesInteractor.swift +++ b/FBSnapshotsViewer/Preferences/Interactor/PreferencesInteractor.swift @@ -46,9 +46,9 @@ extension PreferencesInteractor: PreferencesInteractorInput { case .xcodeDefault: assertionFailure("Unexpected call to modify derived data folder path while the type of derived data is Xcode") break - case .xcodeCustom(_): + case .xcodeCustom: configuration = Configuration(derivedDataFolder: DerivedDataFolder.xcodeCustom(path: path)) - case .appcode(_): + case .appcode: configuration = Configuration(derivedDataFolder: DerivedDataFolder.appcode(path: path)) } } diff --git a/Gemfile.lock b/Gemfile.lock index 4ae7286..506aca1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.32.1) + fastlane (2.35.1) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) diff --git a/Podfile.lock b/Podfile.lock index 4b626f1..0dce69e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,7 +5,7 @@ PODS: - Sourcery (0.6.0) - Sparkle (1.17.0) - SwiftGen (4.2.1) - - SwiftLint (0.18.1) + - SwiftLint (0.19.0) DEPENDENCIES: - KZFileWatchers (~> 1.0) @@ -23,7 +23,7 @@ SPEC CHECKSUMS: Sourcery: b3a93fcdf9c256feeb16e85f4d1bbf46baa42464 Sparkle: ccfb47699feea7b40b51cf3176f69404e5b1da6c SwiftGen: 2ba2a88fc6130b96e38e2baa0029e4bd222ffd85 - SwiftLint: b467d08f5b25dc3b3cfed243d8e1b74b91714c67 + SwiftLint: 3537a05b34060e78e7510f04fb7537d738247803 PODFILE CHECKSUM: 034b6075c300cb474339b98158a1dd8b42b6b3c6 diff --git a/Sparkle.xml b/Sparkle.xml index 15395bc..b64ba8b 100644 --- a/Sparkle.xml +++ b/Sparkle.xml @@ -8,5 +8,15 @@ 10.12 + + 0.5.0 + 10.12 + + <ul> <li> <p><a + href="https://github.com/Antondomashnev/FBSnapshotsViewer/pull/39">#39</a>: Update RELEASING process with some new cool automation - <a href="https://github.com/antondomashnev">@antondomashnev</a>.</p> </li> <li> <p><a href="https://github.com/Antondomashnev/FBSnapshotsViewer/pull/37">#37</a>: Initial Sparkle setup for autoupdates - <a href="https://github.com/antondomashnev">@antondomashnev</a>.</p> </li> </ul> + + Fri, 26 May 2017 12:14:05 +0200 + + - + \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 649472a..29c0b0e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -52,10 +52,9 @@ platform :mac do end desc "Release a new version of the FBSnapshotsViewer. Uploading a new release to a GitHub and CocoaPods trunk" - desc "Before doing so don't forget to move the next version of Changelog to released" + desc "Before doing so don't forget to follow all steps in RELEASING.md" lane :release do ensure_git_status_clean - test build_app release_human_version = project_get_human_version @@ -68,7 +67,7 @@ platform :mac do github_set_or_update_release( release_name: release_human_version, repository_name: GITHUB_REPOSITORY, - description: project_version_changelog(version: human_version, convert_to_html: false), + description: project_version_changelog(version: release_human_version, convert_to_html: false), tag_name: release_human_version, upload_assets: github_create_release_assets(release_version: release_human_version), api_token: ENV["FB_SNAPSHOTS_VIEWER_GITHUB_API_TOKEN"] diff --git a/fastlane/README.md b/fastlane/README.md index c1047a9..7215a2c 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -56,7 +56,7 @@ fastlane mac release ``` Release a new version of the FBSnapshotsViewer. Uploading a new release to a GitHub and CocoaPods trunk -Before doing so don't forget to move the next version of Changelog to released +Before doing so don't forget to follow all steps in RELEASING.md ### mac sparkle_add_version ``` fastlane mac sparkle_add_version diff --git a/fastlane/test_output/report.junit b/fastlane/test_output/report.junit index afa6a1a..4cac7c8 100644 --- a/fastlane/test_output/report.junit +++ b/fastlane/test_output/report.junit @@ -1,154 +1,154 @@ - - + + - + - - - + + + - + - - - + + + - + - - - - - - + + + + + + - - - - + + + + - + - + - + - - + + - + - - + + - - + + - - - - - - - - - + + + + + + + + + - - + + - + - - + + - - - - - - + + + + + + - + - + - + - + - - - + + + - + - - + + - - - - - + + + + + @@ -158,77 +158,77 @@ - - - - + + + + - - - - + + + + - - - + + + - - - + + + - + - + - + - + - + - - + + - - + + - - - - + + + + - - + + - + - + - - - + + + - + @@ -236,15 +236,15 @@ - - - + + + - - - - + + + + @@ -253,11 +253,11 @@ - + - - - + + + \ No newline at end of file