fastlane 2.107.0 → 2.108.0

data/fastlane/lib/fastlane/actions/get_provisioning_profile.rb

@@ -36,6 +36,7 @@ module Fastlane
         profile_type = "app-store"
         profile_type = "ad-hoc" if values[:adhoc]
         profile_type = "development" if values[:development]
+        profile_type = "developer-id" if values[:developer_id]
         profile_type = "enterprise" if enterprise
 
         UI.message("Setting Provisioning Profile type to '#{profile_type}'")
@@ -65,7 +66,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac].include?(platform)
       end
 
       def self.example_code

data/fastlane/lib/fastlane/actions/slather.rb

@@ -34,6 +34,7 @@ module Fastlane
           workspace: '--workspace',
           binary_file: '--binary-file',
           binary_basename: '--binary-basename',
+          arch: '--arch',
           source_files: '--source-files',
           decimals: '--decimals'
       }.freeze
@@ -257,6 +258,10 @@ module Fastlane
                                        description: "Binary file name to be used for code coverage",
                                        is_string: false,
                                        default_value: false),
+          FastlaneCore::ConfigItem.new(key: :arch,
+                                       env_name: "FL_SLATHER_ARCH",
+                                       description: "Specify which architecture the binary file is in. Needed for universal binaries",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :source_files,
                                        env_name: "FL_SLATHER_SOURCE_FILES",
                                        description: "A Dir.glob compatible pattern used to limit the lookup to specific source files. Ignored in gcov mode",

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.107.0'.freeze
+  VERSION = '2.108.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane/swift/Fastlane.swift

@@ -1079,6 +1079,24 @@ func crashlytics(ipaPath: String? = nil,
                                                                                              RubyCommand.Argument(name: "debug", value: debug)])
   _ = runner.executeCommand(command)
 }
+func createAppOnManagedPlayStore(jsonKey: String? = nil,
+                                 jsonKeyData: String? = nil,
+                                 developerAccountId: String,
+                                 apk: String,
+                                 appTitle: String,
+                                 language: String = "en_US",
+                                 rootUrl: String? = nil,
+                                 timeout: Int = 300) {
+  let command = RubyCommand(commandID: "", methodName: "create_app_on_managed_play_store", className: nil, args: [RubyCommand.Argument(name: "json_key", value: jsonKey),
+                                                                                                                  RubyCommand.Argument(name: "json_key_data", value: jsonKeyData),
+                                                                                                                  RubyCommand.Argument(name: "developer_account_id", value: developerAccountId),
+                                                                                                                  RubyCommand.Argument(name: "apk", value: apk),
+                                                                                                                  RubyCommand.Argument(name: "app_title", value: appTitle),
+                                                                                                                  RubyCommand.Argument(name: "language", value: language),
+                                                                                                                  RubyCommand.Argument(name: "root_url", value: rootUrl),
+                                                                                                                  RubyCommand.Argument(name: "timeout", value: timeout)])
+  _ = runner.executeCommand(command)
+}
 func createAppOnline(username: String,
                      appIdentifier: String,
                      bundleIdentifierSuffix: String? = nil,
@@ -1533,7 +1551,14 @@ func getGithubRelease(url: String,
                                                                                                           RubyCommand.Argument(name: "ipa", value: ipa)])
   return runner.executeCommand(command)
 }
