fastlane-plugin-create_simulator_devices 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bf78a070d8cc87783033a6d6dfb1c778a2cacc388cf0e5f691308955e94f848
-  data.tar.gz: 1a4fae00d92ff2e0c1f2a15a3f0804cb519fc9e2cedafa98e183ab0da6d39b74
+  metadata.gz: 97e225aefb5c19c442c8b1d91dc978988ae18112c67101675410f3c4619f1890
+  data.tar.gz: d6a331652a7dbd2eee226f7b82a7096ce1abb875bbfb0f5cc87e8a81bce94f42
 SHA512:
-  metadata.gz: b47dc812e54c36acd0a95131838b5f45b0ab2fc9422965c961b4002acfdaf275ac9e1a870336a778043908cb62da3e6656ae3feb29c657bee6b80200dc320a24
-  data.tar.gz: e21033bc755e645677f98e54ddb553cafbaf674ac01e6d34bd07dce967b17a2f1c5459c0928d0edf06de002abae337940e122bff507c63850a85101d749d2771
+  metadata.gz: aeebdd926046ca88b8614e02f2f3dc6b4f24a724fe1cccdc7f2ac412ef3528ca4b113d07c5eedc35af063be5b256b36ce42267c4bfe3d3280189729a1b837625
+  data.tar.gz: 8528b9428574f4ba9f8d31d9878d3d825bf7374095e79d8413269fc7d889aecb2f5d33561a8bb3ac0a2316f1d94e3045b0261e8af525fb5e1d1dfe23b88fb53d

data/lib/fastlane/plugin/create_simulator_devices/actions/create_simulator_devices_action.rb

@@ -22,7 +22,7 @@ module Fastlane
         required_devices = params[:devices]
         UI.user_error!('No devices specified') if required_devices.nil? || required_devices.empty?
 
-        shell_helper = CreateSimulatorDevices::ShellHelper.new(print_command: params[:print_command], print_command_output: params[:print_command_output], action_context: self)
+        shell_helper = CreateSimulatorDevices::ShellHelper.new(verbose: verbose, print_command: params[:print_command], print_command_output: params[:print_command_output], action_context: self)
         runtime_helper = CreateSimulatorDevices::RuntimeHelper.new(cache_dir: params[:cache_dir], shell_helper: shell_helper, verbose: verbose)
 
         runner = CreateSimulatorDevices::Runner.new(
@@ -32,7 +32,8 @@ module Fastlane
           can_rename_devices: params[:rename_devices],
           can_delete_duplicate_devices: params[:delete_duplicate_devices],
           device_naming_style: params[:device_naming_style].to_sym,
-          remove_cached_runtimes: params[:remove_cached_runtimes]
+          remove_cached_runtimes: params[:remove_cached_runtimes],
+          update_dyld_shared_cache: params[:update_dyld_shared_cache]
         )
 
         runner.run(required_devices)
@@ -113,7 +114,13 @@ module Fastlane
                                          description: 'Remove cached runtimes after successful installation',
                                          type: Boolean,
                                          optional: true,
-                                         default_value: true)
+                                         default_value: true),
+          ::FastlaneCore::ConfigItem.new(key: :update_dyld_shared_cache,
+                                         env_name: 'CREATE_SIMULATOR_DEVICES_UPDATE_DYLD_SHARED_CACHE',
+                                         description: 'Update dyld shared cache',
+                                         type: Boolean,
+                                         optional: true,
+                                         default_value: false)
         ]
       end
 

data/lib/fastlane/plugin/create_simulator_devices/actions/gather_simctl_diagnose_action.rb

@@ -24,7 +24,7 @@ module Fastlane
         required_devices = params[:devices]
         UI.user_error!('No devices specified') if required_devices.nil? || required_devices.empty?
 
