TOOL-317

androidcomponents/androidcomponents.go

@@ -117,12 +117,12 @@ func Ensure(androidSdk *sdk.Model, gradlewPath string) error {
 
 func (i installer) getDependencyCases() map[string]func(match string) error {
 	return map[string]func(match string) error{
-		`(Observed package id 'ndk-bundle' in inconsistent location)`:         i.ndkInconsistentLocation,
-		`(NDK not configured)`:                                                i.ndkNotConfigured,
+		`(Observed package id 'ndk-bundle' in inconsistent location)`: i.ndkInconsistentLocation,
+		`(NDK not configured)`: i.ndkNotConfigured,
 		`failed to find target with hash string 'android-(.*)'\s*`:            i.target,
 		`failed to find Build Tools revision ([0-9.]*)\s*`:                    i.buildTool,
-		`Could not find (com\.android\.support\..*)\.`:                        i.extrasLib,
-		`Could not find any version that matches (com\.android\.support.*)\.`: i.extrasLib,
+		`Could not find (com\.android\.support:.*)\.`:                         i.extrasLib,
+		`Could not find any version that matches (com\.android\.support:*)\.`: i.extrasLib,
 	}
 }
 

bitrise.yml

@@ -61,7 +61,7 @@ workflows:
     - test_android-sdk22-subdir
     - test_react_native
     - test_ndk_install
-
+    - test_support_library
 
   test_ndk:
     envs:
@@ -240,6 +240,48 @@ workflows:
     - path::./:
         title: Step test
 
+  test_support_library:
+    envs:
+    - SAMPLE_APP_URL: https://github.com/godrei/JetPackTest.git
+    - BRANCH: master
+    - GRADLE_BUILD_FILE_PATH: build.gradle
+    - GRADLEW_PATH: ./gradlew
+    steps:
+    - script:
+        inputs:
+        - content: |-
+            #!/usr/bin/env bash
+            set -e
+            rm -rf ./_tmp
+    - script:
+        inputs:
+        - content: |-
+            #!/usr/bin/env bash
+            sdkmanager --uninstall "extras;android;m2repository"
+    - change-workdir:
+        title: Switch working dir to test / _tmp dir
+        run_if: true
+        inputs:
+        - path: ./_tmp
+        - is_create_path: true
+    - script:
+        inputs:
+        - content: |-
+            #!/usr/bin/env bash
+            if [[ -z "${SAMPLE_APP_URL}" ]]; then
+              echo "error: there is no SAMPLE_APP_URL env var specified"
+              exit 1
+            elif [[ -z "${COMMIT}" && -z "${BRANCH}" ]]; then
+              echo "error: can't checkout: there is no BRANCH or COMMIT env var specified"
+              exit 1
+            fi
+            git init
+            git remote add origin "${SAMPLE_APP_URL}"
+            git fetch || exit 1
+            [[ -n "${COMMIT}" ]] && git checkout "${COMMIT}" || git checkout "${BRANCH}"
+    - path::./:
+        title: Step test
+
   test_old_gradle:
     envs:
     - SAMPLE_APP_URL: https://github.com/bitrise-samples/2048-android.git

main.go

@@ -138,7 +138,7 @@ func updateNDK(revision string) error {
 		return err
 	}
 
-	if err := updateNDKPathIfNeeded(ndkHome); err != nil {
+	if err := ensureNDKPath(ndkHome); err != nil {
 		return err
 	}
 
@@ -159,7 +159,7 @@ func updateNDK(revision string) error {
 	return nil
 }
 
-func updateNDKPathIfNeeded(ndkHome string) error {
+func ensureNDKPath(ndkHome string) error {
 	log.Printf("searching for platforms dir in %s", ndkHome)
 	var foundPDPath string
 	if err := filepath.Walk(ndkHome, func(currentPath string, info os.FileInfo, err error) error {