fastlane 2.135.2 → 2.140.0

data/supply/lib/supply/uploader.rb

@@ -15,34 +15,69 @@ module Supply
 
       apk_version_codes.concat(Supply.config[:version_codes_to_retain]) if Supply.config[:version_codes_to_retain]
 
-      # Only update tracks if we have version codes
-      # Updating a track with empty version codes can completely clear out a track
-      update_track(apk_version_codes) unless apk_version_codes.empty?
-
-      if !Supply.config[:rollout].nil? && Supply.config[:track].to_s != ""
-        update_rollout
+      if !apk_version_codes.empty?
+        # Only update tracks if we have version codes
+        # update_track handle setting rollout if needed
+        # Updating a track with empty version codes can completely clear out a track
+        update_track(apk_version_codes)
+      else
+        # Only promote or rollout if we don't have version codes
+        if Supply.config[:track_promote_to]
+          promote_track
+        elsif !Supply.config[:rollout].nil? && Supply.config[:track].to_s != ""
+          update_rollout
+        end
       end
 
-      promote_track if Supply.config[:track_promote_to]
+      perform_upload_meta(apk_version_codes)
 
       if Supply.config[:validate_only]
-        UI.message("Validating all track and release changes with Google Play...")
+        UI.message("Validating all changes with Google Play...")
         client.validate_current_edit!
         UI.success("Successfully validated the upload to Google Play")
       else
-        UI.message("Uploading all track and release changes to Google Play...")
+        UI.message("Uploading all changes to Google Play...")
         client.commit_current_edit!
         UI.success("Successfully finished the upload to Google Play")
       end
+    end
 
-      perform_upload_meta(apk_version_codes)
+    def perform_upload_to_internal_app_sharing
+      download_urls = []
+
+      package_name = Supply.config[:package_name]
+
+      apk_paths = [Supply.config[:apk]] unless (apk_paths = Supply.config[:apk_paths])
+      apk_paths.compact!
+      apk_paths.each do |apk_path|
+        download_url = client.upload_apk_to_internal_app_sharing(package_name, apk_path)
+        download_urls << download_url
+        UI.success("Successfully uploaded APK to Internal App Sharing URL: #{download_url}")
+      end
+
+      aab_paths = [Supply.config[:aab]] unless (aab_paths = Supply.config[:aab_paths])
+      aab_paths.compact!
+      aab_paths.each do |aab_path|
+        download_url = client.upload_bundle_to_internal_app_sharing(package_name, aab_path)
+        download_urls << download_url
+        UI.success("Successfully uploaded AAB to Internal App Sharing URL: #{download_url}")
+      end
+
+      if download_urls.count == 1
+        return download_urls.first
+      else
+        return download_urls
+      end
     end
 
     def perform_upload_meta(version_codes)
-      client.begin_edit(package_name: Supply.config[:package_name])
-
       if (!Supply.config[:skip_upload_metadata] || !Supply.config[:skip_upload_images] || !Supply.config[:skip_upload_changelogs] || !Supply.config[:skip_upload_screenshots]) && metadata_path
+        # Use version code from config if version codes is empty and no nil or empty string
         version_codes = [Supply.config[:version_code]] if version_codes.empty?
+        version_codes = version_codes.reject do |version_code|
+          version_codes.to_s == ""
+        end
+
         version_codes.each do |version_code|
           UI.user_error!("Could not find folder #{metadata_path}") unless File.directory?(metadata_path)
 
@@ -60,22 +95,12 @@ module Supply
             upload_metadata(language, listing) unless Supply.config[:skip_upload_metadata]
             upload_images(language) unless Supply.config[:skip_upload_images]
             upload_screenshots(language) unless Supply.config[:skip_upload_screenshots]
-            release_notes << upload_changelog(language, release.name) unless Supply.config[:skip_upload_changelogs]
+            release_notes << upload_changelog(language, version_code) unless Supply.config[:skip_upload_changelogs]
           end
 
           upload_changelogs(release_notes, release, track) unless release_notes.empty?
         end
       end
-
-      if Supply.config[:validate_only]
-        UI.message("Validating all meta changes with Google Play...")
-        client.validate_current_edit!
-        UI.success("Successfully validated the upload to Google Play")
-      else
-        UI.message("Uploading all meta changes to Google Play...")
-        client.commit_current_edit!
-        UI.success("Successfully finished the upload to Google Play")
-      end
     end
 
     def fetch_track_and_release!(track, version_code, status = nil)
@@ -84,8 +109,9 @@ module Supply
 
       track = tracks.first
       releases = track.releases
+
       releases = releases.select { |r| r.status == status } if status
-      releases = releases.select { |r| r.version_codes.map(&:to_s).include?(version_code.to_s) }
+      releases = releases.select { |r| r.version_codes.map(&:to_s).include?(version_code.to_s) } if version_code
 
       if releases.size > 1
         UI.user_error!("More than one release found in this track. Please specify with the :version_code option to select a release.")
@@ -96,10 +122,12 @@ module Supply
 
     def update_rollout
       track, release = fetch_track_and_release!(Supply.config[:track], Supply.config[:version_code], Supply::ReleaseStatus::IN_PROGRESS)
+      UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
+      UI.user_error!("Unable to find the requested release on track - '#{Supply.config[:track]}'") unless release
+
       version_code = release.version_codes.first
 
       UI.message("Updating #{version_code}'s rollout to '#{Supply.config[:rollout]}' on track '#{Supply.config[:track]}'...")
-      UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
 
       if track && release
         completed = Supply.config[:rollout].to_f == 1
@@ -149,6 +177,10 @@ module Supply
         releases = releases.select do |release|
           release.version_codes.include?(Supply.config[:version_code].to_s)
         end
+      else
+        releases = releases.select do |release|
+          release.status == Supply::ReleaseStatus::COMPLETED
+        end
       end
 
       if releases.size == 0
@@ -157,9 +189,17 @@ module Supply
         UI.user_error!("Track '#{Supply.config[:track]}' has more than one release - use :version_code to filter the release to promote")
       end
 
-      release = track_from.releases.first
+      release = releases.first
       track_to = client.tracks(Supply.config[:track_promote_to]).first
 
+      if Supply.config[:rollout]
+        release.status = Supply::ReleaseStatus::IN_PROGRESS
+        release.user_fraction = Supply.config[:rollout]
+      else
+        release.status = Supply::ReleaseStatus::COMPLETED
+        release.user_fraction = nil
+      end
+
       if track_to
         # Its okay to set releases to an array containing the newest release
         # Google Play will keep previous releases there this release is a partial rollout
@@ -174,16 +214,22 @@ module Supply
       client.update_track(Supply.config[:track_promote_to], track_to)
     end
 
-    def upload_changelog(language, version_name)
-      UI.user_error!("Cannot find changelog because no version name given - please specify :version_name") unless version_name
+    def upload_changelog(language, version_code)
+      UI.user_error!("Cannot find changelog because no version code given - please specify :version_code") unless version_code
 
-      path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "#{version_name}.txt")
+      path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "#{version_code}.txt")
       changelog_text = ''
       if File.exist?(path)
-        UI.message("Updating changelog for '#{version_name}' and language '#{language}'...")
+        UI.message("Updating changelog for '#{version_code}' and language '#{language}'...")
         changelog_text = File.read(path, encoding: 'UTF-8')
       else
-        UI.message("Could not find changelog for '#{version_name}' and language '#{language}' at path #{path}...")
+        default_changelog_path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "default.txt")
+        if File.exist?(default_changelog_path)
+          UI.message("Updating changelog for '#{version_code}' and language '#{language}' to default changelog...")
+          changelog_text = File.read(default_changelog_path, encoding: 'UTF-8')
+        else
+          UI.message("Could not find changelog for '#{version_code}' and language '#{language}' at path #{path}...")
+        end
       end
 
       AndroidPublisher::LocalizedText.new({
@@ -338,8 +384,11 @@ module Supply
       )
 
       if Supply.config[:rollout]
-        track_release.status = Supply::ReleaseStatus::IN_PROGRESS
-        track_release.user_fraction = Supply.config[:rollout].to_f
+        rollout = Supply.config[:rollout].to_f
+        if rollout > 0 && rollout < 1
+          track_release.status = Supply::ReleaseStatus::IN_PROGRESS
+          track_release.user_fraction = rollout
+        end
       end
 
       tracks = client.tracks(Supply.config[:track])

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.135.2
+  version: 2.140.0
 platform: ruby
 authors:
-- Andrew McBurney
-- Jan Piotrowski
-- Maksym Grebenets
 - Olivier Halligon
-- Kohki Miki
-- Iulian Onofrei
-- Danielle Tomlinson
+- Jan Piotrowski
 - Manu Wallner
-- Luka Mirosevic
-- Helmut Januschka
+- Kohki Miki
+- Stefan Natchev
 - Josh Holtz
-- Felix Krause
 - Jérôme Lacoste
-- Stefan Natchev
-- Aaron Brager
+- Maksym Grebenets
+- Andrew McBurney
+- Joshua Liebowitz
+- Matthew Ellis
 - Jimmy Dee
 - Fumiya Nakamura
-- Matthew Ellis
+- Felix Krause
+- Danielle Tomlinson
+- Helmut Januschka
+- Aaron Brager
+- Iulian Onofrei
+- Luka Mirosevic
 - Jorge Revuelta H
-- Joshua Liebowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -55,7 +55,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.13.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.13.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -325,7 +325,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.71.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -335,7 +335,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.71.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -611,20 +611,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.29.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.37.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.29.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -791,6 +791,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -986,6 +1000,9 @@ files:
 - fastlane/lib/fastlane.rb
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
+- fastlane/lib/fastlane/actions/.hockey.rb.swp
+- fastlane/lib/fastlane/actions/.slack.rb.swp
+- fastlane/lib/fastlane/actions/.update_project_provisioning.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1206,6 +1223,7 @@ files:
 - fastlane/lib/fastlane/actions/upload_symbols_to_sentry.rb
 - fastlane/lib/fastlane/actions/upload_to_app_store.rb
 - fastlane/lib/fastlane/actions/upload_to_play_store.rb
+- fastlane/lib/fastlane/actions/upload_to_play_store_internal_app_sharing.rb
 - fastlane/lib/fastlane/actions/upload_to_testflight.rb
 - fastlane/lib/fastlane/actions/validate_play_store_json_key.rb
 - fastlane/lib/fastlane/actions/verify_build.rb
@@ -1314,6 +1332,7 @@ files:
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+- fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.xcworkspace/xcuserdata/josh.xcuserdatad/UserInterfaceState.xcuserstate
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/xcshareddata/xcschemes/FastlaneRunner.xcscheme
 - fastlane/swift/FastlaneSwiftRunner/README.txt
 - fastlane/swift/Gymfile.swift
@@ -1342,6 +1361,7 @@ files:
 - fastlane_core/README.md
 - fastlane_core/lib/assets/XMLTemplate.xml.erb
 - fastlane_core/lib/fastlane_core.rb
+- fastlane_core/lib/fastlane_core/.build_watcher.rb.swp
 - fastlane_core/lib/fastlane_core/analytics/action_completion_context.rb
 - fastlane_core/lib/fastlane_core/analytics/action_launch_context.rb
 - fastlane_core/lib/fastlane_core/analytics/analytics_event_builder.rb
@@ -1468,6 +1488,7 @@ files:
 - pem/lib/pem/options.rb
 - pilot/README.md
 - pilot/lib/pilot.rb
+- pilot/lib/pilot/.manager.rb.swp
 - pilot/lib/pilot/build_manager.rb
 - pilot/lib/pilot/commands_generator.rb
 - pilot/lib/pilot/features.rb
@@ -1599,6 +1620,7 @@ files:
 - spaceship/lib/spaceship/client.rb
 - spaceship/lib/spaceship/commands_generator.rb
 - spaceship/lib/spaceship/connect_api.rb
+- spaceship/lib/spaceship/connect_api/.DS_Store
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/model.rb
 - spaceship/lib/spaceship/connect_api/models/app.rb
@@ -1607,7 +1629,9 @@ files:
 - spaceship/lib/spaceship/connect_api/models/beta_app_review_submission.rb
 - spaceship/lib/spaceship/connect_api/models/beta_build_localization.rb
 - spaceship/lib/spaceship/connect_api/models/beta_build_metric.rb
+- spaceship/lib/spaceship/connect_api/models/beta_feedback.rb
 - spaceship/lib/spaceship/connect_api/models/beta_group.rb
+- spaceship/lib/spaceship/connect_api/models/beta_screenshot.rb
 - spaceship/lib/spaceship/connect_api/models/beta_tester.rb
 - spaceship/lib/spaceship/connect_api/models/beta_tester_metric.rb
 - spaceship/lib/spaceship/connect_api/models/build.rb
@@ -1639,6 +1663,7 @@ files:
 - spaceship/lib/spaceship/launcher.rb
 - spaceship/lib/spaceship/module.rb
 - spaceship/lib/spaceship/playground.rb
+- spaceship/lib/spaceship/portal/.certificate.rb.swp
 - spaceship/lib/spaceship/portal/app.rb
 - spaceship/lib/spaceship/portal/app_group.rb
 - spaceship/lib/spaceship/portal/app_service.rb
@@ -1731,8 +1756,6 @@ files:
 - spaceship/lib/spaceship/ui.rb
 - supply/README.md
 - supply/lib/supply.rb
-- supply/lib/supply/.options.rb.swp
-- supply/lib/supply/.uploader.rb.swp
 - supply/lib/supply/apk_listing.rb
 - supply/lib/supply/client.rb
 - supply/lib/supply/commands_generator.rb
@@ -1780,7 +1803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and