summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-01-29 15:46:55 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2019-01-29 18:59:46 +0100
commitda20775167d01faedef3ffd669038ff5a1bfb820 (patch)
treed66b547d5949e6edaaee08fcbc764e4f8b6c01bf
parentc7c537ff8f32706c3aa434fe08112a3cae62b185 (diff)
downloadqtlocation-mapboxgl-da20775167d01faedef3ffd669038ff5a1bfb820.tar.gz
[android] run vendor submodule check
-rw-r--r--platform/android/gradle/android-nitpick.gradle19
1 files changed, 9 insertions, 10 deletions
diff --git a/platform/android/gradle/android-nitpick.gradle b/platform/android/gradle/android-nitpick.gradle
index dfcbcfb869..e79a23e6bf 100644
--- a/platform/android/gradle/android-nitpick.gradle
+++ b/platform/android/gradle/android-nitpick.gradle
@@ -9,26 +9,25 @@ 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"
+ exec {
+ workingDir = "${rootDir}"
+ commandLine "git", "submodule", "update", "--init", "--recursive", "vendor"
+ }
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)
}
}
-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 "git", "rev-list", "-n", "1", "tags/${prefix + version}"
standardOutput = output
}
@@ -36,7 +35,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
}