Skip to content

Commit

Permalink
Pass additional options to showBuildSettings (#357)
Browse files Browse the repository at this point in the history
  • Loading branch information
lpusok authored Sep 16, 2024
1 parent f0f967c commit 6ad5c53
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion step/platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func BuildableTargetPlatform(
xcodeProj *xcodeproj.XcodeProj,
scheme *xcscheme.Scheme,
configurationName string,
additionalOptions []string,
provider TargetBuildSettingsProvider,
logger log.Logger,
) (Platform, error) {
Expand All @@ -82,7 +83,7 @@ func BuildableTargetPlatform(
return "", fmt.Errorf("target not found: %s", archiveEntry.BuildableReference.BlueprintIdentifier)
}

settings, err := provider.TargetBuildSettings(xcodeProj, mainTarget.Name, configurationName)
settings, err := provider.TargetBuildSettings(xcodeProj, mainTarget.Name, configurationName, additionalOptions...)
if err != nil {
return "", fmt.Errorf("failed to get target (%s) build settings: %s", mainTarget.Name, err)
}
Expand Down
2 changes: 1 addition & 1 deletion step/platform_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func TestBuildableTargetPlatform(t *testing.T) {
On("TargetBuildSettings", mock.AnythingOfType("*xcodeproj.XcodeProj"), mock.AnythingOfType("string"), mock.AnythingOfType("string")).
Return(tt.settings, nil)

got, err := BuildableTargetPlatform(tt.xcodeProj, tt.scheme, tt.configurationName, provider, log.NewLogger())
got, err := BuildableTargetPlatform(tt.xcodeProj, tt.scheme, tt.configurationName, []string{}, provider, log.NewLogger())
if (err != nil) != tt.wantErr {
t.Errorf("BuildableTargetPlatform() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down
2 changes: 1 addition & 1 deletion step/step.go
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ func (s XcodebuildArchiver) xcodeArchive(opts xcodeArchiveOpts) (xcodeArchiveRes

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

platform, err := BuildableTargetPlatform(xcodeProj, scheme, configuration, XcodeBuild{}, s.logger)
platform, err := BuildableTargetPlatform(xcodeProj, scheme, configuration, opts.AdditionalOptions, XcodeBuild{}, s.logger)
if err != nil {
return out, fmt.Errorf("failed to read project platform: %s: %s", opts.ProjectPath, err)
}
Expand Down

0 comments on commit 6ad5c53

Please sign in to comment.