Skip to content

Commit 6ad5c53

Browse files
authored
Pass additional options to showBuildSettings (#357)
1 parent f0f967c commit 6ad5c53

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

step/platform.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ func BuildableTargetPlatform(
6767
xcodeProj *xcodeproj.XcodeProj,
6868
scheme *xcscheme.Scheme,
6969
configurationName string,
70+
additionalOptions []string,
7071
provider TargetBuildSettingsProvider,
7172
logger log.Logger,
7273
) (Platform, error) {
@@ -82,7 +83,7 @@ func BuildableTargetPlatform(
8283
return "", fmt.Errorf("target not found: %s", archiveEntry.BuildableReference.BlueprintIdentifier)
8384
}
8485

85-
settings, err := provider.TargetBuildSettings(xcodeProj, mainTarget.Name, configurationName)
86+
settings, err := provider.TargetBuildSettings(xcodeProj, mainTarget.Name, configurationName, additionalOptions...)
8687
if err != nil {
8788
return "", fmt.Errorf("failed to get target (%s) build settings: %s", mainTarget.Name, err)
8889
}

step/platform_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestBuildableTargetPlatform(t *testing.T) {
9898
On("TargetBuildSettings", mock.AnythingOfType("*xcodeproj.XcodeProj"), mock.AnythingOfType("string"), mock.AnythingOfType("string")).
9999
Return(tt.settings, nil)
100100

101-
got, err := BuildableTargetPlatform(tt.xcodeProj, tt.scheme, tt.configurationName, provider, log.NewLogger())
101+
got, err := BuildableTargetPlatform(tt.xcodeProj, tt.scheme, tt.configurationName, []string{}, provider, log.NewLogger())
102102
if (err != nil) != tt.wantErr {
103103
t.Errorf("BuildableTargetPlatform() error = %v, wantErr %v", err, tt.wantErr)
104104
return

step/step.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ func (s XcodebuildArchiver) xcodeArchive(opts xcodeArchiveOpts) (xcodeArchiveRes
805805

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

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

0 commit comments

Comments
 (0)