diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 31460fb5e..c1a80bfff 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -95,12 +95,12 @@ "macOS": "10.15.6" }, "big_sur": { - "HOMEBREW_VERSION": "3.0.1-38-g320bccb", + "HOMEBREW_VERSION": "3.0.5-42-ge3b451c", "HOMEBREW_PREFIX": "/usr/local", - "Homebrew/homebrew-core": "bd3bc1c7feeec5677c9c4e9b6874a5780bcc5ff8", - "CLT": "12.0.32.21", + "Homebrew/homebrew-core": "71ccd48f3217276bf2634b9698373d34ffb38607", + "CLT": "", "Xcode": "12.4", - "macOS": "11.2" + "macOS": "11.2.3" } } } diff --git a/Gemfile.lock b/Gemfile.lock index f8f5e67db..8e14f3816 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,4 +66,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.2.9 + 2.2.14 diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 9fb435b39..add4e667b 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -1179,7 +1179,7 @@ "$(SRCROOT)/App/PrivateHeaders", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 1.8.0; + MARKETING_VERSION = 1.8.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; @@ -1241,7 +1241,7 @@ "$(SRCROOT)/App/PrivateHeaders", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 1.8.0; + MARKETING_VERSION = 1.8.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; SDKROOT = macosx; diff --git a/script/bootstrap b/script/bootstrap index 938e3907d..a284c3ed1 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -16,18 +16,15 @@ main() { bundle install # Install Mint and shellcheck - brew bundle install --verbose + brew bundle install --no-upgrade --verbose # Set up mint cache to be relative to user HOME export MINT_PATH=~/.mint/cache mkdir -p $MINT_PATH - mint bootstrap --verbose + mint bootstrap --link --verbose # Download and build project dependencies carthage bootstrap --platform macOS --cache-builds - - # Old Xcode project sort script used for CocoaSeeds - script/sort } main diff --git a/script/version b/script/version index 99e85e0d0..46f41e7ee 100755 --- a/script/version +++ b/script/version @@ -9,4 +9,4 @@ # This no longer works with MARKETING_VERSION build setting in Info.plist # agvtool what-marketing-version -terse1 -echo "1.8.0" +echo "1.8.1"