Update step.yml (#298)

* Update step.yml

* Update README.md

* Pull latest go-xcode/v2

* Update step.yml

Author: godrei

README.md

@@ -110,9 +110,9 @@ Build a development IPA with custom xcconfig file path:
 | `scheme` | Xcode Scheme name.  The input value sets xcodebuild's `-scheme` option. | required | `$BITRISE_SCHEME` |
 | `distribution_method` | Describes how Xcode should export the archive. | required | `development` |
 | `configuration` | Xcode Build Configuration.  If not specified, the default Build Configuration will be used.  The input value sets xcodebuild's `-configuration` option. |  |  |
-| `xcconfig_content` | Build settings to override the project's build settings, using xcodebuild's `-xcconfig` option.  If empty, no setting is changed. This is required when the `-xcconfig` additional option is used.  When set it can be either: 1.  Existing `.xcconfig` file path.      Example:      `./ios-sample/ios-sample/Configurations/Dev.xcconfig`  2.  The contents of a newly created temporary `.xcconfig` file. (This is the default.)      Build settings must be separated by newline character (`\n`).      Example:     ```     COMPILER_INDEX_STORE_ENABLE = NO     ONLY_ACTIVE_ARCH[config=Debug][sdk=*][arch=*] = YES     ``` |  | `COMPILER_INDEX_STORE_ENABLE = NO` |
+| `xcconfig_content` | Build settings to override the project's build settings, using xcodebuild's `-xcconfig` option.  You can't define `-xcconfig` option in `Additional options for the xcodebuild command` if this input is set.  If empty, no setting is changed. When set it can be either: 1.  Existing `.xcconfig` file path.      Example:      `./ios-sample/ios-sample/Configurations/Dev.xcconfig`  2.  The contents of a newly created temporary `.xcconfig` file. (This is the default.)      Build settings must be separated by newline character (`\n`).      Example:     ```     COMPILER_INDEX_STORE_ENABLE = NO     ONLY_ACTIVE_ARCH[config=Debug][sdk=*][arch=*] = YES     ``` |  | `COMPILER_INDEX_STORE_ENABLE = NO` |
 | `perform_clean_action` | If this input is set, `clean` xcodebuild action will be performed besides the `archive` action. | required | `no` |
-| `xcodebuild_options` | Additional options to be added to the executed xcodebuild command. |  |  |
+| `xcodebuild_options` | Additional options to be added to the executed xcodebuild command.  Prefer using `Build settings (xcconfig)` input for specifying `-xcconfig` option. You can't use both.  `-destination` is set automatically, unless specified explicitely. |  |  |
 | `log_formatter` | Defines how `xcodebuild` command's log is formatted.  Available options:  - `xcpretty`: The xcodebuild command's output will be prettified by xcpretty. - `xcodebuild`: Only the last 20 lines of raw xcodebuild output will be visible in the build log.  The raw xcodebuild log will be exported in both cases. | required | `xcpretty` |
 | `automatic_code_signing` | This input determines which Bitrise Apple service connection should be used for automatic code signing.  Available values: - `off`: Do not do any auto code signing. - `api-key`: [Bitrise Apple Service connection with API Key](https://devcenter.bitrise.io/getting-started/connecting-to-services/setting-up-connection-to-an-apple-service-with-api-key/). - `apple-id`: [Bitrise Apple Service connection with Apple ID](https://devcenter.bitrise.io/getting-started/connecting-to-services/connecting-to-an-apple-service-with-apple-id/). | required | `off` |
 | `register_test_devices` | If this input is set, the Step will register the known test devices on Bitrise from team members with the Apple Developer Portal.  Note that setting this to yes may cause devices to be registered against your limited quantity of test devices in the Apple Developer Portal, which can only be removed once annually during your renewal window. | required | `no` |

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/bitrise-io/go-utils v1.0.2
 	github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.7
 	github.com/bitrise-io/go-xcode v1.0.8
-	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.16
+	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.17
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/stretchr/testify v1.7.1
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect

go.sum

@@ -14,8 +14,8 @@ github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.7/go.mod h1:6i0Gt0JRIbXpsrFDJT1YW
 github.com/bitrise-io/go-xcode v1.0.6/go.mod h1:Y0Wu2dXm0MilJ/4D3+gPHaNMlUcP+1DjIPoLPykq7wY=
 github.com/bitrise-io/go-xcode v1.0.8 h1:fNB5TmbfsqWRh5ibtKdFdxPEua8gaNBmDt1rPM/GDuo=
 github.com/bitrise-io/go-xcode v1.0.8/go.mod h1:Y0Wu2dXm0MilJ/4D3+gPHaNMlUcP+1DjIPoLPykq7wY=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.16 h1:tJGx3Ly0UclO1oDEiW1W+DYL9UQQwPJ11sgJ/Z917rw=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.16/go.mod h1:oYILBt4j8jn69avylknuqsUO/BSiRx9i+JaxcNOtWMA=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.17 h1:aLlblow6vgnFKBRJRPz03O/M6x6LYY57wDkRCh66XL0=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.17/go.mod h1:oYILBt4j8jn69avylknuqsUO/BSiRx9i+JaxcNOtWMA=
 github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8 h1:kmvU8AxrNTxXsVPKepBHD8W+eCVmeaKyTkRuUJB2K38=
 github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

main.go

@@ -207,6 +207,7 @@ type XcodeArchiveStep struct {
 	stepInputParser      stepconf.InputParser
 	pathProvider         pathutil.PathProvider
 	pathChecker          pathutil.PathChecker
+	pathModifier         pathutil.PathModifier
 	fileManager          fileutil.FileManager
 }
 
@@ -217,6 +218,7 @@ func NewXcodeArchiveStep() XcodeArchiveStep {
 		stepInputParser:      stepconf.NewInputParser(env.NewRepository()),
 		pathProvider:         pathutil.NewPathProvider(),
 		pathChecker:          pathutil.NewPathChecker(),
+		pathModifier:         pathutil.NewPathModifier(),
 		fileManager:          fileutil.NewFileManager(),
 	}
 }
@@ -526,7 +528,7 @@ func (s XcodeArchiveStep) xcodeArchive(opts xcodeArchiveOpts) (xcodeArchiveOutpu
 	}
 
 	if opts.XcconfigContent != "" {
-		xcconfigWriter := xcconfig.NewWriter(s.pathProvider, s.fileManager, s.pathChecker)
+		xcconfigWriter := xcconfig.NewWriter(s.pathProvider, s.fileManager, s.pathChecker, s.pathModifier)
 		xcconfigPath, err := xcconfigWriter.Write(opts.XcconfigContent)
 		if err != nil {
 			return out, fmt.Errorf("failed to write xcconfig file contents: %w", err)

step.yml

@@ -120,13 +120,13 @@ inputs:
   opts:
     category: xcodebuild configuration
     title: Build settings (xcconfig)
-    summary: Build settings to override the project's build settings. Can be the contents, file path or empty.
+    summary: Build settings to override the project's build settings, using xcodebuild's `-xcconfig` option.
     description: |-
       Build settings to override the project's build settings, using xcodebuild's `-xcconfig` option.
 
-      If empty, no setting is changed. This is required when the `-xcconfig` additional option is used.
+      You can't define `-xcconfig` option in `Additional options for the xcodebuild command` if this input is set.
 
-      When set it can be either:
+      If empty, no setting is changed. When set it can be either:
       1.  Existing `.xcconfig` file path.
 
           Example:
@@ -157,11 +157,11 @@ inputs:
   opts:
     category: xcodebuild configuration
     title: Additional options for the xcodebuild command
-    description: Additional options to be added to the executed xcodebuild command.
-    summary: |-
+    summary: Additional options to be added to the executed xcodebuild command.
+    description: |-
       Additional options to be added to the executed xcodebuild command.
 
-      When setting the `-xcconfig` option, makes sure to clear the "Build settings (xcconfig)" input, as can not specify both.
+      Prefer using `Build settings (xcconfig)` input for specifying `-xcconfig` option. You can't use both.
 
       `-destination` is set automatically, unless specified explicitely.
 

vendor/github.com/bitrise-io/go-xcode/v2/xcconfig/xcconfig.go

@@ -54,7 +54,7 @@ github.com/bitrise-io/go-xcode/xcodeproject/xcodeproj
 github.com/bitrise-io/go-xcode/xcodeproject/xcscheme
 github.com/bitrise-io/go-xcode/xcodeproject/xcworkspace
 github.com/bitrise-io/go-xcode/xcpretty
-# github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.16
+# github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.17
 ## explicit
 github.com/bitrise-io/go-xcode/v2/autocodesign
 github.com/bitrise-io/go-xcode/v2/autocodesign/certdownloader