fastlane 2.40.0.beta.20170620010029 → 2.40.0.beta.20170621010038

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ecb389e07fa98300df31ef752a0b9faad5d37eb
-  data.tar.gz: f6705997d7cb41177ab53320bde6b4b79544bb85
+  metadata.gz: 1aecac2c764541b3681eedd9f44827843c3403f9
+  data.tar.gz: c4ff9cacb874e3a827fe12cabaee41d0ede44709
 SHA512:
-  metadata.gz: b022742cce7f3c62e8b18649465cc9ab39cf97a3320dbe7416f802386fd4c1ca7defb61ce2ea173a653f96875be951f1a13078581aa751d600bdfaf3887dc66c
-  data.tar.gz: f932c61eb2cc7a8b468877285bf794f54ee5d51c16d19c51b7d5b74b1e0049397ddf8f74cfa47b3e455a5b80de381672148df1c75c757647b9d8a6476bba762a
+  metadata.gz: 0f48d61a68aa009829cca85280ea29a59aa00a54f30ca788de4031d3bb96c14e8ac023a613df874e806908b90403dc1ad96744c9a139a24528ac6921240e5b36
+  data.tar.gz: 0b45be6c7d0609f8d3c8118efd4bbc2c6422b7fc306d344a0708c248f51e0b0482dc0a972e34689b65f0e9dd446aceb1a799e7bea63acb848019df2d8ac3d1ba

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.40.0.beta.20170620010029'.freeze
+  VERSION = '2.40.0.beta.20170621010038'.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

@@ -268,9 +268,11 @@ module Supply
           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,7 +172,13 @@ module Supply
                                      optional: true,
                                      verify_block: proc do |value|
                                        UI.user_error! "Could not parse URL '#{value}'" unless value =~ URI.regexp
-                                     end)
+                                     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

data/supply/lib/supply/uploader.rb

@@ -158,10 +158,46 @@ 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.40.0.beta.20170620010029
+  version: 2.40.0.beta.20170621010038
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1375,23 +1375,23 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- screengrab/lib
+- pilot/lib
+- spaceship/lib
 - deliver/lib
-- frameit/lib
+- pem/lib
+- sigh/lib
 - fastlane_core/lib
-- match/lib
-- pilot/lib
 - produce/lib
-- sigh/lib
-- pem/lib
+- snapshot/lib
+- supply/lib
 - gym/lib
-- scan/lib
-- cert/lib
+- match/lib
 - fastlane/lib
-- spaceship/lib
 - credentials_manager/lib
-- supply/lib
-- snapshot/lib
+- scan/lib
+- screengrab/lib
+- frameit/lib
+- cert/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="