From a51f73fbc2a4db19f41733021934835b6e0de9d2 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 14 Mar 2021 16:30:27 -0700 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=93=8C=20Update=20brew=20lockfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Brewfile.lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 31460fb5e..d59f0a018 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": "b21dad07ed8aea7ebf59b2666ae42b92da304053", + "CLT": "", "Xcode": "12.4", - "macOS": "11.2" + "macOS": "11.2.3" } } } From 5c266a9e2a15a2c329215fd9641cfe8e91d5efdb Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 14 Mar 2021 16:31:20 -0700 Subject: [PATCH 2/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bundler=20(2.2.14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2d3d543f3d6c97d8d20fcd0977843d4eb8948838 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 14 Mar 2021 16:45:02 -0700 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=8C=B1=20Link=20mint=20packages=20glo?= =?UTF-8?q?bally?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 938e3907d..8f9884c68 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -21,7 +21,7 @@ main() { # 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 From ed09562f3feb886552bbc071e65483b8a34ecc5f Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 14 Mar 2021 16:47:15 -0700 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=8D=BA=20Update=20brew=20lock=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Brewfile.lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Brewfile.lock.json b/Brewfile.lock.json index d59f0a018..c1a80bfff 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -97,7 +97,7 @@ "big_sur": { "HOMEBREW_VERSION": "3.0.5-42-ge3b451c", "HOMEBREW_PREFIX": "/usr/local", - "Homebrew/homebrew-core": "b21dad07ed8aea7ebf59b2666ae42b92da304053", + "Homebrew/homebrew-core": "71ccd48f3217276bf2634b9698373d34ffb38607", "CLT": "", "Xcode": "12.4", "macOS": "11.2.3" From 767fb7c3880bf2c64132642fa35264ea1b389469 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 14 Mar 2021 16:51:37 -0700 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=94=96=20Version=201.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcodeproj/project.pbxproj | 4 ++-- script/version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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" From 2b9ee3e78b5db6d5f3cae41868ac51f0a90e7ece Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 14 Mar 2021 17:00:28 -0700 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BB=20Fixes=20for=20CI?= =?UTF-8?q?=20bootstrap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Prevent brew update - Remove sort script --- script/bootstrap | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 8f9884c68..a284c3ed1 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -16,7 +16,7 @@ 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 @@ -25,9 +25,6 @@ main() { # Download and build project dependencies carthage bootstrap --platform macOS --cache-builds - - # Old Xcode project sort script used for CocoaSeeds - script/sort } main