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

Release 1.4 #133

Merged
merged 6 commits into from
Feb 17, 2018
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
2 changes: 1 addition & 1 deletion App/mas-cli-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<key>CFBundleName</key>
<string>mas-cli</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.4.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions AppTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.4.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>10400000</string>
</dict>
</plist>
36 changes: 33 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,37 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
- Added test target #127
- Added the version number to search output



## [v1.4.0] It's Alive! πŸ§Ÿβ€β™‚οΈ - 2018-02-16

### ✨ Enhancements
- ℹ️ Info command #26, #55
- πŸ€ Lucky command #88
- πŸ•΅πŸ½β€β™€οΈ Include version number in search output #131
- ☝🏻 Support app name(s) arugments for upgrade command #100

### πŸ”¨ Xcode Project
- ⬆️ Swift 4 #114
- βœ… Added test target #127
- πŸ“› Add build badge to readme #121
- πŸ’Ž Configure bundler #118

### πŸ™ GitHub
- ⚠️ Added Danger for PR feedback #124
- πŸ“πŸ€πŸŽ¨ Added Contributing Guidelines, Code of Conduct and style guide #117, #126
- πŸ“ Added CHANGELOG #119
- πŸ“ Added note about installing through app store first #93

### πŸ› Dependencies #122
- ⬆️ Commandant (0.13.0)
- ⬆️ Result (3.2.4)
- ⬆️ cocoaseeds (0.8.3)
- ⬆️ xcpretty (0.2.8)

### πŸ‘·πŸ»β€β™€οΈ CI Build
- 🍎 Now using [`xcode9.2`](https://docs.travis-ci.com/user/reference/osx#Xcode-9.2) image for `macosx10.13` SDK #120

## [v1.3.1] Better Errors - 2016-09-25
- Descriptive error messages instead of exit codes
Expand Down Expand Up @@ -58,7 +87,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [v1.0.0] - 2015-09-20
- Initial Release

[Unreleased]: https://github.com/mas-cli/mas/compare/v1.3.1...HEAD
[Unreleased]: https://github.com/mas-cli/mas/compare/v1.4.0...HEAD
[v1.4.0]: https://github.com/mas-cli/mas/compare/v1.3.1...v1.4.0
[v1.3.1]: https://github.com/mas-cli/mas/compare/v1.3.0...v1.3.1
[v1.3.0]: https://github.com/mas-cli/mas/compare/v1.2.2...v1.3.0
[v1.2.2]: https://github.com/mas-cli/mas/compare/v1.2.1...v1.2.2
Expand Down
8 changes: 4 additions & 4 deletions Dangerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Sometimes it's a README fix, or something like that - which isn't relevant for
# including in a project's CHANGELOG for example
has_app_changes = !git.modified_files.grep(/mas-cli/).empty?
# has_test_changes = !git.modified_files.grep(/Tests/).empty?
has_app_changes = !git.modified_files.grep(/App/).empty?
# has_test_changes = !git.modified_files.grep(/AppTests/).empty?

is_version_bump = git.modified_files.sort == ["CHANGELOG.md", "mas-cli/mas-cli-Info.plist"].sort
is_version_bump = git.modified_files.sort == ["CHANGELOG.md", "App/mas-cli-Info.plist"].sort
message(":bookmark: Version bump!") if is_version_bump

# if has_app_changes && !has_test_changes && !is_version_bump
Expand All @@ -24,7 +24,7 @@ message("This PR might seem trivial, but every contribution counts. :kissing_hea

# Keep the CHANGELOG up-to-date
if !git.modified_files.include?("CHANGELOG.md") && !declared_trivial
fail(":book: Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/mas-cli/mas/blob/master/CHANGELOG.md).", sticky: false)
fail(":memo: Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/mas-cli/mas/blob/master/CHANGELOG.md).", sticky: false)
end

# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
Expand Down
4 changes: 4 additions & 0 deletions mas-cli.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
CURRENT_PROJECT_VERSION = 10400000;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -555,6 +556,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
Expand Down Expand Up @@ -584,6 +586,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
CURRENT_PROJECT_VERSION = 10400000;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -608,6 +611,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion script/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e

PLIST_FILE="$PWD/mas-cli/mas-cli-Info.plist"
PLIST_FILE="$PWD/App/mas-cli-Info.plist"

main() {
VERSION_NUMBER=$(update_version_number)
Expand Down