fastlane 2.150.0.rc6 → 2.150.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c0c26f1a8fc4baab70230ea4478de1303401d512bce5564c7963f7d52aeee9
-  data.tar.gz: 7093929e2f5d402e0623b5e2873a8178a8fcc74a711595ed9d038ca1e9f39e0d
+  metadata.gz: 34e85dcd86b90ee3b9187bc8417630a13c81188999870ddcc856dda2e11d2a7b
+  data.tar.gz: a3f719e25bfaac439e8a5052e68b16d63f94e2c2e2cf66ad5411b55970eb7f34
 SHA512:
-  metadata.gz: f836a09c447b7b4ae447f6a78163a978620e104e06bf5f9b46fcbcbcad49baa089e153ab60aec1312d366a55e11369cc149de680d72f8e51582612c471b6f167
-  data.tar.gz: cf0dd78f7208ce467c1be9fa1bd5bb5b9be1ffa8587ad0d9191c0370d41cc3aa8f1e8e92001fbcf7d7ee2e450d074c31111e6fde2eb23a500ced56cff87f34fc
+  metadata.gz: 0b769c9010489fab0525f1966896b3563e97877d2fa562d26614d3732a9f8a9e8cd08dc340043c094e9761892ff1c7aa469a09ff47744458a57f9d053cc06a3c
+  data.tar.gz: 5c4165e619e55db0c588a2298d5242103a35b7d785f04d3458f2cd5b73d3c7184e550096791244d15ec4c75541447e2850bbefeb51e4041dfd36d87e656309df

data/deliver/lib/deliver/runner.rb

@@ -159,7 +159,10 @@ module Deliver
     end
 
     def reject_version_if_possible
-      app = options[:app]
+      legacy_app = options[:app]
+      app_id = legacy_app.apple_id
+      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+
       if app.reject_version_if_possible!
         UI.success("Successfully rejected previous version!")
       end

data/deliver/lib/deliver/upload_metadata.rb

@@ -106,7 +106,9 @@ module Deliver
       end
 
       # Needed for to filter out release notes from being sent up
-      is_first_version = app.get_live_app_store_version(platform: platform).nil?
+      number_of_versions = app.get_app_store_versions(filter: { platform: platform }, limit: 2).size
+      is_first_version = number_of_versions == 1
+      UI.verbose("Version '#{version.version_string}' is the first version on App Store Connect") if is_first_version
 
       UI.important("Will begin uploading metadata for '#{version.version_string}' on App Store Connect")
 
@@ -158,7 +160,11 @@ module Deliver
       end
 
       release_type = if options[:auto_release_date]
-                       non_localized_version_attributes['earliestReleaseDate'] = options[:auto_release_date]
+                       # Convert time format to 2020-06-17T12:00:00-07:00
+                       time_in_ms = options[:auto_release_date]
+                       date = convert_ms_to_iso8601(time_in_ms)
+
+                       non_localized_version_attributes['earliestReleaseDate'] = date
                        Spaceship::ConnectAPI::AppStoreVersion::ReleaseType::SCHEDULED
                      elsif options[:automatic_release]
                        Spaceship::ConnectAPI::AppStoreVersion::ReleaseType::AFTER_APPROVAL
@@ -315,6 +321,16 @@ module Deliver
 
     # rubocop:enable Metrics/PerceivedComplexity
 
+    def convert_ms_to_iso8601(time_in_ms)
+      time_in_s = time_in_ms / 1000
+
+      # Remove minutes and seconds (whole hour)
+      seconds_in_hour = 60 * 60
+      time_in_s_to_hour = (time_in_s / seconds_in_hour).to_i * seconds_in_hour
+
+      return Time.at(time_in_s_to_hour).strftime("%Y-%m-%dT%H:%M:%S%:z")
+    end
+
     # If the user is using the 'default' language, then assign values where they are needed
     def assign_defaults(options)
       # Normalizes languages keys from symbols to strings

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.150.0.rc6'.freeze
+  VERSION = '2.150.0.rc7'.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/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -110,6 +110,26 @@ module Spaceship
       # App Store Versions
       #
 
+      def reject_version_if_possible!
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW
+          ].join(","),
+          platform: platform
+        }
+
+        # Get the latest version
+        version = get_app_store_versions(filter: filter, includes: "appStoreVersionSubmission")
+                  .sort_by { |v| Gem::Version.new(v.version_string) }
+                  .last
+
+        return false if version.nil?
+        return version.reject!
+      end
+
       # Will make sure the current edit_version matches the given version number
       # This will either create a new version or change the version number
       # from an existing version

data/spaceship/lib/spaceship/connect_api/models/app_info.rb

@@ -11,6 +11,9 @@ module Spaceship
 
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
+        PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
+        PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
         REJECTED = "REJECTED"

data/spaceship/lib/spaceship/connect_api/models/app_store_version.rb

@@ -19,8 +19,13 @@ module Spaceship
       attr_accessor :downloadable
       attr_accessor :created_date
 
+      attr_accessor :app_store_version_submission
+
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
+        PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
+        PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
         REJECTED = "REJECTED"
@@ -47,13 +52,26 @@ module Spaceship
         "usesIdfa" =>  "uses_idfa",
         "isWatchOnly" =>  "is_watch_only",
         "downloadable" =>  "downloadable",
-        "createdDate" =>  "created_date"
+        "createdDate" =>  "created_date",
+
+        "appStoreVersionSubmission" => "app_store_version_submission"
       })
 
       def self.type
         return "appStoreVersions"
       end
 
+      def can_reject?
+        raise "No app_store_version_submission included" unless app_store_version_submission
+        return app_store_version_submission.can_reject
+      end
+
+      def reject!
+        return false unless can_reject?
+        app_store_version_submission.delete!
+        return true
+      end
+
       #
       # API
       #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.150.0.rc6
+  version: 2.150.0.rc7
 platform: ruby
 authors:
 - Manu Wallner
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier