diff --git a/Brewfile b/Brewfile
index c6a860c..831f54c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1 +1,2 @@
-brew "carthage"
\ No newline at end of file
+brew "carthage"
+brew "swiftlint"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75a4a4b..ec2b96f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
+
+
+## [v1.6.0] 🔗 Links - 2019-01-12
+
- 👐🏻 Open AppStore.app with just `mas open` #200
- ♻️🌐 Network refactor #198
- 👷🏻♀️ Jenkins Pipeline #197
@@ -140,7 +144,8 @@ Use the `mas.pkg` package to install manually.
## [v1.0.0] - 2015-09-20
- Initial Release
-[Unreleased]: https://github.com/mas-cli/mas/compare/v1.5.0...HEAD
+[Unreleased]: https://github.com/mas-cli/mas/compare/v1.6.0...HEAD
+[v1.6.0]: https://github.com/mas-cli/mas/compare/v1.5.0...v1.6.0
[v1.5.0]: https://github.com/mas-cli/mas/compare/v1.4.4...v1.5.0
[v1.4.4]: https://github.com/mas-cli/mas/compare/v1.4.3...v1.4.4
[v1.4.3]: https://github.com/mas-cli/mas/compare/v1.4.2...v1.4.3
diff --git a/Jenkinsfile b/Jenkinsfile
index c108038..63978ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
}
stages {
- stage('Assemble') {
+ stage('🏗️ Assemble') {
steps {
ansiColor('xterm') {
sh 'script/bootstrap'
@@ -39,25 +39,24 @@ pipeline {
}
}
}
- stage('Test') {
+ stage('✅ Test') {
steps {
ansiColor('xterm') {
sh 'script/test'
}
}
}
- stage('Lint') {
+ stage('🚨 Lint') {
steps {
ansiColor('xterm') {
- echo 'Not implemented'
+ sh 'script/lint'
}
}
}
- stage('Danger') {
+ stage('⚠️ Danger') {
steps {
ansiColor('xterm') {
- // sh 'bundle install --verbose'
- sh 'bundle exec danger --verbose'
+ sh 'script/danger'
}
}
}
diff --git a/MasKit/SupportingFiles/Info.plist b/MasKit/SupportingFiles/Info.plist
index ed5ad19..7665ad5 100644
--- a/MasKit/SupportingFiles/Info.plist
+++ b/MasKit/SupportingFiles/Info.plist
@@ -15,9 +15,9 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 1.5.1
+ 1.6.0
CFBundleVersion
- 10501000
+ 10600000
NSHumanReadableCopyright
Copyright © 2018 Andrew Naylor. All rights reserved.
diff --git a/MasKitTests/SupportingFiles/Info.plist b/MasKitTests/SupportingFiles/Info.plist
index c2306f9..554ff47 100644
--- a/MasKitTests/SupportingFiles/Info.plist
+++ b/MasKitTests/SupportingFiles/Info.plist
@@ -15,8 +15,8 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.5.1
+ 1.6.0
CFBundleVersion
- 10501000
+ 10600000
diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj
index 723dafe..dd59f8f 100644
--- a/mas-cli.xcodeproj/project.pbxproj
+++ b/mas-cli.xcodeproj/project.pbxproj
@@ -889,7 +889,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if which -s swiftlint; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+ shellScript = "if test -n \"$JENKINS_URL\"\nthen\n echo \"Skipping SwiftLint run script on CI, will run in Lint stage.\"\n return\nfi\n\nif which -s swiftlint; then\n swiftlint lint --quiet\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1037,7 +1037,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
- CURRENT_PROJECT_VERSION = 10501000;
+ CURRENT_PROJECT_VERSION = 10600000;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -1102,7 +1102,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
- CURRENT_PROJECT_VERSION = 10501000;
+ CURRENT_PROJECT_VERSION = 10600000;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1189,10 +1189,10 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 10501000;
+ CURRENT_PROJECT_VERSION = 10600000;
DEFINES_MODULE = YES;
- DYLIB_COMPATIBILITY_VERSION = 5.0;
- DYLIB_CURRENT_VERSION = 5.1;
+ DYLIB_COMPATIBILITY_VERSION = 6.0;
+ DYLIB_CURRENT_VERSION = 6.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1227,10 +1227,10 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 10501000;
+ CURRENT_PROJECT_VERSION = 10600000;
DEFINES_MODULE = YES;
- DYLIB_COMPATIBILITY_VERSION = 5.0;
- DYLIB_CURRENT_VERSION = 5.1;
+ DYLIB_COMPATIBILITY_VERSION = 6.0;
+ DYLIB_CURRENT_VERSION = 6.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
diff --git a/mas/mas-Info.plist b/mas/mas-Info.plist
index 9db09c0..c823327 100644
--- a/mas/mas-Info.plist
+++ b/mas/mas-Info.plist
@@ -11,6 +11,6 @@
CFBundleName
mas-cli
CFBundleShortVersionString
- 1.5.1
+ 1.6.0
diff --git a/script/bootstrap b/script/bootstrap
index 009ff39..037a216 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -3,7 +3,7 @@
main() {
echo "==> 👢 Bootstrapping"
bundle install
- brew bundle
+ brew bundle install --verbose
carthage bootstrap --platform macOS --cache-builds
script/sort
diff --git a/script/danger b/script/danger
new file mode 100755
index 0000000..b5f99b4
--- /dev/null
+++ b/script/danger
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# script/danger
+# mas-cli
+#
+
+echo "==> ⚠️ Running danger"
+
+bundle exec danger --verbose
diff --git a/script/lint b/script/lint
new file mode 100755
index 0000000..bca2095
--- /dev/null
+++ b/script/lint
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+echo "==> 🚨 Linting mas"
+
+swiftlint lint --strict