From 6cf99e0b0380085adf4db546fa44deb52d1060b9 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Sat, 16 Dec 2017 16:17:31 -0800
Subject: [PATCH] Add version IDs to dependency downloads

---
 android/build.gradle | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 653c3f84b5..903c3831bc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -66,47 +66,58 @@ def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/'
 
 def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz'
 def qtChecksum='04599670ccca84bd2b15f6915568eb2d'
+def qtVersionId='PeoqzN31n.YvLfs9JE2SgHgZ4.IaKAlt'
 if (Os.isFamily(Os.FAMILY_MAC)) {
     qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz'
     qtChecksum='4b02de9d67d6bfb202355a808d2d9c59'
+    qtVersionId='HygCmtMLPYioyil0DfXckGVzhw2SXZA9'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz'
     qtChecksum='a93d22c0c59aa112fda18c4c6d157d17'
+    qtVersionId='0Bl9NSUWb5CBKLT_NXaxTt75SNBBZ9sB'
 }
 
 def packages = [
     qt: [
         file: qtFile,
+        versionId: qtVersionId,
         checksum: qtChecksum,
     ],
     bullet: [
         file: 'bullet-2.83_armv8-libcpp.tgz',
-        checksum: '2c558d604fce337f5eba3eb7ec1252fd'
+        versionId: 'ljb7v.1IjVRqyopUKVDbVnLA4z88J8Eo',
+        checksum: '2c558d604fce337f5eba3eb7ec1252fd',
     ],
     draco: [
         file: 'draco_armv8-libcpp.tgz',
-        checksum: '617a80d213a5ec69fbfa21a1f2f738cd'
+        versionId: 'cA3tVJSmkvb1naA3l6D_Jv2Noh.4yc4m',
+        checksum: '617a80d213a5ec69fbfa21a1f2f738cd',
     ],
     glm: [
         file: 'glm-0.9.8.tgz',
-        checksum: 'd2b42cee31d2bc17bab6ce69e6b3f30a'
+        versionId: 'BlkJNwaYV2Gfy5XwMeU7K0uzPDRKFMt2',
+        checksum: 'd2b42cee31d2bc17bab6ce69e6b3f30a',
     ],
     gvr: [
         file: 'gvrsdk_v1.101.0.tgz',
-        checksum: '57fd02baa069176ba18597a29b6b4fc7'
+        versionId: 'UTberAIFraEfF9IVjoV66u1DTPTopgeY',
+        checksum: '57fd02baa069176ba18597a29b6b4fc7',
     ],
     openssl: [
         file: 'openssl-1.1.0g_armv8.tgz',
-        checksum: 'cabb681fbccd79594f65fcc266e02f32'
+        versionId: 'DmahmSGFS4ltpHyTdyQvv35WOeUOiib9',
+        checksum: 'cabb681fbccd79594f65fcc266e02f32',
     ],
     polyvox: [
         file: 'polyvox_armv8-libcpp.tgz',
+        versionId: 'LDJtzMTvdm4SAc2KYg8Cg6uwWk4Vq3e3',
         checksum: '349ad5b72aaf2749ca95d847e60c5314',
         sharedLibFolder: 'lib',
         includeLibs: ['Release/libPolyVoxCore.so', 'libPolyVoxUtil.so'],
     ],
     tbb: [
         file: 'tbb-2018_U1_armv8_libcpp.tgz',
+        versionId: 'YZliDD8.Menh1IVXKEuLPeO3xAjJ1UdF',
         checksum: '20768f298f53b195e71b414b0ae240c4',
         sharedLibFolder: 'lib/release',
         includeLibs: ['libtbb.so', 'libtbbmalloc.so'],
@@ -124,7 +135,6 @@ if (Os.isFamily(Os.FAMILY_MAC)) {
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     scribeFile = 'scribe_win32_x86_64.exe'
     scribeChecksum='75c2ce9ed45d17de375e3988bfaba816'
-
 }
 
 def options = [
@@ -301,6 +311,9 @@ task downloadDependencies {
         packages.each { entry ->
             def filename = entry.value['file'];
             def url = baseUrl + filename;
+            if (entry.value.containsKey('versionId')) {
+                url = url + '?versionId=' + entry.value['versionId']
+            }
             download {
                 src url
                 dest new File(baseFolder, filename)