fastlane 2.38.0.beta.20170607010024 → 2.38.0.beta.20170608010030

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11620e63584ea3d61e0322ad5ab0a69061c97e08
-  data.tar.gz: decaded040f2b6033e6ea4a07cf163285c4cb4a3
+  metadata.gz: 6d9ed994f6a7c303ebebcad4f91a1ff719d2ddfa
+  data.tar.gz: e32e577d86a1647927fca115835de93ca7d830bb
 SHA512:
-  metadata.gz: e8efa8648538ac6741259007fa25f8a275d607a9ab3fafc0c90a58e9dedd3d4d91dbdbbd58b3f7ba25159b8615ff25cb04c80ba459b28a00c5b4bad0bd2e7483
-  data.tar.gz: f5d7a25a36a68e51e0803f6c9b7e4ff02638591a15a9160a8bb26524fa56ae7bf781ffa562d861e59e1ae18f9368f8987c316b7abc900ab99970b8c65778d5c8
+  metadata.gz: a133f153833792c0b836cc3cd572de440d3653a01537084601227b09561c8a612c9f015bed6a192389e70b6145901a8c7661c666ead3b707b519c253b468d265
+  data.tar.gz: 7d0db64c90ea2273bbdab7b2efc746b1d9b20b5f825d80c144cf09117aab24b93b7841303d4d506621d6f41e8fc8f02b53d8d15bf07840d4e6fa04def077e010

data/fastlane/lib/fastlane/version.rb

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

data/gym/lib/gym/generators/build_command_generator.rb

@@ -40,7 +40,6 @@ module Gym
         options << "-archivePath #{archive_path.shellescape}"
         options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
-        options << "-UseNewBuildSystem=YES" if config[:new_build_system]
         options << config[:xcargs] if config[:xcargs]
         options << "OTHER_SWIFT_FLAGS=\"\$(inherited) -Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
 

data/gym/lib/gym/options.rb

@@ -277,14 +277,7 @@ module Gym
                                      env_name: "XCPRETTY_UTF",
                                      description: "Have xcpretty use unicode encoding when reporting builds",
                                      optional: true,
-                                     is_string: false),
-        FastlaneCore::ConfigItem.new(key: :new_build_system,
-                                     short_option: "-N",
-                                     env_name: "GYM_NEW_BUILD_SYSTEM",
-                                     is_string: false,
-                                     description: "Use new Build System currently in preview on Xcode>=9",
-                                     optional: true)
-
+                                     is_string: false)
       ]
     end
   end

data/supply/lib/supply/client.rb

@@ -68,8 +68,9 @@ module Supply
 
       Google::Apis::ClientOptions.default.application_name = "fastlane - supply"
       Google::Apis::ClientOptions.default.application_version = Fastlane::VERSION
-      Google::Apis::RequestOptions.default.timeout_sec = 300
-      Google::Apis::RequestOptions.default.open_timeout_sec = 300
+      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.retries = 5
 
       self.android_publisher = Androidpublisher::AndroidPublisherService.new
@@ -262,15 +263,17 @@ module Supply
     def track_version_codes(track)
       ensure_active_edit!
 
-      result = call_google_api do
-        android_publisher.get_track(
+      begin
+        result = 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,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.38.0.beta.20170607010024
+  version: 2.38.0.beta.20170608010030
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -347,14 +347,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -1369,21 +1369,21 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - credentials_manager/lib
-- scan/lib
-- spaceship/lib
 - fastlane/lib
-- deliver/lib
-- supply/lib
 - sigh/lib
-- produce/lib
-- fastlane_core/lib
-- snapshot/lib
-- frameit/lib
 - cert/lib
-- gym/lib
-- match/lib
+- scan/lib
 - screengrab/lib
+- supply/lib
+- match/lib
 - pem/lib
+- spaceship/lib
+- fastlane_core/lib
+- frameit/lib
+- produce/lib
+- snapshot/lib
+- deliver/lib
+- gym/lib
 - pilot/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: