fastlane 2.148.0 → 2.150.0.rc2

data/deliver/lib/deliver/upload_price_tier.rb

@@ -1,23 +1,37 @@
 require_relative 'module'
+require 'spaceship'
 
 module Deliver
   # Set the app's pricing
   class UploadPriceTier
     def upload(options)
       return unless options[:price_tier]
-      app = options[:app]
 
-      # just to be sure, the user might have passed an int (which is fine with us)
-      options[:price_tier] = options[:price_tier].to_s
+      price_tier = options[:price_tier].to_s
 
-      old_price = app.price_tier
-      if options[:price_tier] == old_price
-        UI.success("Price Tier unchanged (tier #{options[:price_tier]})")
+      legacy_app = options[:app]
+      app_id = legacy_app.apple_id
+      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+
+      attributes = {}
+      territory_ids = []
+
+      app_prices = app.fetch_app_prices
+      if app_prices.first
+        old_price = app_prices.first.price_tier.id
+      else
+        UI.message("App has no prices yet... Enabling all countries in App Store Connect")
+        territory_ids = Spaceship::ConnectAPI::Territory.all.map(&:id)
+        attributes[:availableInNewTerritories] = true
+      end
+
+      if price_tier == old_price
+        UI.success("Price Tier unchanged (tier #{old_price})")
         return
       end
 
-      app.update_price_tier!(options[:price_tier])
-      UI.success("Successfully updated the pricing from #{old_price} to #{options[:price_tier]}")
+      app.update(attributes: attributes, app_price_tier_id: price_tier, territory_ids: territory_ids)
+      UI.success("Successfully updated the pricing from #{old_price} to #{price_tier}")
     end
   end
 end

data/deliver/lib/deliver/upload_screenshots.rb

@@ -11,69 +11,144 @@ module Deliver
       return if options[:skip_screenshots]
       return if options[:edit_live]
 
-      app = options[:app]
+      legacy_app = options[:app]
+      app_id = legacy_app.apple_id
+      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
 
-      v = app.edit_version(platform: options[:platform])
-      UI.user_error!("Could not find a version to edit for app '#{app.name}'") unless v
+      platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
+      version = app.get_edit_app_store_version(platform: platform)
+      UI.user_error!("Could not find a version to edit for app '#{app.name}' for '#{platform}'") unless version
+
+      UI.important("Will begin uploading snapshots for '#{version.version_string}' on App Store Connect")
 
       UI.message("Starting with the upload of screenshots...")
       screenshots_per_language = screenshots.group_by(&:language)
 
+      localizations = version.get_app_store_version_localizations
+
       if options[:overwrite_screenshots]
-        UI.message("Removing all previously uploaded screenshots...")
-        # First, clear all previously uploaded screenshots
-        screenshots_per_language.keys.each do |language|
-          # We have to nil check for languages not activated
-          next if v.screenshots[language].nil?
-          v.screenshots[language].each_with_index do |t, index|
-            v.upload_screenshot!(nil, t.sort_order, t.language, t.device_type, t.is_imessage)
+        # Get localizations on version
+        localizations.each do |localization|
+          # Only delete screenshots if trying to upload
+          next unless screenshots_per_language.keys.include?(localization.locale)
+
+          # Iterate over all screenshots for each set and delete
+          screenshot_sets = localization.get_app_screenshot_sets
+
+          # Multi threading delete on single localization
+          threads = []
+          errors = []
+
+          screenshot_sets.each do |screenshot_set|
+            UI.message("Removing all previously uploaded screenshots for '#{localization.locale}' '#{screenshot_set.screenshot_display_type}'...")
+            screenshot_set.app_screenshots.each do |screenshot|
+              UI.verbose("Deleting screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+              threads << Thread.new do
+                begin
+                  screenshot.delete!
+                  UI.verbose("Deleted screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+                rescue => error
+                  UI.verbose("Failed to delete screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+                  errors << error
+                end
+              end
+            end
+          end
+
+          sleep(1) # Feels bad but sleeping a bit to let the threads catchup
+
+          unless threads.empty?
+            Helper.show_loading_indicator("Waiting for screenshots to be deleted for '#{localization.locale}'... (might be slow)") unless FastlaneCore::Globals.verbose?
+            threads.each(&:join)
+            Helper.hide_loading_indicator unless FastlaneCore::Globals.verbose?
+          end
+
+          # Crash if any errors happen while deleting
+          unless errors.empty?
+            UI.crash!(errors.map(&:message).join("\n"))
           end
         end
       end
 
-      # Now, fill in the new ones
-      indized = {} # per language and device type
+      # Finding languages to enable
+      languages = screenshots_per_language.keys
+      locales_to_enable = languages - localizations.map(&:locale)
 
-      enabled_languages = screenshots_per_language.keys
-      if enabled_languages.count > 0
-        v.create_languages(enabled_languages)
+      if locales_to_enable.count > 0
         lng_text = "language"
-        lng_text += "s" if enabled_languages.count != 1
-        Helper.show_loading_indicator("Activating #{lng_text} #{enabled_languages.join(', ')}...")
-        v.save!
-        # This refreshes the app version from iTC after enabling a localization
-        v = app.edit_version(platform: options[:platform])
+        lng_text += "s" if locales_to_enable.count != 1
+        Helper.show_loading_indicator("Activating #{lng_text} #{locales_to_enable.join(', ')}...")
+
+        locales_to_enable.each do |locale|
+          version.create_app_store_version_localization(attributes: {
+            locale: locale
+          })
+        end
+
         Helper.hide_loading_indicator
+
+        # Refresh version localizations
+        localizations = version.get_app_store_version_localizations
       end
 
+      # Upload screenshots
+      indized = {} # per language and device type
+
       screenshots_per_language.each do |language, screenshots_for_language|
+        # Find localization to upload screenshots to
+        localization = localizations.find do |l|
+          l.locale == language
+        end
+
+        unless localization
+          UI.error("Couldn't find localization on version for #{language}")
+          next
+        end
+
+        indized[localization.locale] ||= {}
+
+        # Create map to find screenshot set to add screenshot to
+        app_screenshot_sets_map = {}
+        app_screenshot_sets = localization.get_app_screenshot_sets
+        app_screenshot_sets.each do |app_screenshot_set|
+          app_screenshot_sets_map[app_screenshot_set.screenshot_display_type] = app_screenshot_set
+
+          # Set initial screnshot count
+          indized[localization.locale][app_screenshot_set.screenshot_display_type] ||= app_screenshot_set.app_screenshots.size
+        end
+
         UI.message("Uploading #{screenshots_for_language.length} screenshots for language #{language}")
         screenshots_for_language.each do |screenshot|
-          indized[screenshot.language] ||= {}
-          indized[screenshot.language][screenshot.formatted_name] ||= 0
-          indized[screenshot.language][screenshot.formatted_name] += 1 # we actually start with 1... wtf iTC
+          display_type = screenshot.device_type
+          set = app_screenshot_sets_map[display_type]
 
-          index = indized[screenshot.language][screenshot.formatted_name]
+          if display_type.nil?
+            UI.error("Error... Screenshot size #{screenshot.screen_size} not valid for App Store Connect")
+            next
+          end
+
+          unless set
+            set = localization.create_app_screenshot_set(attributes: {
+              screenshotDisplayType: display_type
+            })
+            app_screenshot_sets_map[display_type] = set
+
+            indized[localization.locale][set.screenshot_display_type] = 0
+          end
 
-          if index > 10
+          index = indized[localization.locale][set.screenshot_display_type]
+
+          if index >= 10
             UI.error("Too many screenshots found for device '#{screenshot.formatted_name}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
             next
           end
 
+          indized[localization.locale][set.screenshot_display_type] += 1
+
+          # Also.. what is the messages type even for?
           UI.message("Uploading '#{screenshot.path}'...")
-          v.upload_screenshot!(screenshot.path,
-                               index,
-                               screenshot.language,
-                               screenshot.device_type,
-                               screenshot.is_messages?)
+          set.upload_screenshot(path: screenshot.path)
         end
-        # ideally we should only save once, but itunes server can't cope it seems
-        # so we save per language. See issue #349
-        Helper.show_loading_indicator("Saving changes")
-        v.save!
-        # Refresh app version to start clean again. See issue #9859
-        v = app.edit_version
-        Helper.hide_loading_indicator
       end
       UI.success("Successfully uploaded screenshots to App Store Connect")
     end

data/fastlane/lib/assets/s3_html_template.erb

@@ -72,7 +72,7 @@
     <p id="footnote">
       This is a beta version and is not meant to share with the public.
     </p>
-    <img src="https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane_medium.png" id="fastlaneLogo" />
+    <img src="https://fastlane.tools/assets/img/fastlane_icon.png" id="fastlaneLogo" />
   </body>
 
   <script type='text/javascript'>

data/fastlane/lib/fastlane/actions/docs/capture_android_screenshots.md

@@ -52,7 +52,25 @@ Ensure that the following permissions exist in your **src/debug/AndroidManifest.
 
 ##### Configuring your <a href="#ui-tests">UI Tests</a> for Screenshots
 
-1. Add `@ClassRule public static final LocaleTestRule localeTestRule = new LocaleTestRule();` to your tests class to handle automatic switching of locales
+1. Add `LocaleTestRule` to your tests class to handle automatic switching of locales.  
+   If you're using Java use:
+   ```java
+   @ClassRule
+   public static final LocaleTestRule localeTestRule = new LocaleTestRule();
+   ```
+   If you're using Kotlin use:
+   ```kotlin
+   @Rule @JvmField
+   val localeTestRule = LocaleTestRule()
+   ```
+   Important is the `@JvmField` annotation. It won't work like that:
+   ```kotlin
+   companion object {
+       @get:ClassRule
+       val localeTestRule = LocaleTestRule()
+   }
+   ```
+
 2. To capture screenshots, add the following to your tests `Screengrab.screenshot("name_of_screenshot_here");` on the appropriate screens
 
 # Generating Screenshots with Screengrab
@@ -137,6 +155,7 @@ fastlane action screengrab
 Check out [Testing UI for a Single App](http://developer.android.com/training/testing/ui-testing/espresso-testing.html) for an introduction to using Espresso for UI testing.
 
 ##### Example UI Test Class (Using JUnit4)
+Java:
 ```java
 @RunWith(JUnit4.class)
 public class JUnit4StyleTests {
@@ -157,6 +176,28 @@ public class JUnit4StyleTests {
 }
 
 ```
+Kotlin:
+```kotlin
+@RunWith(JUnit4.class)
+class JUnit4StyleTests {
+    @get:Rule
+    var activityRule = ActivityTestRule(MainActivity::class.java)
+
+    @Rule @JvmField
+    val localeTestRule = LocaleTestRule()
+
+    @Test
+    fun testTakeScreenshot() {
+        Screengrab.screenshot("before_button_click")
+
+        onView(withId(R.id.fab)).perform(click())
+
+        Screengrab.screenshot("after_button_click")
+    }
+}
+
+```
+
 There is an [example project](https://github.com/fastlane/fastlane/tree/master/screengrab/example/src/androidTest/java/tools/fastlane/localetester) showing how to use use JUnit 3 or 4 and Espresso with the screengrab Java library to capture screenshots during a UI test run.
 
 Using JUnit 4 is preferable because of its ability to perform actions before and after the entire test class is run. This means you will change the device's locale far fewer times when compared with JUnit 3 running those commands before and after each test method.
@@ -290,4 +331,3 @@ Sit back and enjoy your new screenshots!
 Note: while this could also be done by creating a new build variant (i.e. debug, release and creating a new one called screengrab), [Android only allows one build type to be tested](http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Testing) which defaults to debug. That's why we use product flavors.
 
 </details>
-

data/fastlane/lib/fastlane/actions/docs/capture_ios_screenshots.md

@@ -364,7 +364,7 @@ snapshot(launch_arguments: ["SKIP_ANIMATIONS"])
 ```
 
 By default, _snapshot_ will wait for a short time for the animations to finish.
-If you're skipping the animations, this is wait time is unnecessary and can be skipped:
+If you're skipping the animations, this wait time is unnecessary and can be skipped:
 
 ```swift
 setupSnapshot(app, waitForAnimations: false)

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -467,7 +467,7 @@ _deliver_ allows for metadata to be set through `.txt` files in the metadata fol
 
 Key | Editable While Live | Directory | Filename
 ----|--------|--------|--------
-<%- (Deliver::UploadMetadata::NON_LOCALISED_VERSION_VALUES + Deliver::UploadMetadata::NON_LOCALISED_APP_VALUES).each do |value| -%>
+<%- (Deliver::UploadMetadata::NON_LOCALISED_VERSION_VALUES.keys + Deliver::UploadMetadata::NON_LOCALISED_APP_VALUES).each do |value| -%>
   `<%= value %>` | <%= Deliver::UploadMetadata::NON_LOCALISED_LIVE_VALUES.include?(value) ? 'Yes' : 'No' %> | `<metadata_path>` | `<%= value %>.txt`
 <%- end %>
 
@@ -475,23 +475,15 @@ Key | Editable While Live | Directory | Filename
 
 Key | Editable While Live | Directory | Filename
 ----|--------|--------|--------
-<%- (Deliver::UploadMetadata::LOCALISED_APP_VALUES + Deliver::UploadMetadata::LOCALISED_VERSION_VALUES).each do |value| -%>
+<%- (Deliver::UploadMetadata::LOCALISED_APP_VALUES.keys + Deliver::UploadMetadata::LOCALISED_VERSION_VALUES.keys).each do |value| -%>
   `<%= value %>` | <%= Deliver::UploadMetadata::LOCALISED_LIVE_VALUES.include?(value) ? 'Yes' : 'No' %> | `<metadata_path>/<lang>/` | `<%= value %>.txt`
 <%- end %>
 
-### Trade Representative Contact Information Metadata
-
-Key | Editable While Live | Directory | Filename
-----|--------|--------|--------
-<%- Deliver::UploadMetadata::TRADE_REPRESENTATIVE_CONTACT_INFORMATION_VALUES.each do |key, value| -%>
-  `<%= value %>` | Yes | `<metadata_path>/<%= Deliver::UploadMetadata::TRADE_REPRESENTATIVE_CONTACT_INFORMATION_DIR %>` | `<%= value %>.txt`
-<%- end %>
-
 ### Review Information Metadata
 
 Key | Editable While Live | Directory | Filename
 ----|--------|--------|--------
-<%- Deliver::UploadMetadata::REVIEW_INFORMATION_VALUES.each do |key, value| -%>
+<%- Deliver::UploadMetadata::REVIEW_INFORMATION_VALUES_LEGACY.each do |key, value| -%>
   `<%= value %>` | Yes | `<metadata_path>/<%= Deliver::UploadMetadata::REVIEW_INFORMATION_DIR %>` | `<%= value %>.txt`
 <%- end %>
 
@@ -502,33 +494,32 @@ Key | Editable While Live | Directory | Filename
 
 ### Available Categories
 
-You can always prefix the category using `MZGenre.` (e.g. `MZGenre.Book`). _deliver_ supports both notations.
-
-- `Book`
-- `Business`
-- `Apps.Catalogs`
-- `Education`
-- `Entertainment`
-- `Finance`
-- `Apps.Food_Drink`
-- `Games`
-- `Healthcare_Fitness`
-- `Lifestyle`
-- `Medical`
-- `Music`
-- `Navigation`
-- `News`
-- `Apps.Newsstand`
-- `Photography`
-- `Productivity`
-- `Reference`
-- `Apps.Shopping`
-- `SocialNetworking`
-- `Sports`
-- `Stickers`
-- `Travel`
-- `Utilities`
-- `Weather`
+- `FOOD_AND_DRINK`
+- `BUSINESS`
+- `EDUCATION`
+- `SOCIAL_NETWORKING`
+- `BOOKS`
+- `SPORTS`
+- `FINANCE`
+- `REFERENCE`
+- `GRAPHICS_AND_DESIGN`
+- `DEVELOPER_TOOLS`
+- `HEALTH_AND_FITNESS`
+- `MUSIC`
+- `WEATHER`
+- `TRAVEL`
+- `ENTERTAINMENT`
+- `STICKERS`
+- `GAMES`
+- `LIFESTYLE`
+- `MEDICAL`
+- `MAGAZINES_AND_NEWSPAPERS`
+- `UTILITIES`
+- `SHOPPING`
+- `PRODUCTIVITY`
+- `NEWS`
+- `PHOTO_AND_VIDEO`
+- `NAVIGATION`
 
 ### Available Game Subcategories
 
@@ -551,54 +542,40 @@ You can always prefix the category using `MZGenre.` (e.g. `MZGenre.Book`). _deli
 - `MZGenre.Trivia`
 - `MZGenre.Word`
 
-### Available Magazines & Newspapers Subcategories
-
-- `MZGenre.Apps.Arts_Photography`
-- `MZGenre.Apps.Automotive`
-- `MZGenre.Apps.Brides_Weddings`
-- `MZGenre.Apps.Business_Investing`
-- `MZGenre.Apps.Childrens_Magazines`
-- `MZGenre.Apps.Computers_Internet`
-- `MZGenre.Apps.Cooking_Food_Drink`
-- `MZGenre.Apps.Crafts_Hobbies`
-- `MZGenre.Apps.Electronics_Audio`
-- `MZGenre.Apps.Entertainment`
-- `MZGenre.Apps.Fashion_Style`
-- `MZGenre.Apps.Health_Mind_Body`
-- `MZGenre.Apps.History`
-- `MZGenre.Apps.Home_Garden`
-- `MZGenre.Apps.Literary_Magazines_Journals`
-- `MZGenre.Apps.Mens_Interest`
-- `MZGenre.Apps.Movies_Music`
-- `MZGenre.Apps.News_Politics`
-- `MZGenre.Apps.Outdoors_Nature`
-- `MZGenre.Apps.Parenting_Family`
-- `MZGenre.Apps.Pets`
-- `MZGenre.Apps.Professional_Trade`
-- `MZGenre.Apps.Regional_News`
-- `MZGenre.Apps.Science`
-- `MZGenre.Apps.Sports_Leisure`
-- `MZGenre.Apps.Teens`
-- `MZGenre.Apps.Travel_Regional`
-- `MZGenre.Apps.Womens_Interest`
+- `GAMES_SPORTS`
+- `GAMES_WORD`
+- `GAMES_MUSIC`
+- `GAMES_ADVENTURE`
+- `GAMES_ACTION`
+- `GAMES_ROLE_PLAYING`
+- `GAMES_CASUAL`
+- `GAMES_BOARD`
+- `GAMES_TRIVIA`
+- `GAMES_CARD`
+- `GAMES_PUZZLE`
+- `GAMES_CASINO`
+- `GAMES_STRATEGY`
+- `GAMES_SIMULATION`
+- `GAMES_RACING`
+- `GAMES_FAMILY`
 
 ### Available Stickers Subcategories
 
-- `MZGenre.Apps.Stickers.Animals`
-- `MZGenre.Apps.Stickers.Art`
-- `MZGenre.Apps.Stickers.BirthdaysAndCelebrations`
-- `MZGenre.Apps.Stickers.Celebrities`
-- `MZGenre.Apps.Stickers.Characters`
-- `MZGenre.Apps.Stickers.FoodAndDrink`
-- `MZGenre.Apps.Stickers.Emotions`
-- `MZGenre.Apps.Stickers.Fashion`
-- `MZGenre.Apps.Stickers.Games`
-- `MZGenre.Apps.Stickers.KidsAndFamily`
-- `MZGenre.Apps.Stickers.MoviesAndTV`
-- `MZGenre.Apps.Stickers.Music`
-- `MZGenre.Apps.Stickers.People`
-- `MZGenre.Apps.Stickers.Places`
-- `MZGenre.Apps.Stickers.Sports`
+- `STICKERS_PLACES_AND_OBJECTS`
+- `STICKERS_EMOJI_AND_EXPRESSIONS`
+- `STICKERS_CELEBRATIONS`
+- `STICKERS_CELEBRITIES`
+- `STICKERS_MOVIES_AND_TV`
+- `STICKERS_SPORTS_AND_ACTIVITIES`
+- `STICKERS_EATING_AND_DRINKING`
+- `STICKERS_CHARACTERS`
+- `STICKERS_ANIMALS`
+- `STICKERS_FASHION`
+- `STICKERS_ART`
+- `STICKERS_GAMING`
+- `STICKERS_KIDS_AND_FAMILY`
+- `STICKERS_PEOPLE`
+- `STICKERS_MUSIC`
 
 ### Available age rating groups
 
@@ -610,26 +587,30 @@ You can always prefix the category using `MZGenre.` (e.g. `MZGenre.Book`). _deli
 - 1: Infrequent/Mild
 - 2: Frequent/Intense
 
+- `NONE`
+- `INFREQUENT_OR_MILD`
+- `FREQUENT_OR_INTENSE`
+
 **Keys**
 
-- `CARTOON_FANTASY_VIOLENCE`
-- `REALISTIC_VIOLENCE`
-- `PROLONGED_GRAPHIC_SADISTIC_REALISTIC_VIOLENCE`
-- `PROFANITY_CRUDE_HUMOR`
-- `MATURE_SUGGESTIVE`
-- `HORROR`
-- `MEDICAL_TREATMENT_INFO`
-- `ALCOHOL_TOBACCO_DRUGS`
-- `GAMBLING`
-- `SEXUAL_CONTENT_NUDITY`
-- `GRAPHIC_SEXUAL_CONTENT_NUDITY`
+- `violenceCartoonOrFantasy`
+- `violenceRealistic`
+- `violenceRealisticProlongedGraphicOrSadistic`
+- `profanityOrCrudeHumor`
+- `matureOrSuggestiveThemes`
+- `horrorOrFearThemes`
+- `medicalOrTreatmentInformation`
+- `alcoholTobaccoOrDrugUseOrReferences`
+- `gamblingSimulated`
+- `sexualContentOrNudity`
+- `sexualContentGraphicAndNudity`
 
 #### Boolean
 
 **Keys**
 
-- `UNRESTRICTED_WEB_ACCESS`
-- `GAMBLING_CONTESTS`
+- `unrestrictedWebAccess`
+- `gamblingAndContests`
 </details>
 
 <br />