Skip to content

Commit 6ce168c

Browse files
committed
Revert "Revert passing additional options"
This reverts commit 7531c80.
1 parent fcd9b96 commit 6ce168c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

step/step.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -826,12 +826,7 @@ func (s XcodebuildArchiver) xcodeArchive(opts xcodeArchiveOpts) (xcodeArchiveRes
826826

827827
s.logger.TInfof("Reading xcode project")
828828

829-
// When Package.resolved is embedded in the workspace, passing additional options can cause failure ("-onlyUsePackageVersionsFromResolvedFile" "-skipMacroValidation" "-skipPackagePluginValidation")
830-
// a resolved file is required when automatic dependency resolution is disabled and should be placed at /git/sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved.
831-
// An alternative to passing "-onlyUsePackageVersionsFromResolvedFile" or "-disableAutomaticPackageResolution" is to set the following defaults in a Script Step:
832-
// defaults write com.apple.dt.Xcode IDEPackageOnlyUseVersionsFromResolvedFile
833-
// defaults write com.apple.dt.Xcode IDEDisableAutomaticPackageResolution
834-
platform, err := BuildableTargetPlatform(xcodeProj, scheme, configuration, []string{}, XcodeBuild{}, s.logger)
829+
platform, err := BuildableTargetPlatform(xcodeProj, scheme, configuration, opts.AdditionalOptions, XcodeBuild{}, s.logger)
835830
if err != nil {
836831
return out, fmt.Errorf("failed to read project platform: %s: %s", opts.ProjectPath, err)
837832
}

0 commit comments

Comments
 (0)