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
Consoles: Updated Android to use SDK 33 due Play Store policies (#1106)
Michael Rademakerea80bbee31b6
diff --git a/console/android/GenericApp/app/build.gradle b/console/android/GenericApp/app/build.gradleindex d1b2cd7df..d2bfc271d 100644--- a/console/android/GenericApp/app/build.gradle+++ b/console/android/GenericApp/app/build.gradle@@ -3,15 +3,13 @@ apply plugin: 'kotlin-android'apply plugin: 'com.google.gms.google-services'android {- compileSdkVersion 33- buildToolsVersion "32.0.0"-defaultConfig {applicationId "io.openremote.app"minSdkVersion 25+ compileSdk 33targetSdkVersion 33- versionCode 40- versionName "1.0.10"+ versionCode 41+ versionName "1.1.0"testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"@@ -43,15 +41,14 @@ android {dependencies {implementation fileTree(dir: "libs", include: ["*.jar"])- implementation 'androidx.core:core-ktx:1.9.0'+ implementation 'androidx.core:core-ktx:1.10.1'implementation 'androidx.appcompat:appcompat:1.6.1'implementation 'androidx.constraintlayout:constraintlayout:2.1.4'- implementation 'androidx.preference:preference-ktx:1.2.0'+ implementation 'androidx.preference:preference-ktx:1.2.1'implementation "com.google.android.gms:play-services-location:21.0.1"implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"implementation platform('com.google.firebase:firebase-bom:26.0.0')implementation 'com.google.firebase:firebase-messaging-ktx'- implementation 'com.google.android.material:material:1.8.0'+ implementation 'com.google.android.material:material:1.9.0'implementation project(':ORLib')- implementation 'androidx.legacy:legacy-support-v4:1.0.0'}diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt b/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.ktindex b77c393a4..92cf94fb9 100644--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt+++ b/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt@@ -8,7 +8,7 @@ import io.openremote.app.model.ORAppInfoimport io.openremote.app.model.ORConsoleConfigimport java.net.HttpURLConnectionimport java.net.URL-import jakarta.net.ssl.HttpsURLConnection+import javax.net.ssl.HttpsURLConnectionimport kotlin.concurrent.threaddiff --git a/console/android/GenericApp/build.gradle b/console/android/GenericApp/build.gradleindex b94de678e..cb89810e5 100644--- a/console/android/GenericApp/build.gradle+++ b/console/android/GenericApp/build.gradle@@ -6,7 +6,7 @@ buildscript {jcenter()}dependencies {- classpath 'com.android.tools.build:gradle:7.4.1'+ classpath 'com.android.tools.build:gradle:8.1.1'classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"classpath 'com.google.gms:google-services:4.3.15'// NOTE: Do not place your application dependencies here; they belongdiff --git a/console/android/GenericApp/gradle.properties b/console/android/GenericApp/gradle.propertiesindex 4d15d015f..ed9a04985 100644--- a/console/android/GenericApp/gradle.properties+++ b/console/android/GenericApp/gradle.properties@@ -18,4 +18,7 @@ android.useAndroidX=true# Automatically convert third-party libraries to use AndroidXandroid.enableJetifier=true# Kotlin code style for this project: "official" or "obsolete":-kotlin.code.style=official\ No newline at end of file+kotlin.code.style=official+android.defaults.buildfeatures.buildconfig=true+android.nonTransitiveRClass=false+android.nonFinalResIds=falsediff --git a/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties b/console/android/GenericApp/gradle/wrapper/gradle-wrapper.propertiesindex 32078114b..872747e41 100644--- a/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties+++ b/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@#Mon Jan 24 13:58:21 CET 2022distributionBase=GRADLE_USER_HOME-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zipdistributionPath=wrapper/distszipStorePath=wrapper/distszipStoreBase=GRADLE_USER_HOMEdiff --git a/console/android/ORLib/build.gradle b/console/android/ORLib/build.gradleindex ddf3a8300..5d0a3bfa1 100644--- a/console/android/ORLib/build.gradle+++ b/console/android/ORLib/build.gradle@@ -6,11 +6,10 @@ plugins {android {namespace 'io.openremote.orlib'- compileSdkVersion 33- buildToolsVersion "33.0.2"defaultConfig {minSdkVersion 25+ compileSdk 33targetSdkVersion 33versionCode 1versionName "1.0"@@ -42,7 +41,7 @@ dependencies {implementation 'androidx.core:core-ktx:1.10.1'implementation 'androidx.appcompat:appcompat:1.6.1'implementation 'com.google.android.material:material:1.9.0'- implementation 'androidx.preference:preference-ktx:1.2.0'+ implementation 'androidx.preference:preference-ktx:1.2.1'implementation "com.google.android.gms:play-services-location:21.0.1"implementation 'com.google.android.gms:play-services-vision:20.1.3'implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"