+func getManagedPlayStorePublishingRights(jsonKey: String? = nil,
+                                         jsonKeyData: String? = nil) {
+  let command = RubyCommand(commandID: "", methodName: "get_managed_play_store_publishing_rights", className: nil, args: [RubyCommand.Argument(name: "json_key", value: jsonKey),
+                                                                                                                          RubyCommand.Argument(name: "json_key_data", value: jsonKeyData)])
+  _ = runner.executeCommand(command)
+}
 func getProvisioningProfile(adhoc: Bool = false,
+                            developerId: Bool = false,
                             development: Bool = false,
                             skipInstall: Bool = false,
                             force: Bool = false,
@@ -1553,6 +1578,7 @@ func getProvisioningProfile(adhoc: Bool = false,
                             readonly: Bool = false,
                             templateName: String? = nil) {
   let command = RubyCommand(commandID: "", methodName: "get_provisioning_profile", className: nil, args: [RubyCommand.Argument(name: "adhoc", value: adhoc),
+                                                                                                          RubyCommand.Argument(name: "developer_id", value: developerId),
                                                                                                           RubyCommand.Argument(name: "development", value: development),
                                                                                                           RubyCommand.Argument(name: "skip_install", value: skipInstall),
                                                                                                           RubyCommand.Argument(name: "force", value: force),
@@ -3012,6 +3038,7 @@ func setupTravis(force: Bool = false) {
   return runner.executeCommand(command)
 }
 func sigh(adhoc: Bool = false,
+          developerId: Bool = false,
           development: Bool = false,
           skipInstall: Bool = false,
           force: Bool = false,
@@ -3031,6 +3058,7 @@ func sigh(adhoc: Bool = false,
           readonly: Bool = false,
           templateName: String? = nil) {
   let command = RubyCommand(commandID: "", methodName: "sigh", className: nil, args: [RubyCommand.Argument(name: "adhoc", value: adhoc),
+                                                                                      RubyCommand.Argument(name: "developer_id", value: developerId),
                                                                                       RubyCommand.Argument(name: "development", value: development),
                                                                                       RubyCommand.Argument(name: "skip_install", value: skipInstall),
                                                                                       RubyCommand.Argument(name: "force", value: force),
@@ -3127,6 +3155,7 @@ func slather(buildDirectory: String? = nil,
              useBundleExec: Bool = false,
              binaryBasename: Bool = false,
              binaryFile: Bool = false,
+             arch: String? = nil,
              sourceFiles: Bool = false,
              decimals: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "slather", className: nil, args: [RubyCommand.Argument(name: "build_directory", value: buildDirectory),
@@ -3155,6 +3184,7 @@ func slather(buildDirectory: String? = nil,
                                                                                          RubyCommand.Argument(name: "use_bundle_exec", value: useBundleExec),
                                                                                          RubyCommand.Argument(name: "binary_basename", value: binaryBasename),
                                                                                          RubyCommand.Argument(name: "binary_file", value: binaryFile),
+                                                                                         RubyCommand.Argument(name: "arch", value: arch),
                                                                                          RubyCommand.Argument(name: "source_files", value: sourceFiles),
                                                                                          RubyCommand.Argument(name: "decimals", value: decimals)])
   _ = runner.executeCommand(command)
@@ -4013,7 +4043,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode-10.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
           legacySupport: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "xcov", className: nil, args: [RubyCommand.Argument(name: "workspace", value: workspace),
                                                                                       RubyCommand.Argument(name: "project", value: project),
@@ -4121,4 +4151,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.32]
+// FastlaneRunnerAPIVersion [0.9.33]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.107.0
+// Generated with fastlane 2.108.0

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -44,6 +44,19 @@ module FastlaneCore
         parse(path, keychain_path).fetch("Name")
       end
 
+      def mac?(path, keychain_path = nil)
+        parse(path, keychain_path).fetch("Platform", []).include?('OSX')
+      end
+
+      def profile_filename(path, keychain_path = nil)
+        basename = uuid(path, keychain_path)
+        if mac?(path, keychain_path)
+          basename + ".provisionprofile"
+        else
+          basename + ".mobileprovision"
+        end
+      end
+
       def profiles_path
         path = File.expand_path("~") + "/Library/MobileDevice/Provisioning Profiles/"
         # If the directory doesn't exist, create it first
@@ -57,8 +70,7 @@ module FastlaneCore
       # Installs a provisioning profile for Xcode to use
       def install(path, keychain_path = nil)
         UI.message("Installing provisioning profile...")
-        profile_filename = uuid(path, keychain_path) + ".mobileprovision"
-        destination = File.join(profiles_path, profile_filename)
+        destination = File.join(profiles_path, profile_filename(path, keychain_path))
 
         if path != destination
           # copy to Xcode provisioning profile directory

data/sigh/lib/sigh/options.rb

@@ -14,18 +14,27 @@ module Sigh
                                      description: "Setting this flag will generate AdHoc profiles instead of App Store Profiles",
                                      is_string: false,
                                      default_value: false,
-                                     conflicting_options: [:development],
-                                     conflict_block: proc do |value|
-                                       UI.user_error!("You can't enable both :development and :adhoc")
+                                     conflicting_options: [:developer_id, :development],
+                                     conflict_block: proc do |option|
+                                       UI.user_error!("You can't enable both :#{option.key} and :adhoc")
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :developer_id,
+                                     env_name: "SIGH_DEVELOPER_ID",
+                                     description: "Setting his flag will generate Developer ID profiles instead of App Store Profiles",
+                                     is_string: false,
+                                     default_value: false,
+                                     conflicting_options: [:adhoc, :development],
+                                     conflict_block: proc do |option|
+                                       UI.user_error!("You can't enable both :#{option.key} and :developer_id")
                                      end),
         FastlaneCore::ConfigItem.new(key: :development,
                                      env_name: "SIGH_DEVELOPMENT",
                                      description: "Renew the development certificate instead of the production one",
                                      is_string: false,
                                      default_value: false,
-                                     conflicting_options: [:adhoc],
-                                     conflict_block: proc do |value|
-                                       UI.user_error!("You can't enable both :development and :adhoc")
+                                     conflicting_options: [:adhoc, :developer_id],
+                                     conflict_block: proc do |option|
+                                       UI.user_error!("You can't enable both :#{option.key} and :development")
                                      end),
         FastlaneCore::ConfigItem.new(key: :skip_install,
                                      env_name: "SIGH_SKIP_INSTALL",

data/sigh/lib/sigh/runner.rb

@@ -58,6 +58,7 @@ module Sigh
       @profile_type = Spaceship.provisioning_profile.app_store
       @profile_type = Spaceship.provisioning_profile.in_house if Spaceship.client.in_house?
       @profile_type = Spaceship.provisioning_profile.ad_hoc if Sigh.config[:adhoc]
+      @profile_type = Spaceship.provisioning_profile.direct if Sigh.config[:developer_id]
       @profile_type = Spaceship.provisioning_profile.development if Sigh.config[:development]
 
       @profile_type
@@ -260,7 +261,11 @@ module Sigh
         profile_name += "_tvos"
       end
 
-      profile_name += '.mobileprovision'
+      if Sigh.config[:platform].to_s == 'macos'
+        profile_name += '.provisionprofile'
+      else
+        profile_name += '.mobileprovision'
+      end
 
       tmp_path = Dir.mktmpdir("profile_download")
       output_path = File.join(tmp_path, profile_name)

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -114,10 +114,14 @@ open class Snapshot: NSObject {
         } catch {
             print("Couldn't detect/set locale...")
         }
+        
         if locale.isEmpty {
             locale = Locale(identifier: deviceLanguage).identifier
         }
-        app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
+        
+        if !locale.isEmpty {
+            app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
+        }
     }
 
     class func setLaunchArguments(_ app: XCUIApplication) {
@@ -273,4 +277,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.12]
+// SnapshotHelperVersion [1.13]

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -107,10 +107,10 @@ module Spaceship
       class MacInstallerDistribution < Certificate; end
 
       # A Mac Developer ID signing certificate for building .app bundles
-      class DeveloperIDApplication < Certificate; end
+      class DeveloperIdApplication < Certificate; end
 
       # A Mac Developer ID signing certificate for building .pkg installers
-      class DeveloperIDInstaller < Certificate; end
+      class DeveloperIdInstaller < Certificate; end
 
       #####################################################
       # Certs that are specific for one app
@@ -175,11 +175,11 @@ module Spaceship
         "749Y1QAGU7" => MacDevelopment,
         "HXZEUKP0FP" => MacAppDistribution,
         "2PQI8IDXNH" => MacInstallerDistribution,
-        "OYVN2GW35E" => DeveloperIDInstaller,
-        "W0EURJRMC5" => DeveloperIDApplication,
+        "OYVN2GW35E" => DeveloperIdInstaller,
+        "W0EURJRMC5" => DeveloperIdApplication,
         "CDZ7EMXIZ1" => MacProductionPush,
         "HQ4KP3I34R" => MacDevelopmentPush,
-        "DIVN2GW3XT" => DeveloperIDApplication
+        "DIVN2GW3XT" => DeveloperIdApplication
       }
 
       CERTIFICATE_TYPE_IDS = IOS_CERTIFICATE_TYPE_IDS.merge(MAC_CERTIFICATE_TYPE_IDS)

data/spaceship/lib/spaceship/portal/provisioning_profile.rb

@@ -445,7 +445,7 @@ module Spaceship
             if self.kind_of?(Development)
               self.certificates = [Spaceship::Portal::Certificate::MacDevelopment.all.first]
             elsif self.kind_of?(Direct)
-              self.certificates = [Spaceship::Portal::Certificate::DeveloperIDApplication.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::DeveloperIdApplication.all.first]
             else
               self.certificates = [Spaceship::Portal::Certificate::MacAppDistribution.all.first]
             end

data/supply/lib/supply.rb

@@ -4,6 +4,7 @@ require 'supply/client'
 require 'supply/listing'
 require 'supply/apk_listing'
 require 'supply/uploader'
+require 'supply/languages'
 
 require 'fastlane_core'
 

data/supply/lib/supply/client.rb

@@ -5,9 +5,76 @@ Androidpublisher = Google::Apis::AndroidpublisherV2
 require 'net/http'
 
 module Supply
-  class Client
+  class AbstractGoogleServiceClient
+    SCOPE = nil
+    SERVICE = nil
+
     # Connecting with Google
-    attr_accessor :android_publisher
+    attr_accessor :client
+
+    def self.make_from_config(params: nil)
+      unless params[:json_key] || params[:json_key_data]
+        UI.important("To not be asked about this value, you can specify it using 'json_key'")
+        json_key_path = UI.input("The service account json file used to authenticate with Google: ")
+        json_key_path = File.expand_path(json_key_path)
+
+        UI.user_error!("Could not find service account json file at path '#{json_key_path}'") unless File.exist?(json_key_path)
+        params[:json_key] = json_key_path
+      end
+
+      if params[:json_key]
+        service_account_json = File.open(File.expand_path(params[:json_key]))
+      elsif params[:json_key_data]
+        service_account_json = StringIO.new(params[:json_key_data])
+      end
+
+      return self.new(service_account_json: service_account_json, params: params)
+    end
+
+    # Initializes the service and its auth_client using the specified information
+    # @param service_account_json: The raw service account Json data
+    def initialize(service_account_json: nil, params: nil)
+      auth_client = Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: service_account_json, scope: self.class::SCOPE)
+
+      UI.verbose("Fetching a new access token from Google...")
+
+      auth_client.fetch_access_token!
+
+      if FastlaneCore::Env.truthy?("DEBUG")
+        Google::Apis.logger.level = Logger::DEBUG
+      end
+
+      Google::Apis::ClientOptions.default.application_name = "fastlane (supply client)"
+      Google::Apis::ClientOptions.default.application_version = Fastlane::VERSION
+      Google::Apis::ClientOptions.default.read_timeout_sec = params[:timeout]
+      Google::Apis::ClientOptions.default.open_timeout_sec = params[:timeout]
+      Google::Apis::ClientOptions.default.send_timeout_sec = params[:timeout]
+      Google::Apis::RequestOptions.default.retries = 5
+
+      service = self.class::SERVICE.new
+      service.authorization = auth_client
+
+      if params[:root_url]
+        # Google's client expects the root_url string to end with "/".
+        params[:root_url] << '/' unless params[:root_url].end_with?('/')
+        service.root_url = params[:root_url]
+      end
+
+      self.client = service
+    end
+
+    private
+
+    def call_google_api
+      yield if block_given?
+    rescue Google::Apis::ClientError => e
+      UI.user_error!("Google Api Error: #{e.message}")
+    end
+  end
+
+  class Client < AbstractGoogleServiceClient
+    SERVICE = Androidpublisher::AndroidPublisherService
+    SCOPE = Androidpublisher::AUTH_ANDROIDPUBLISHER
 
     # Editing something
     # Reference to the entry we're currently editing. Might be nil if don't have one open
@@ -20,32 +87,29 @@ module Supply
     #####################################################
 
     # instantiate a client given the supplied configuration
-    def self.make_from_config
-      unless Supply.config[:json_key] || Supply.config[:json_key_data] || (Supply.config[:key] && Supply.config[:issuer])
-        UI.important("To not be asked about this value, you can specify it using 'json_key'")
-        Supply.config[:json_key] = UI.input("The service account json file used to authenticate with Google: ")
+    def self.make_from_config(params: nil)
+      if params.nil?
+        params = Supply.config
       end
 
-      if Supply.config[:json_key]
-        service_account_json = File.open(File.expand_path(Supply.config[:json_key]))
-      elsif Supply.config[:json_key_data]
-        service_account_json = StringIO.new(Supply.config[:json_key_data])
+      # first consider deprecated params
+      unless params[:json_key] || params[:json_key_data] || (params[:key] && params[:issuer])
+        UI.important("To not be asked about this value, you can specify it using 'json_key'")
+        params[:json_key] = UI.input("The service account json file used to authenticate with Google: ")
       end
 
-      return Client.new(path_to_key: Supply.config[:key],
-                        issuer: Supply.config[:issuer], service_account_json: service_account_json)
+      super(params: params)
     end
 
-    # Initializes the android_publisher and its auth_client using the specified information
+    # Initializes the client and its auth_client using the specified information
     # @param service_account_json: The raw service account Json data
     # @param path_to_key: The path to your p12 file (@deprecated)
     # @param issuer: Email address for oauth (@deprecated)
-    def initialize(path_to_key: nil, issuer: nil, service_account_json: nil)
-      scope = Androidpublisher::AUTH_ANDROIDPUBLISHER
-
+    def initialize(path_to_key: nil, issuer: nil, service_account_json: nil, params: nil)
       if service_account_json
         key_io = service_account_json
       else
+        # deprecated
         require 'google/api_client/auth/key_utils'
         key = Google::APIClient::KeyUtils.load_from_pkcs12(File.expand_path(path_to_key), 'notasecret')
         cred_json = {
@@ -55,30 +119,7 @@ module Supply
         key_io = StringIO.new(MultiJson.dump(cred_json))
       end
 
-      auth_client = Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: key_io, scope: scope)
-
-      UI.verbose("Fetching a new access token from Google...")
-
-      auth_client.fetch_access_token!
-
-      if FastlaneCore::Env.truthy?("DEBUG")
-        Google::Apis.logger.level = Logger::DEBUG
-      end
-
-      Google::Apis::ClientOptions.default.application_name = "fastlane - supply"
-      Google::Apis::ClientOptions.default.application_version = Fastlane::VERSION
-      Google::Apis::ClientOptions.default.read_timeout_sec = Supply.config[:timeout]
-      Google::Apis::ClientOptions.default.open_timeout_sec = Supply.config[:timeout]
-      Google::Apis::ClientOptions.default.send_timeout_sec = Supply.config[:timeout]
-      Google::Apis::RequestOptions.default.retries = 5
-
-      self.android_publisher = Androidpublisher::AndroidPublisherService.new
-      self.android_publisher.authorization = auth_client
-      if Supply.config[:root_url]
-        # Google's client expects the root_url string to end with "/".
-        Supply.config[:root_url] << '/' unless Supply.config[:root_url].end_with?('/')
-        self.android_publisher.root_url = Supply.config[:root_url]
-      end
+      super(service_account_json: key_io, params: params)
     end
 
     #####################################################
@@ -89,7 +130,7 @@ module Supply
     def begin_edit(package_name: nil)
       UI.user_error!("You currently have an active edit") if @current_edit
 
-      self.current_edit = call_google_api { android_publisher.insert_edit(package_name) }
+      self.current_edit = call_google_api { client.insert_edit(package_name) }
 
       self.current_package_name = package_name
     end
@@ -98,7 +139,7 @@ module Supply
     def abort_current_edit
       ensure_active_edit!
 
-      call_google_api { android_publisher.delete_edit(current_package_name, current_edit.id) }
+      call_google_api { client.delete_edit(current_package_name, current_edit.id) }
 
       self.current_edit = nil
       self.current_package_name = nil
@@ -108,14 +149,14 @@ module Supply
     def validate_current_edit!
       ensure_active_edit!
 
-      call_google_api { android_publisher.validate_edit(current_package_name, current_edit.id) }
+      call_google_api { client.validate_edit(current_package_name, current_edit.id) }
     end
 
     # Commits the current edit saving all pending changes on Google Play
     def commit_current_edit!
       ensure_active_edit!
 
-      call_google_api { android_publisher.commit_edit(current_package_name, current_edit.id) }
+      call_google_api { client.commit_edit(current_package_name, current_edit.id) }
 
       self.current_edit = nil
       self.current_package_name = nil
@@ -130,7 +171,7 @@ module Supply
     def listings
       ensure_active_edit!
 
-      result = call_google_api { android_publisher.list_listings(current_package_name, current_edit.id) }
+      result = call_google_api { client.list_listings(current_package_name, current_edit.id) }
 
       return result.listings.map do |row|
         Listing.new(self, row.language, row)
@@ -142,7 +183,7 @@ module Supply
       ensure_active_edit!
 
       begin
-        result = android_publisher.get_listing(
+        result = client.get_listing(
           current_package_name,
           current_edit.id,
           language
@@ -159,7 +200,7 @@ module Supply
     def apks_version_codes
       ensure_active_edit!
 
-      result = call_google_api { android_publisher.list_apks(current_package_name, current_edit.id) }
+      result = call_google_api { client.list_apks(current_package_name, current_edit.id) }
 
       return Array(result.apks).map(&:version_code)
     end
@@ -168,7 +209,7 @@ module Supply
     def aab_version_codes
       ensure_active_edit!
 
-      result = call_google_api { android_publisher.list_edit_bundles(current_package_name, current_edit.id) }
+      result = call_google_api { client.list_edit_bundles(current_package_name, current_edit.id) }
 
       return Array(result.bundles).map(&:version_code)
     end
@@ -178,7 +219,7 @@ module Supply
       ensure_active_edit!
 
       result = call_google_api do
-        android_publisher.list_apk_listings(
+        client.list_apk_listings(
           current_package_name,
           current_edit.id,
           apk_version_code
@@ -207,7 +248,7 @@ module Supply
       })
 
       call_google_api do
-        android_publisher.update_listing(
+        client.update_listing(
           current_package_name,
           current_edit.id,
           language,
@@ -220,7 +261,7 @@ module Supply
       ensure_active_edit!
 
       result_upload = call_google_api do
-        android_publisher.upload_apk(
+        client.upload_apk(
           current_package_name,
           current_edit.id,
           upload_source: path_to_apk
@@ -234,7 +275,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.upload_edit_deobfuscationfile(
+        client.upload_edit_deobfuscationfile(
           current_package_name,
           current_edit.id,
           apk_version_code,
@@ -249,7 +290,7 @@ module Supply
       ensure_active_edit!
 
       result_upload = call_google_api do
-        android_publisher.upload_edit_bundle(
+        client.upload_edit_bundle(
           current_package_name,
           self.current_edit.id,
           upload_source: path_to_aab,
@@ -278,7 +319,7 @@ module Supply
       })
 
       call_google_api do
-        android_publisher.update_track(
+        client.update_track(
           current_package_name,
           current_edit.id,
           track,
@@ -292,7 +333,7 @@ module Supply
       ensure_active_edit!
 
       begin
-        result = android_publisher.get_track(
+        result = client.get_track(
           current_package_name,
           current_edit.id,
           track
@@ -313,7 +354,7 @@ module Supply
       })
 
       call_google_api do
-        android_publisher.update_apk_listing(
+        client.update_apk_listing(
           current_package_name,
           current_edit.id,
           apk_listing.apk_version_code,
@@ -331,7 +372,7 @@ module Supply
       ensure_active_edit!
 
       result = call_google_api do
-        android_publisher.list_images(
+        client.list_images(
           current_package_name,
           current_edit.id,
           language,
@@ -347,7 +388,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.upload_image(
+        client.upload_image(
           current_package_name,
           current_edit.id,
           language,
@@ -362,7 +403,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.delete_all_images(
+        client.delete_all_images(
           current_package_name,
           current_edit.id,
           language,
@@ -375,7 +416,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.upload_expansion_file(
+        client.upload_expansion_file(
           current_package_name,
           current_edit.id,
           apk_version_code,
@@ -391,11 +432,5 @@ module Supply
     def ensure_active_edit!
       UI.user_error!("You need to have an active edit, make sure to call `begin_edit`") unless @current_edit
     end
-
-    def call_google_api
-      yield if block_given?
-    rescue Google::Apis::ClientError => e
-      UI.user_error!("Google Api Error: #{e.message}")
-    end
   end
 end