-        shell_helper = CreateSimulatorDevices::ShellHelper.new(print_command: params[:print_command], print_command_output: params[:print_command_output], action_context: self)
+        shell_helper = CreateSimulatorDevices::ShellHelper.new(verbose: verbose, print_command: params[:print_command], print_command_output: params[:print_command_output], action_context: self)
         runtime_helper = CreateSimulatorDevices::RuntimeHelper.new(cache_dir: nil, shell_helper: shell_helper, verbose: verbose)
 
         create_simulator_devices_runner = ::Fastlane::CreateSimulatorDevices::Runner.new(

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/apple_build_version.rb

@@ -62,15 +62,15 @@ module Fastlane
       end
 
       def major
-        @build_version.match(/^([0-9]+)([A-Z][0-9]{2,3})([0-9]+)/)[1]
+        @build_version.match(/^([0-9]+)([A-Z])([0-9]+)/)[1]
       end
 
       def minor
-        @build_version.match(/^([0-9]+)([A-Z][0-9]{2,3})([0-9]+)/)[2]
+        @build_version.match(/^([0-9]+)([A-Z])([0-9]+)/)[2]
       end
 
       def patch
-        @build_version.match(/^([0-9]+)([A-Z][0-9]{2,3})([0-9]+)/)[3]
+        @build_version.match(/^([0-9]+)([A-Z])([0-9]+)/)[3]
       end
 
       def <(other)

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/matched_runtime.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'runtime_supported_device_type'
+require_relative '../apple_build_version'
+
+module Fastlane
+  module CreateSimulatorDevices
+    module SimCTL
+      # Represents a matched runtime from `xcrun simctl runtime match list --json` output.
+      class MatchedRuntime
+        attr_accessor :identifier, :default_build, :chosen_runtime_build, :sdk_build, :sdk_version, :platform
+
+        def initialize(identifier:, default_build:, chosen_runtime_build:, sdk_build:, sdk_version:, platform:) # rubocop:disable Metrics/ParameterLists
+          self.identifier = identifier
+          self.default_build = default_build
+          self.chosen_runtime_build = chosen_runtime_build
+          self.sdk_build = sdk_build
+          self.sdk_version = sdk_version
+          self.platform = platform
+        end
+
+        def self.from_hash(hash, identifier:)
+          new(
+            identifier: identifier.to_s,
+            default_build: AppleBuildVersion.new(hash[:defaultBuild]),
+            chosen_runtime_build: AppleBuildVersion.new(hash[:chosenRuntimeBuild]),
+            sdk_build: AppleBuildVersion.new(hash[:sdkBuild]),
+            sdk_version: Gem::Version.new(hash[:sdkVersion]),
+            platform: hash[:platform].to_s
+          )
+        end
+      end
+    end
+  end
+end
+
+# Example of a Runtime object from `xcrun simctl list runtimes --json` output:
+#
+# {"iphoneos26.1" : {
+#   "chosenRuntimeBuild" : "23B80",
+#   "defaultBuild" : "23B77",
+#   "platform" : "com.apple.platform.iphoneos",
+#   "sdkBuild" : "23B77",
+#   "sdkDirectory" : "\/Applications\/Xcode-26.1.1.app\/Contents\/Developer\/Platforms\/iPhoneOS.platform\/Developer\/SDKs\/iPhoneOS26.1.sdk",
+#   "sdkVersion" : "26.1"
+# }

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models.rb

@@ -9,6 +9,7 @@ require_relative 'models/required_device'
 require_relative 'models/required_runtime'
 require_relative 'models/apple_build_version'
 require_relative 'models/device_naming_style'
+require_relative 'models/simctl/matched_runtime'
 require 'fastlane'
 
 module Fastlane

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/runner.rb

@@ -9,12 +9,12 @@ module Fastlane
   # Create simulator devices.
   module CreateSimulatorDevices
     # Does all the work to create simulator devices.
-    class Runner # rubocop:disable Metrics/ClassLength
+    class Runner
       UI = ::Fastlane::UI unless defined?(UI)
 
-      attr_accessor :shell_helper, :verbose, :runtime_helper, :can_rename_devices, :can_delete_duplicate_devices, :device_naming_style, :remove_cached_runtimes
+      attr_accessor :shell_helper, :verbose, :runtime_helper, :can_rename_devices, :can_delete_duplicate_devices, :device_naming_style, :remove_cached_runtimes, :update_dyld_shared_cache
 
-      def initialize(runtime_helper:, shell_helper:, verbose:, can_rename_devices:, can_delete_duplicate_devices:, device_naming_style:, remove_cached_runtimes:) # rubocop:disable Metrics/ParameterLists
+      def initialize(runtime_helper:, shell_helper:, verbose:, can_rename_devices:, can_delete_duplicate_devices:, device_naming_style:, remove_cached_runtimes:, update_dyld_shared_cache:) # rubocop:disable Metrics/ParameterLists
         self.shell_helper = shell_helper
         self.verbose = verbose
         self.runtime_helper = runtime_helper
@@ -22,6 +22,7 @@ module Fastlane
         self.can_delete_duplicate_devices = can_delete_duplicate_devices
         self.device_naming_style = device_naming_style
         self.remove_cached_runtimes = remove_cached_runtimes
+        self.update_dyld_shared_cache = update_dyld_shared_cache
       end
 
       def run(devices)
@@ -55,6 +56,11 @@ module Fastlane
 
         log_matched_devices(matched_devices: matched_devices)
 
+        if update_dyld_shared_cache
+          UI.message('Updating dyld shared cache...')
+          shell_helper.update_dyld_shared_cache
+        end
+
         matched_devices_names = matched_devices.map { |matched_device| returning_device_name_for_required_device(matched_device) }
         UI.message("Available simulator devices: #{matched_devices_names.join(', ')}")
 

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/runtime_helper.rb

@@ -25,6 +25,13 @@ module Fastlane
         'xrsimulator' => 'xrOS'
       }.freeze
 
+      OS_NAME_TO_MATCHED_RUNTIME_IDENTIFIER = {
+        'iOS' => 'iphoneos',
+        'tvOS' => 'appletvos',
+        'watchOS' => 'watchos',
+        'xrOS' => 'xros'
+      }.freeze
+
       def delete_unusable_runtimes
         deletable_runtimes = shell_helper.installed_runtimes_with_state
           .select { |runtime| runtime.unusable? && runtime.deletable? }
@@ -153,6 +160,16 @@ module Fastlane
         AppleBuildVersion.new(build_version)
       end
 
+      def matched_runtime_for_missing_runtime(missing_runtime)
+        matched_runtimes = shell_helper.simctl_matched_runtimes(force: true)
+
+        matched_runtime_identifier = "#{OS_NAME_TO_MATCHED_RUNTIME_IDENTIFIER[missing_runtime.os_name]}#{missing_runtime.product_version}"
+
+        matched_runtimes = matched_runtimes.select { |matched_runtime| matched_runtime.identifier == matched_runtime_identifier && matched_runtime.sdk_build == missing_runtime.product_build_version }
+
+        matched_runtimes.max_by(&:chosen_runtime_build)
+      end
+
       def cached_runtime_file(missing_runtime)
         FileUtils.mkdir_p(cache_dir)
 
@@ -164,10 +181,10 @@ module Fastlane
         # E.g. Xcode 26.0 Beta 3 has iOS 26.0 (23A5287e) SDK, but
         # xcodebuild downloads iphonesimulator_26.0_23A5287g.dmg as latest.
         product_build_version = missing_runtime.product_build_version
+
         if product_build_version
           runtime_dmg_search_pattern += product_build_version.major.to_s
           runtime_dmg_search_pattern += product_build_version.minor.to_s
-          runtime_dmg_search_pattern += product_build_version.patch.to_s
         end
         runtime_dmg_search_pattern += '*.dmg'
 
@@ -177,9 +194,17 @@ module Fastlane
           UI.message("Available files with pattern: #{Dir.glob(runtime_dmg_search_pattern)}")
         end
 
-        runtime_file = Dir
+        runtime_file = nil
+        runtime_files = Dir
           .glob(runtime_dmg_search_pattern)
-          .max_by { |filename| runtime_build_version_for_filename(filename) }
+
+        return nil if runtime_files.empty?
+
+        matched_runtime = matched_runtime_for_missing_runtime(missing_runtime)
+
+        runtime_file = runtime_files.detect { |filename| filename.end_with?("_#{matched_runtime.chosen_runtime_build}.dmg") } unless matched_runtime.nil?
+
+        runtime_file ||= runtime_files.max_by { |filename| runtime_build_version_for_filename(filename) }
 
         return nil if runtime_file.nil?
 

