diff --git a/App/mas-cli-Info.plist b/App/mas-cli-Info.plist
index 3c80a611b..d424ee889 100644
--- a/App/mas-cli-Info.plist
+++ b/App/mas-cli-Info.plist
@@ -11,6 +11,6 @@
CFBundleName
mas-cli
CFBundleShortVersionString
- 1.3.1
+ 1.4.0
diff --git a/AppTests/Info.plist b/AppTests/Info.plist
index 6c40a6cd0..69a0170dc 100644
--- a/AppTests/Info.plist
+++ b/AppTests/Info.plist
@@ -15,8 +15,8 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.0
+ 1.4.0
CFBundleVersion
- 1
+ 10400000
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48f95f8db..5c1afa49c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
@@ -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
diff --git a/Dangerfile b/Dangerfile
index 96c0ee013..3b0ecd19e 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -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
@@ -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
diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj
index 8ecadd152..33433eb91 100644
--- a/mas-cli.xcodeproj/project.pbxproj
+++ b/mas-cli.xcodeproj/project.pbxproj
@@ -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;
@@ -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;
};
@@ -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;
@@ -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;
};
diff --git a/script/release b/script/release
index 9fd3b6241..637d2e0ea 100755
--- a/script/release
+++ b/script/release
@@ -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)