bitrise-init update (#33)

deplock.json

@@ -2,7 +2,7 @@
 	"dep_locks": [
 		{
 			"url": "https://github.com/bitrise-core/bitrise-init.git",
-			"revision": "39458b2137dbdb31f2bedfb7b5cd6ac3fee3e504"
+			"revision": "9d8de8306440320cc3f714878c49c5e5b17c6fec"
 		}
 	]
 }

go/src/github.com/bitrise-core/bitrise-init/_tests/integration/android_test.go

@@ -55,8 +55,34 @@ func TestAndroid(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, strings.TrimSpace(androidNonExecutableGradlewResultYML), strings.TrimSpace(result))
 	}
+
+	t.Log("android-sdk22-no-gradlew")
+	{
+		sampleAppDir := filepath.Join(tmpDir, "android-sdk22-no-gradlew")
+		sampleAppURL := "https://github.com/bitrise-samples/android-sdk22-no-gradlew.git"
+		require.NoError(t, command.GitClone(sampleAppURL, sampleAppDir))
+
+		cmd := command.New(binPath(), "--ci", "config", "--dir", sampleAppDir, "--output-dir", sampleAppDir)
+		out, err := cmd.RunAndReturnTrimmedCombinedOutput()
+		require.NoError(t, err, out)
+
+		scanResultPth := filepath.Join(sampleAppDir, "result.yml")
+
+		result, err := fileutil.ReadStringFromFile(scanResultPth)
+		require.NoError(t, err)
+		require.Equal(t, strings.TrimSpace(sampleAppsSDK22NoGradlewResultYML), strings.TrimSpace(result))
+	}
 }
 
+var sampleAppsSDK22NoGradlewResultYML = `warnings:
+  android:
+  - "<b>No Gradle Wrapper (gradlew) found.</b> \nUsing a Gradle Wrapper (gradlew)
+    is required, as the wrapper is what makes sure\nthat the right Gradle version
+    is installed and used for the build. More info/guide: <a>https://docs.gradle.org/current/userguide/gradle_wrapper.html</a>"
+errors:
+  general:
+  - No known platform detected`
+
 var sampleAppsAndroid22Versions = []interface{}{
 	models.FormatVersion,
 	steps.ActivateSSHKeyVersion,

go/src/github.com/bitrise-core/bitrise-init/_tests/integration/mac_test.go

@@ -74,7 +74,6 @@ configs:
     macos-test-config: |
       format_version: %s
       default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
-      app: {}
       trigger_map:
       - push_branch: '*'
         workflow: primary

go/src/github.com/bitrise-core/bitrise-init/_tests/integration/manual_config_test.go

@@ -282,7 +282,6 @@ configs:
     default-macos-config: |
       format_version: %s
       default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
-      app: {}
       trigger_map:
       - push_branch: '*'
         workflow: primary

go/src/github.com/bitrise-core/bitrise-init/cli/config.go

@@ -1,7 +1,6 @@
 package cli
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -133,14 +132,14 @@ func initConfig(c *cli.Context) error {
 
 		log.Infoft("Saving outputs:")
 		scanResult.AddError("general", "No known platform detected")
+
 		outputPth, err := writeScanResult(scanResult, outputDir, format)
 		if err != nil {
-			log.Errorf("Failed to write output, error: %s", err)
-		} else {
-			log.Printft("  scan result: %s", outputPth)
+			return fmt.Errorf("Failed to write output, error: %s", err)
 		}
 
-		return errors.New("No known platform detected")
+		log.Printft("  scan result: %s", outputPth)
+		return nil
 	}
 
 	// Write output to files

go/src/github.com/bitrise-core/bitrise-init/scanners/android/android.go

@@ -128,6 +128,11 @@ type Scanner struct {
 	GradleFiles []string
 }
 
+// NewScanner ...
+func NewScanner() *Scanner {
+	return &Scanner{}
+}
+
 // Name ...
 func (scanner Scanner) Name() string {
 	return scannerName

go/src/github.com/bitrise-core/bitrise-init/scanners/fastlane/fastlane.go

@@ -150,6 +150,11 @@ type Scanner struct {
 	Fastfiles []string
 }
 
+// NewScanner ...
+func NewScanner() *Scanner {
+	return &Scanner{}
+}
+
 // Name ...
 func (scanner Scanner) Name() string {
 	return scannerName