- Fix buggy gradle version. Reverted to 4.6 and gradle plugin 3.2.1

denzilferreira · Feb 22, 2019 · bf29934 · bf29934
1 parent f601c38
commit bf29934
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/com.aware.plugin.contacts_list b/com.aware.plugin.contacts_list
diff --git a/com.aware.plugin.device_usage b/com.aware.plugin.device_usage
diff --git a/com.aware.plugin.esm.scheduler b/com.aware.plugin.esm.scheduler
diff --git a/com.aware.plugin.fitbit b/com.aware.plugin.fitbit
diff --git a/com.aware.plugin.google.activity_recognition b/com.aware.plugin.google.activity_recognition
diff --git a/com.aware.plugin.google.auth b/com.aware.plugin.google.auth
diff --git a/com.aware.plugin.google.fused_location b/com.aware.plugin.google.fused_location
diff --git a/com.aware.plugin.openweather b/com.aware.plugin.openweather
diff --git a/com.aware.plugin.sensortag b/com.aware.plugin.sensortag
diff --git a/com.aware.plugin.sentimental b/com.aware.plugin.sentimental
diff --git a/com.aware.plugin.studentlife.audio b/com.aware.plugin.studentlife.audio
diff --git 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
+1 −2		build.gradle
+1 −1		com.aware.plugin.ambient_noise.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.ambient_noise/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.contacts_list.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.contacts_list/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.device_usage.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.device_usage/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.esm.scheduler.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.esm.scheduler/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.fitbit.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.fitbit/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.google.activity_recognition.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.google.activity_recognition/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.google.auth.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.google.auth/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.google.fused_location.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.google.fused_location/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.openweather.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.openweather/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.sensortag.lib/gradle/wrapper/gradle-wrapper.properties
+1 −1		com.aware.plugin.sensortag/gradle/wrapper/gradle-wrapper.properties