100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Re-instate android gradle config
Rich Turner4b7cc53bf56f
diff --git a/console/android/build.gradle b/console/android/build.gradleindex c2db2a86d..6bbfabb62 100644--- a/console/android/build.gradle+++ b/console/android/build.gradle@@ -1,17 +1,34 @@+buildscript {+ ext.kotlin_version = "$kotlinVersion"+ repositories {+ google()+ jcenter()+ }+ dependencies {+ classpath "com.android.tools.build:gradle:$androidGradleVersion"+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"+ }+}++allprojects {+ repositories {+ google()+ jcenter()+ }+}+apply plugin: "com.android.library"apply plugin: 'kotlin-android'-version = projectVersionandroid {- compileSdkVersion androidCompileVersion- buildToolsVersion androidBuildToolsVersion+ compileSdkVersion Integer.valueOf(androidCompileVersion)defaultConfig {- minSdkVersion androidMinVersion- targetSdkVersion androidTargetVersion+ minSdkVersion Integer.valueOf(androidMinVersion)+ targetSdkVersion Integer.valueOf(androidTargetVersion)versionCode Integer.valueOf(projectVersionCode)versionName project.version}@@ -44,7 +61,7 @@ dependencies {implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"implementation "com.android.support:support-compat:$androidSupportVersion"implementation "com.android.support:appcompat-v7:$androidSupportVersion"- implementation "com.google.firebase:firebase-core:$firebaseCoreVersion"+ implementation "com.google.firebase:firebase-core:$fcmVersion"implementation "com.google.firebase:firebase-messaging:$fcmVersion"implementation "com.squareup.retrofit2:converter-jackson:$jacksonVersion"implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"diff --git a/console/android/gradle.properties b/console/android/gradle.propertiesindex 63d109971..dd310b8ae 100644--- a/console/android/gradle.properties+++ b/console/android/gradle.properties@@ -4,3 +4,18 @@ projectVersion = 3.0-SNAPSHOT# Increment this for every releaseprojectVersionCode = 1++# Android 5.0+androidMinVersion = 21+androidTargetVersion = 25++kotlinVersion = 1.3.10+androidGradleVersion = 3.4.0+androidCompileVersion = 26+androidSupportVersion = 26.1.0++okhttp3Version = 3.6.0+retrofitVersion = 2.2.0+googlePlayVersion = 15.0.1+fcmVersion = 15.0.2+jacksonVersion = 2.2.0\ No newline at end of filediff --git a/console/android/gradle/wrapper/gradle-wrapper.properties b/console/android/gradle/wrapper/gradle-wrapper.propertiesindex 1b8bc60f0..b04c01163 100644--- a/console/android/gradle/wrapper/gradle-wrapper.properties+++ b/console/android/gradle/wrapper/gradle-wrapper.properties@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/distszipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip