fastlane 2.38.0 → 2.38.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d4813843f6a0c883e796b89ff0cdc7db78b5393
-  data.tar.gz: 25a5db39445de2d3af5d09ed9d541362738b58e9
+  metadata.gz: d52c906c65bc9801fcd94f8f10d3a238616ae9e0
+  data.tar.gz: ed26fe920562648ed198d28a52d9c1ea17b284b3
 SHA512:
-  metadata.gz: 6772e065b7aee0118d6e6e6eb71db7b068c8b1a6c6489222715b492c132c7bdd329a30ba2ac606c3e58198774bfb3bd6eb0ae24c3b05d6b586b31ffac70a9533
-  data.tar.gz: 856a8512d48e5e280e33b5e184938622547c31e5f2925435c1433c69bdd613361119eca85b7f2e7d67f85d329aa7ec363b3a8e7c84b1164de05841a395349c09
+  metadata.gz: 52f3e4fa41ccc27172a14062d0ae68a9cbc75e46190e8ee9cbe919f912289b1e782c936265f9f874a94be9d151398145c3f9fb70cfdadb9911ca7cd1d694dcac
+  data.tar.gz: fcc9f2edf6bfcaf0f918f104350b116b17f3013717434fbafe5da5e073d74fd78e8140b5dbca2a30ddf0ecc7b63dfd62a5b2a8e81878a5df2d532e38a09ae814

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.38.0'.freeze
+  VERSION = '2.38.1'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/supply/lib/supply/client.rb

@@ -68,9 +68,8 @@ module Supply
 
       Google::Apis::ClientOptions.default.application_name = "fastlane - supply"
       Google::Apis::ClientOptions.default.application_version = Fastlane::VERSION
-      Google::Apis::ClientOptions.default.read_timeout_sec = 300
-      Google::Apis::ClientOptions.default.open_timeout_sec = 300
-      Google::Apis::ClientOptions.default.send_timeout_sec = 300
+      Google::Apis::RequestOptions.default.timeout_sec = 300
+      Google::Apis::RequestOptions.default.open_timeout_sec = 300
       Google::Apis::RequestOptions.default.retries = 5
 
       self.android_publisher = Androidpublisher::AndroidPublisherService.new
@@ -263,17 +262,15 @@ module Supply
     def track_version_codes(track)
       ensure_active_edit!
 
-      begin
-        result = android_publisher.get_track(
+      result = call_google_api do
+        android_publisher.get_track(
           current_package_name,
           current_edit.id,
           track
         )
-        return result.version_codes
-      rescue Google::Apis::ClientError => e
-        return [] if e.status_code == 404 && e.to_s.include?("trackEmpty")
-        raise
       end
+
+      return result.version_codes
     end
 
     def update_apk_listing_for_language(apk_listing)

data/supply/lib/supply/options.rb

@@ -172,13 +172,7 @@ module Supply
                                      optional: true,
                                      verify_block: proc do |value|
                                        UI.user_error! "Could not parse URL '#{value}'" unless value =~ URI.regexp
-                                     end),
-        FastlaneCore::ConfigItem.new(key: :check_superseded_tracks,
-                                     env_name: "SUPPLY_CHECK_SUPERSEDED_TRACKS",
-                                     optional: true,
-                                     description: "Check the other tracks for superseded versions and disable them",
-                                     is_string: false,
-                                     default_value: false)
+                                     end)
 
       ]
     end

data/supply/lib/supply/uploader.rb

@@ -158,46 +158,10 @@ module Supply
       if Supply.config[:track].eql? "rollout"
         client.update_track(Supply.config[:track], Supply.config[:rollout], apk_version_codes)
       else
-        check_superseded_tracks(apk_version_codes) if Supply.config[:check_superseded_tracks]
         client.update_track(Supply.config[:track], 1.0, apk_version_codes)
       end
     end
 
-    # Remove any version codes that is:
-    #  - Lesser than the greatest of any later (i.e. production) track
-    #  - Or lesser than the currently being uploaded if it's in an earlier (i.e. alpha) track
-    def check_superseded_tracks(apk_version_codes)
-      UI.message("Checking superseded tracks...")
-      max_apk_version_code = apk_version_codes.max
-      max_tracks_version_code = nil
-
-      tracks = ["production", "beta", "alpha"]
-      config_track_index = tracks.index(Supply.config[:track])
-
-      tracks.each_index do |track_index|
-        next if track_index.eql? config_track_index
-        track = tracks[track_index]
-
-        track_version_codes = client.track_version_codes(track).sort
-        next if track_version_codes.empty?
-
-        if max_tracks_version_code.nil?
-          max_tracks_version_code = track_version_codes.max
-        else
-          removed_version_codes = track_version_codes.take_while do |v|
-            v < max_tracks_version_code || (v < max_apk_version_code && track_index > config_track_index)
-          end
-
-          unless removed_version_codes.empty?
-            keep_version_codes = track_version_codes - removed_version_codes
-            max_tracks_version_code = keep_version_codes[0] unless keep_version_codes.empty?
-            client.update_track(track, 1.0, keep_version_codes)
-            UI.message("Superseded track '#{track}', removed '#{removed_version_codes}'")
-          end
-        end
-      end
-    end
-
     # returns only language directories from metadata_path
     def all_languages
       Dir.entries(metadata_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.38.0
+  version: 2.38.1
 platform: ruby
 authors:
 - Felix Krause
@@ -347,14 +347,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement