Fix E2E tests, cleanups (#73)

Author: ofalvai

e2e/bitrise.yml

@@ -4,9 +4,10 @@ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
 app:
   envs:
   # Shared test configs
-  - SAMPLE_APP_URL: https://github.com/bitrise-samples/sample-apps-carthage-objc.git
+  - SAMPLE_APP_URL: https://github.com/bitrise-io/Bitrise-iOS-Carthage-Sample.git
+  - SAMPLE_APP_BRANCH: main
   - ORIG_BITRISE_SOURCE_DIR: $BITRISE_SOURCE_DIR
-  - CARTHAGE_OPTIONS: --platform ios --project-directory $BITRISE_SOURCE_DIR/_tmp
+  - CARTHAGE_OPTIONS: --platform ios --use-xcframeworks --project-directory $BITRISE_SOURCE_DIR/_tmp
   - TEST_CACHE: false
   - SKIP_RUN: false
   - XC_VER: ""
@@ -71,7 +72,7 @@ workflows:
         inputs:
         - repository_url: $SAMPLE_APP_URL
         - clone_into_dir: $ORIG_BITRISE_SOURCE_DIR/_tmp
-        - branch: master
+        - branch: $SAMPLE_APP_BRANCH
     - change-workdir:
         title: Switch working dir to test / _tmp dir
         inputs:

go.mod

@@ -1,6 +1,6 @@
 module github.com/bitrise-steplib/steps-carthage
 
-go 1.16
+go 1.17
 
 require (
 	github.com/bitrise-io/go-steputils v1.0.1
@@ -9,3 +9,12 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/stretchr/testify v1.7.0
 )
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)

step.yml

@@ -41,11 +41,7 @@ is_always_run: false
 is_skippable: false
 deps:
   brew:
-  - name: go
   - name: carthage
-  apt_get:
-  - name: golang
-    bin_name: go
 toolkit:
   go:
     package_name: github.com/bitrise-steplib/steps-carthage