From bf29934935cd8b5a94afe751310e058967464524 Mon Sep 17 00:00:00 2001
From: Denzil Ferreira <ferreiradenzil@gmail.com>
Date: Fri, 22 Feb 2019 16:03:58 +0200
Subject: [PATCH] - Fix buggy gradle version. Reverted to 4.6 and gradle plugin
 3.2.1

---
 aware-core/aware.gradle                            |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 aware-phone/build.gradle                           | 14 +++++++++++++-
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 build.gradle                                       |  4 ++--
 com.aware.plugin.ambient_noise                     |  2 +-
 com.aware.plugin.contacts_list                     |  2 +-
 com.aware.plugin.device_usage                      |  2 +-
 com.aware.plugin.esm.scheduler                     |  2 +-
 com.aware.plugin.fitbit                            |  2 +-
 com.aware.plugin.google.activity_recognition       |  2 +-
 com.aware.plugin.google.auth                       |  2 +-
 com.aware.plugin.google.fused_location             |  2 +-
 com.aware.plugin.openweather                       |  2 +-
 com.aware.plugin.sensortag                         |  2 +-
 com.aware.plugin.sentimental                       |  2 +-
 com.aware.plugin.studentlife.audio                 |  2 +-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 19 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/aware-core/aware.gradle b/aware-core/aware.gradle
index 780905f60..3d5d4fbaa 100644
--- a/aware-core/aware.gradle
+++ b/aware-core/aware.gradle
@@ -3,7 +3,7 @@ ext {
     ion_libs = "2.+"
     support_libs = "28.0.0"
     google_libs = "16.0.0"
-    version_code = 808
+    version_code = 809
     version_readable = "4.0." + version_code + "." + "bundle"
     compile_sdk = 28
     target_sdk = 26
diff --git a/aware-core/gradle/wrapper/gradle-wrapper.properties b/aware-core/gradle/wrapper/gradle-wrapper.properties
index cae58fbf1..09bb65726 100644
--- a/aware-core/gradle/wrapper/gradle-wrapper.properties
+++ b/aware-core/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/aware-phone/build.gradle b/aware-phone/build.gradle
index 547ef543b..e9c58c338 100755
--- a/aware-phone/build.gradle
+++ b/aware-phone/build.gradle
@@ -108,41 +108,53 @@ dependencies {
     implementation('me.dm7.barcodescanner:zbar:1.8.4') {
         exclude group: 'com.android.support', module: "support-v4"
     }
+    
     api project(':aware-core')
-
+    
     api (project(":com.aware.plugin.device_usage")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.ambient_noise")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.contacts_list")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.studentlife.audio")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.fitbit")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.google.activity_recognition")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.google.auth")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.google.fused_location")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.openweather")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.esm.scheduler")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.sensortag")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
+    
     api (project(":com.aware.plugin.sentimental")) {
         exclude group:'com.github.denzilferreira',module:'aware-client'
     }
diff --git a/aware-phone/gradle/wrapper/gradle-wrapper.properties b/aware-phone/gradle/wrapper/gradle-wrapper.properties
index cae58fbf1..09bb65726 100644
--- a/aware-phone/gradle/wrapper/gradle-wrapper.properties
+++ b/aware-phone/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/aware-tests/gradle/wrapper/gradle-wrapper.properties b/aware-tests/gradle/wrapper/gradle-wrapper.properties
index cae58fbf1..09bb65726 100644
--- a/aware-tests/gradle/wrapper/gradle-wrapper.properties
+++ b/aware-tests/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/build.gradle b/build.gradle
index 2ffda08fe..1276b7790 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ apply from: 'aware-core/aware.gradle'
 buildscript {
 
     ext.kotlin_version = '1.3.11'
-    
+
     repositories {
         maven {
             url 'https://maven.google.com'
@@ -15,7 +15,7 @@ buildscript {
         maven { url "https://jitpack.io" } //MPAndroidChart, AWARE
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/com.aware.plugin.ambient_noise b/com.aware.plugin.ambient_noise
index 537118a33..7042e2fd1 160000
--- a/com.aware.plugin.ambient_noise
+++ b/com.aware.plugin.ambient_noise
@@ -1 +1 @@
-Subproject commit 537118a336eec7bbec856cec69ba84fd9803b46d
+Subproject commit 7042e2fd19c32fc6321c29f0ff9be259fc953336
diff --git a/com.aware.plugin.contacts_list b/com.aware.plugin.contacts_list
index 186badc5b..1b685e5c9 160000
--- a/com.aware.plugin.contacts_list
+++ b/com.aware.plugin.contacts_list
@@ -1 +1 @@
-Subproject commit 186badc5b3366263b238ce4ecb8546de85b44093
+Subproject commit 1b685e5c9523945455ea4d145d1a3a0652f9ca0d
diff --git a/com.aware.plugin.device_usage b/com.aware.plugin.device_usage
index 110b26665..487db9240 160000
--- a/com.aware.plugin.device_usage
+++ b/com.aware.plugin.device_usage
@@ -1 +1 @@
-Subproject commit 110b26665141384c12a9755f9813d92ba5755696
+Subproject commit 487db9240e0c7377ad8b9ac032df6c8e34080f43
diff --git a/com.aware.plugin.esm.scheduler b/com.aware.plugin.esm.scheduler
index ef0fa090a..fe4c263a2 160000
--- a/com.aware.plugin.esm.scheduler
+++ b/com.aware.plugin.esm.scheduler
@@ -1 +1 @@
-Subproject commit ef0fa090a4906f543a026a7a009652fd50e60c4e
+Subproject commit fe4c263a23938278fe0b8022f6fa2ad0f4b794cb
diff --git a/com.aware.plugin.fitbit b/com.aware.plugin.fitbit
index cdc730e6f..f6997db71 160000
--- a/com.aware.plugin.fitbit
+++ b/com.aware.plugin.fitbit
@@ -1 +1 @@
-Subproject commit cdc730e6fb8941823f1e30f55c709dc9de27f13e
+Subproject commit f6997db718202d2fe700d884797f8345e419ce08
diff --git a/com.aware.plugin.google.activity_recognition b/com.aware.plugin.google.activity_recognition
index 10613ef15..604ecb4c1 160000
--- a/com.aware.plugin.google.activity_recognition
+++ b/com.aware.plugin.google.activity_recognition
@@ -1 +1 @@
-Subproject commit 10613ef1519e8703e67f2ba84247e3e6497452a8
+Subproject commit 604ecb4c1c7efe1027dac83c768270c971d7b1d2
diff --git a/com.aware.plugin.google.auth b/com.aware.plugin.google.auth
index 493feca7d..de40e9285 160000
--- a/com.aware.plugin.google.auth
+++ b/com.aware.plugin.google.auth
@@ -1 +1 @@
-Subproject commit 493feca7df81400c441001975ff05092844a0c3d
+Subproject commit de40e928556378ed03e75d18b9b4f92eadda4645
diff --git a/com.aware.plugin.google.fused_location b/com.aware.plugin.google.fused_location
index cc3919aca..a203539a3 160000
--- a/com.aware.plugin.google.fused_location
+++ b/com.aware.plugin.google.fused_location
@@ -1 +1 @@
-Subproject commit cc3919aca3cfb9f1f04a506cf5130054ef1f2fa8
+Subproject commit a203539a3b8dcbf1e1c12059019f0c6c59366d10
diff --git a/com.aware.plugin.openweather b/com.aware.plugin.openweather
index 135884499..7e7177256 160000
--- a/com.aware.plugin.openweather
+++ b/com.aware.plugin.openweather
@@ -1 +1 @@
-Subproject commit 13588449902bc3fbef92b306387efac78dcf861e
+Subproject commit 7e7177256e81378584449fc6c48ebb0ae2abd066
diff --git a/com.aware.plugin.sensortag b/com.aware.plugin.sensortag
index fab249e0c..043c0a03c 160000
--- a/com.aware.plugin.sensortag
+++ b/com.aware.plugin.sensortag
@@ -1 +1 @@
-Subproject commit fab249e0c61f57a813a15622979bc0734c5529c3
+Subproject commit 043c0a03c70aa080035922460eb74cc8773e9f0d
diff --git a/com.aware.plugin.sentimental b/com.aware.plugin.sentimental
index 4ed548265..03a87c192 160000
--- a/com.aware.plugin.sentimental
+++ b/com.aware.plugin.sentimental
@@ -1 +1 @@
-Subproject commit 4ed5482653e17376aadbe6063eb02cd4483fa48c
+Subproject commit 03a87c19247822ebea1e943507c39d008a9c876b
diff --git a/com.aware.plugin.studentlife.audio b/com.aware.plugin.studentlife.audio
index 43068b019..2997496f5 160000
--- a/com.aware.plugin.studentlife.audio
+++ b/com.aware.plugin.studentlife.audio
@@ -1 +1 @@
-Subproject commit 43068b019204659f735acdca02b6071f560acffb
+Subproject commit 2997496f5caee374e3eb7bc17503850c382283da
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cae58fbf1..09bb65726 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip