From cd1f511348aef943369d6fa60c50b0b3ab4edd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Tue, 29 Jan 2019 15:46:55 +0100
Subject: [android] run vendor submodule check

---
 platform/android/gradle/android-nitpick.gradle | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/platform/android/gradle/android-nitpick.gradle b/platform/android/gradle/android-nitpick.gradle
index dfcbcfb869..fc8391bc90 100644
--- a/platform/android/gradle/android-nitpick.gradle
+++ b/platform/android/gradle/android-nitpick.gradle
@@ -9,8 +9,10 @@ def MAPBOX_TELEMETRY_TAG_PREFIX = 'telem-'
 def MAPBOX_GESTURES_DIR = 'mapbox-gestures-android'
 def MAPBOX_GESTURES_TAG_PREFIX = 'v'
 
-task verifyVendorSubmodulePins {
+task androidNitpick {
     doLast {
+        println "Running android nitpick script"
+
         println "Verify vendor submodule pins"
         verifyVendorSubmodulePin(MAPBOX_JAVA_DIR, MAPBOX_JAVA_TAG_PREFIX, versions.mapboxServices)
         verifyVendorSubmodulePin(MAPBOX_TELEMETRY_DIR, MAPBOX_TELEMETRY_TAG_PREFIX, versions.mapboxTelemetry)
@@ -18,17 +20,18 @@ task verifyVendorSubmodulePins {
     }
 }
 
-task androidNitpick {
-    doLast {
-        println "Running android nitpick script"
-        verifyVendorSubmodulePins
-    }
-}
-
 private def verifyVendorSubmodulePin(def dir, def prefix, def version) {
     def output = new ByteArrayOutputStream()
     exec {
-        workingDir "${rootDir}/vendor/${dir}"
+        workingDir = "${rootDir}/vendor/${dir}"
+        commandLine "ls"
+        standardOutput = output
+    }
+    println(output.toString())
+    output.reset()
+
+    exec {
+        workingDir = "${rootDir}/vendor/${dir}"
         commandLine "git", "rev-list", "-n", "1", "tags/${prefix + version}"
         standardOutput = output
     }
@@ -36,7 +39,7 @@ private def verifyVendorSubmodulePin(def dir, def prefix, def version) {
     output.reset()
 
     exec {
-        workingDir "${rootDir}/vendor/${dir}"
+        workingDir = "${rootDir}/vendor/${dir}"
         commandLine "git", "rev-parse", "HEAD"
         standardOutput = output
     }
-- 
cgit v1.2.1