data/lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/shell_helper.rb

@@ -11,9 +11,10 @@ module Fastlane
       UI = ::Fastlane::UI unless defined?(UI)
 
       # Proprty verbose
-      attr_accessor :print_command, :print_command_output, :action_context
+      attr_accessor :verbose, :print_command, :print_command_output, :action_context
 
-      def initialize(print_command: false, print_command_output: false, action_context: nil)
+      def initialize(verbose: false, print_command: false, print_command_output: false, action_context: nil)
+        self.verbose = verbose
         self.print_command = print_command
         self.print_command_output = print_command_output
         self.action_context = action_context
@@ -103,6 +104,17 @@ module Fastlane
         @simctl_runtimes
       end
 
+      def simctl_matched_runtimes(force: false)
+        return @simctl_matched_runtimes unless force || @simctl_matched_runtimes.nil?
+
+        UI.message('Fetching matched runtimes...')
+        json = sh(command: 'xcrun simctl runtime match list --json')
+
+        @simctl_matched_runtimes = JSON
+          .parse(json, symbolize_names: true)
+          .map { |identifier, runtime| SimCTL::MatchedRuntime.from_hash(runtime, identifier: identifier) }
+      end
+
       def installed_runtimes_with_state
         UI.message('Fetching runtimes with state...')
         json = sh(command: 'xcrun simctl runtime list --json')
@@ -141,8 +153,6 @@ module Fastlane
       end
 
       def download_runtime(missing_runtime, cache_dir)
-        UI.message("Downloading #{missing_runtime.runtime_name} to #{cache_dir}. This may take a while...")
-
         command = [
           'xcrun',
           'xcodebuild',
@@ -162,6 +172,30 @@ module Fastlane
           command << missing_runtime.product_version.to_s.shellescape
         end
 
+        simulator_architecture_variant = 'universal'
+
+        if Fastlane::Helper.xcode_at_least?('26') && missing_runtime.product_version >= '26'
+          xcode_binary_path = File.join(Fastlane::Helper.xcode_path, '..', 'MacOS', 'Xcode')
+          xcode_binary_path = File.expand_path(xcode_binary_path)
+
+          UI.message('Getting Xcode architecture variants with lipo...') if verbose
+
+          xcode_architecture_variants = sh(command: "lipo -archs #{xcode_binary_path.shellescape}", print_command: print_command, print_command_output: print_command_output).split
+
+          UI.message("Xcode architecture variants: #{xcode_architecture_variants}") if verbose
+
+          simulator_architecture_variant = if xcode_architecture_variants.include?('x86_64')
+                                             'universal'
+                                           else
+                                             'arm64'
+                                           end
+
+          command << '-architectureVariant'
+          command << simulator_architecture_variant.shellescape
+        end
+
+        UI.message("Downloading #{missing_runtime.runtime_name} (arch: #{simulator_architecture_variant}) to #{cache_dir}. This may take a while...")
+
         sh(command: command.join(' '), print_command: true, print_command_output: true)
       end
 
@@ -175,6 +209,12 @@ module Fastlane
         end
       end
 
+      def update_dyld_shared_cache
+        sh(
+          command: 'xcrun simctl runtime dyld_shared_cache update --all'
+        )
+      end
+
       def device_info_by_udid(udid)
         sh(
           command: "xcrun simctl list devices --json | jq '.devices | to_entries[].value[] | select(.udid==\"#{udid.shellescape}\")'",

data/lib/fastlane/plugin/create_simulator_devices/version.rb

@@ -2,6 +2,6 @@
 
 module Fastlane
   module CreateSimulatorDevices
-    VERSION = '0.0.17'
+    VERSION = '0.0.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-create_simulator_devices
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Vitalii Budnik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-04 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies: []
 description:
 email: developers@setapp.com
@@ -28,6 +28,7 @@ files:
 - lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/required_runtime.rb
 - lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/device.rb
 - lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/device_type.rb
+- lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/matched_runtime.rb
 - lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/runtime.rb
 - lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/simctl/runtime_supported_device_type.rb
 - lib/fastlane/plugin/create_simulator_devices/helpers/create_simulator_devices/models/xcodebuild/sdk.rb