From 3cf24f3329bb552c35b4f64e0edcdff72aa4f8b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Thu, 21 Feb 2019 12:57:29 +0100
Subject: [PATCH] [android] initialize vendor submodules as a CI step

---
 circle.yml                                                  | 6 ++++++
 platform/android/gradle/android-nitpick.gradle              | 6 +-----
 platform/android/gradle/gradle-update-vendor-modules.gradle | 5 ++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/circle.yml b/circle.yml
index 642420527..28d1e39e6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -534,6 +534,9 @@ jobs:
       MBGL_ANDROID_STL: << parameters.stl >>
     steps:
       - install-dependencies: { gradle: true }
+      - run:
+          name: Initialize vendor submodules
+          command: git submodule update --init platform/android/vendor
       - run:
           name: Android nitpick
           command: make run-android-nitpick
@@ -598,6 +601,9 @@ jobs:
       IS_LOCAL_DEVELOPMENT: false
     steps:
       - install-dependencies: { gradle: true }
+      - run:
+          name: Initialize vendor submodules
+          command: git submodule update --init platform/android/vendor
       - run:
           name: Android nitpick
           command: make run-android-nitpick
diff --git a/platform/android/gradle/android-nitpick.gradle b/platform/android/gradle/android-nitpick.gradle
index 6ed03e8aa..f8e4a47b0 100644
--- a/platform/android/gradle/android-nitpick.gradle
+++ b/platform/android/gradle/android-nitpick.gradle
@@ -14,11 +14,6 @@ task androidNitpick {
         println "Running android nitpick script"
 
         println "Verify vendor submodule pins"
-        exec {
-            workingDir = "${rootDir}"
-            commandLine "git", "submodule", "update", "--init", "--recursive", "vendor"
-            ignoreExitValue = true
-        }
         verifyVendorSubmodulePin(MAPBOX_JAVA_DIR, MAPBOX_JAVA_TAG_PREFIX, versions.mapboxServices)
         verifyVendorSubmodulePin(MAPBOX_TELEMETRY_DIR, MAPBOX_TELEMETRY_TAG_PREFIX, versions.mapboxTelemetry)
         verifyVendorSubmodulePin(MAPBOX_GESTURES_DIR, MAPBOX_GESTURES_TAG_PREFIX, versions.mapboxGestures)
@@ -26,6 +21,7 @@ task androidNitpick {
 }
 
 private def verifyVendorSubmodulePin(def dir, def prefix, def version) {
+    println "Verify vendor submodule pin: ${dir} (${prefix + version})"
     exec {
         workingDir = "${rootDir}/vendor/${dir}"
         commandLine "git", "fetch", "-t"
diff --git a/platform/android/gradle/gradle-update-vendor-modules.gradle b/platform/android/gradle/gradle-update-vendor-modules.gradle
index f2305eb7a..e215450ec 100644
--- a/platform/android/gradle/gradle-update-vendor-modules.gradle
+++ b/platform/android/gradle/gradle-update-vendor-modules.gradle
@@ -1,5 +1,8 @@
 task updateVendorSubmodules {
     doLast {
-        "git submodule update --init --recursive vendor".execute()
+        exec {
+            workingDir = "${rootDir}"
+            commandLine "git", "submodule", "update", "--init", "vendor"
+        }
     }
 }
\ No newline at end of file