gym/lib/gym/module.rb in fastlane-2.216.0 vs gym/lib/gym/module.rb in fastlane-2.217.0
- old
+ new
@@ -25,12 +25,12 @@
require 'gym/xcodebuild_fixes/generic_archive_fix'
end
def building_for_ios?
if Gym.project.mac?
- # Can be building for iOS if mac project and catalyst
- return building_mac_catalyst_for_ios?
+ # Can be building for iOS if mac project and catalyst or multiplatform and set to iOS
+ return building_mac_catalyst_for_ios? || building_multiplatform_for_ios?
else
# Can be iOS project and build for mac if catalyst
return false if building_mac_catalyst_for_mac?
# Can be iOS project if iOS, tvOS, or watchOS
@@ -41,19 +41,30 @@
def building_for_mac?
if Gym.project.supports_mac_catalyst?
# Can be a mac project and not build mac if catalyst
return building_mac_catalyst_for_mac?
else
+ # Can be mac project but multiplatform and building for iOS
+ return false if building_multiplatform_for_ios?
+
return Gym.project.mac?
end
end
def building_mac_catalyst_for_ios?
Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "ios"
end
def building_mac_catalyst_for_mac?
Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "macos"
+ end
+
+ def building_multiplatform_for_ios?
+ Gym.project.multiplatform? && Gym.project.ios? && (Gym.config[:sdk] == "iphoneos" || Gym.config[:sdk] == "iphonesimulator")
+ end
+
+ def building_multiplatform_for_mac?
+ Gym.project.multiplatform? && Gym.project.mac? && Gym.config[:sdk] == "macosx"
end
def export_destination_upload?
config_path = Gym.cache[:config_path]
return false if config_path.nil?