Merge branch 'master' into feature/purchase-apps

2024-11-21 19:23:01 +00:00 · 2020-05-14 00:07:23 -06:00 · 2020-05-14 00:07:23 -06:00 · 878479854c
commit 878479854c
parent bff8132041 1775c0c8b6
12 changed files with 34 additions and 20 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 💡 Update readme with simpler tap usage #241
 - Added support for purchasing apps (#2, #145)

+## [v1.6.4] 🔎 Search Fix - 2020-05-11
+
+- 🐛 Fix search parameters #269
+
 ## [v1.6.3] 🗒️ List Fix - 2019-03-31

 - 🐛 Fix for list command on macOS 10.14.4 #228
--- a/Homebrew/mas-tap.rb
+++ b/Homebrew/mas-tap.rb
@ -2,17 +2,18 @@ class Mas < Formula
  desc "Mac App Store command-line interface"
  homepage "https://github.com/mas-cli/mas"
  url "https://github.com/mas-cli/mas.git",
-      :tag      => "v1.6.3",
-      :revision => "3ac7e51b9e9fdd33f7caf7c77bebf09bf0cce44b"
+      :tag      => "v1.6.4",
+      :revision => "4cfb3185b6c72ac4a67eaaf17f842cc1dacf27c7"
  head "https://github.com/mas-cli/mas.git"

  bottle do
    root_url "https://dl.bintray.com/phatblat/mas-bottles"
    cellar :any
-    sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :mojave
-    sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :high_sierra
-    sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :sierra
-    sha256 "2e0a42866823ef0dfd0b4e0e86f9016ab634ce7206e56c3520cb6fc18098d955" => :el_capitan
+    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :catalina
+    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :mojave
+    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :high_sierra
+    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :sierra
+    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :el_capitan
  end

  depends_on "carthage" => :build
--- a/Homebrew/mas.rb
+++ b/Homebrew/mas.rb
@ -2,12 +2,13 @@ class Mas < Formula
  desc "Mac App Store command-line interface"
  homepage "https://github.com/mas-cli/mas"
  url "https://github.com/mas-cli/mas.git",
-      :tag      => "v1.6.3",
-      :revision => "3ac7e51b9e9fdd33f7caf7c77bebf09bf0cce44b"
+      :tag      => "v1.6.4",
+      :revision => "4cfb3185b6c72ac4a67eaaf17f842cc1dacf27c7"
  head "https://github.com/mas-cli/mas.git"

  bottle do
    cellar :any
+    sha256 "2069b8c1c1a64c2fb91cc1c25ab9c9890c61f2182224b9e0605a35a151bb85bd" => :catalina
    sha256 "3dd5a50b551a37c164c31375cc8498ba870e29e50086bd5c4c294bc26708a6d2" => :mojave
    sha256 "a0d1e45203448c08420c3eab2d40ef957fd22c8e40fbeb067bc7bffe4f08dfe2" => :high_sierra
  end
--- a/1
+++ b/1
@ -30,6 +30,7 @@ pipeline {
        LANG        = 'en_US.UTF-8'
        LANGUAGE    = 'en_US.UTF-8'
        LC_ALL      = 'en_US.UTF-8'
+        DEVELOPER_DIR = '/Applications/Xcode-11.4.1.app'
    }

    stages {
--- a/MasKit/Controllers/StoreSearch.swift
+++ b/MasKit/Controllers/StoreSearch.swift
@ -29,7 +29,7 @@ extension StoreSearch {
    /// - Returns: String URL for the search service or nil if appName can't be encoded.
    func searchURLString(forApp appName: String) -> String? {
        if let urlEncodedAppName = appName.URLEncodedString {
-            return "https://itunes.apple.com/search?entity=macSoftware&term=\(urlEncodedAppName)&attribute=allTrackTerm"
+            return "https://itunes.apple.com/search?media=software&entity=macSoftware&term=\(urlEncodedAppName)"
        }
        return nil
    }
--- a/MasKit/SupportingFiles/Info.plist
+++ b/MasKit/SupportingFiles/Info.plist
@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>10603000</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Andrew Naylor. All rights reserved.</string>
 </dict>
--- a/MasKitTests/Controllers/StoreSearchSpec.swift
+++ b/MasKitTests/Controllers/StoreSearchSpec.swift
@ -24,14 +24,14 @@ class StoreSearchSpec: QuickSpec {
                let appName = "myapp"
                let urlString = storeSearch.searchURLString(forApp: appName)
                expect(urlString) ==
-                    "https://itunes.apple.com/search?entity=macSoftware&term=\(appName)&attribute=allTrackTerm"
+                    "https://itunes.apple.com/search?media=software&entity=macSoftware&term=\(appName)"
            }
            it("contains the encoded app name") {
                let appName = "My App"
                let appNameEncoded = "My%20App"
                let urlString = storeSearch.searchURLString(forApp: appName)
                expect(urlString) ==
-                    "https://itunes.apple.com/search?entity=macSoftware&term=\(appNameEncoded)&attribute=allTrackTerm"
+                    "https://itunes.apple.com/search?media=software&entity=macSoftware&term=\(appNameEncoded)"
            }
            // Find a character that causes addingPercentEncoding(withAllowedCharacters to return nil
            xit("is nil when app name cannot be url encoded") {
--- a/MasKitTests/SupportingFiles/Info.plist
+++ b/MasKitTests/SupportingFiles/Info.plist
@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>10603000</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
--- a/mas-cli.xcodeproj/project.pbxproj
+++ b/mas-cli.xcodeproj/project.pbxproj
@ -1133,7 +1133,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				CURRENT_PROJECT_VERSION = 10603000;
+				CURRENT_PROJECT_VERSION = 10604000;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@ -1160,6 +1160,7 @@
 					"$(SRCROOT)/App/PrivateHeaders",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 1.6.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
@ -1199,7 +1200,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				CURRENT_PROJECT_VERSION = 10603000;
+				CURRENT_PROJECT_VERSION = 10604000;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1220,6 +1221,7 @@
 					"$(SRCROOT)/App/PrivateHeaders",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 1.6.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
 				SDKROOT = macosx;
--- a/mas/mas-Info.plist
+++ b/mas/mas-Info.plist
@ -11,6 +11,8 @@
 	<key>CFBundleName</key>
 	<string>mas-cli</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
--- a/script/bottle
+++ b/script/bottle
@ -11,7 +11,7 @@ BUILD_DIR="$PWD/build"
 BOTTLE_DIR="$BUILD_DIR/bottles"
 VERSION=$(script/version)
 ROOT_URL="https://dl.bintray.com/phatblat/mas-bottles"
-OS_VERSIONS=(mojave high_sierra sierra el_capitan)
+OS_VERSIONS=(catalina mojave high_sierra sierra el_capitan)
 OLD_FILENAME="mas--${VERSION}.${OS_VERSIONS[0]}.bottle.tar.gz"

 echo "==> 🍼 Bottling mas ${VERSION} for ${OS_VERSIONS[*]}"
--- a/script/version
+++ b/script/version
@ -6,4 +6,7 @@
 # Displays the current marketing version of mas.
 #

-agvtool what-marketing-version -terse1
+# This no longer works with MARKETING_VERSION build setting in Info.plist
+# agvtool what-marketing-version -terse1
+
+echo "1.6.4"