Remove cache_level input (#51)

Author: ofalvai

README.md

@@ -64,7 +64,6 @@ You can also run this step directly with [Bitrise CLI](https://github.com/bitris
 | `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. |  |  |
 | `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 all cases. | required | `xcpretty` |
 | `output_dir` | This directory will contain the generated artifacts. | required | `$BITRISE_DEPLOY_DIR` |
-| `cache_level` | Defines what cache content should be automatically collected.  Available options:  - `none`: Disable collecting cache content - `swift_packages`: Collect Swift PM packages added to the Xcode project | required | `swift_packages` |
 | `verbose_log` | If this input is set, the Step will print additional logs for debugging. | required | `no` |
 </details>
 

build.go

@@ -5,30 +5,14 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"strings"
 
 	"github.com/bitrise-io/go-utils/colorstring"
 	"github.com/bitrise-io/go-utils/command"
-	"github.com/bitrise-io/go-utils/log"
 	"github.com/bitrise-io/go-xcode/xcodebuild"
-	cache "github.com/bitrise-io/go-xcode/xcodecache"
 	"github.com/bitrise-io/go-xcode/xcpretty"
 	"github.com/bitrise-steplib/steps-xcode-build-for-simulator/util"
 )
 
-func runCommandWithRetry(cmd *xcodebuild.CommandBuilder, useXcpretty bool, swiftPackagesPath string) (string, error) {
-	output, err := runCommand(cmd, useXcpretty)
-	if err != nil && swiftPackagesPath != "" && strings.Contains(output, cache.SwiftPackagesStateInvalid) {
-		log.Warnf("Build failed, swift packages cache is in an invalid state, error: %s", err)
-		log.RWarnf("xcode-build-for-simulator", "swift-packages-cache-invalid", nil, "swift packages cache is in an invalid state")
-		if err := os.RemoveAll(swiftPackagesPath); err != nil {
-			return output, fmt.Errorf("failed to remove invalid Swift package caches, error: %s", err)
-		}
-		return runCommand(cmd, useXcpretty)
-	}
-	return output, err
-}
-
 func prepareCommand(xcodeCmd *xcodebuild.CommandBuilder, useXcpretty bool, output *bytes.Buffer) (*command.Model, *xcpretty.CommandModel) {
 	if useXcpretty {
 		return nil, xcpretty.New(*xcodeCmd)

step.go

@@ -20,7 +20,6 @@ import (
 	"github.com/bitrise-io/go-utils/ziputil"
 	"github.com/bitrise-io/go-xcode/v2/xcconfig"
 	"github.com/bitrise-io/go-xcode/xcodebuild"
-	cache "github.com/bitrise-io/go-xcode/xcodecache"
 	"github.com/bitrise-io/go-xcode/xcpretty"
 	"github.com/kballard/go-shellquote"
 
@@ -49,9 +48,6 @@ type Config struct {
 	// Output export
 	OutputDir string `env:"output_dir,required"`
 
-	// Caching
-	CacheLevel string `env:"cache_level,opt[none,swift_packages]"`
-
 	// Debugging
 	VerboseLog bool `env:"verbose_log,required"`
 }
@@ -125,8 +121,6 @@ func (b BuildForSimulatorStep) ProcessConfig() (RunOpts, error) {
 		LogFormatter:                config.LogFormatter,
 
 		OutputDir: config.OutputDir,
-
-		CacheLevel: config.CacheLevel,
 	}, nil
 }
 
@@ -253,12 +247,7 @@ func (s BuildForSimulatorStep) Run(cfg RunOpts) (ExportOptions, error) {
 			archiveCmd.SetXCConfigPath(xcconfigPath)
 		}
 
-		swiftPackagesPath, err := cache.SwiftPackagesPath(absProjectPath)
-		if err != nil {
-			return ExportOptions{}, fmt.Errorf("failed to get Swift Packages path: %s", err)
-		}
-
-		rawXcodeBuildOut, err := runCommandWithRetry(archiveCmd, cfg.LogFormatter == "xcpretty", swiftPackagesPath)
+		rawXcodeBuildOut, err := runCommand(archiveCmd, cfg.LogFormatter == "xcpretty")
 		if err != nil {
 			if cfg.LogFormatter == "xcpretty" {
 				log.Errorf("\nLast lines of the Xcode's build log:")

step.yml

@@ -179,25 +179,6 @@ inputs:
     description: This directory will contain the generated artifacts.
     is_required: true
 
-# Caching
-
-- cache_level: swift_packages
-  opts:
-    category: Caching
-    title: Enable collecting cache content
-    summary: Defines what cache content should be automatically collected.
-    description: |-
-      Defines what cache content should be automatically collected.
-
-      Available options:
-
-      - `none`: Disable collecting cache content
-      - `swift_packages`: Collect Swift PM packages added to the Xcode project
-    is_required: true
-    value_options:
-    - none
-    - swift_packages
-
 # Debugging
 
 - verbose_log: "no"