From 5bece30b4b636aa7117c19fc64eb3b2d370be27d Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Thu, 19 Dec 2024 14:05:45 +0100 Subject: [PATCH] Update dependencies, MQTT library finally has proper namespacing --- app/build.gradle.kts | 18 +++++++++--------- .../main/java/com/kernelmaft/zanbur/mqtt.kt | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f29eafc..eca2e77 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,10 +9,10 @@ val keystoreProperties = Properties () keystoreProperties . load ( FileInputStream ( rootProject . file ("keystore.properties") ) ) plugins { - id ("com.android.application") . version ("8.7.2") - id ("org.jetbrains.kotlin.android") . version ("2.0.0") - id ("org.jetbrains.kotlin.plugin.compose") . version ("2.0.0") - id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.0.0") + id ("com.android.application") . version ("8.7.3") + id ("org.jetbrains.kotlin.android") . version ("2.1.0") + id ("org.jetbrains.kotlin.plugin.compose") . version ("2.1.0") + id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.1.0") } android { @@ -63,16 +63,16 @@ dependencies { implementation ( "androidx.activity" , "activity-compose" , "1.9.3" ) implementation ( "androidx.core" , "core-ktx" , "1.13.1" ) implementation ( "androidx.compose.material3" , "material3" , "1.3.1" ) - implementation ( "androidx.compose.ui" , "ui" , "1.7.5" ) - implementation ( "androidx.compose.ui" , "ui-graphics" , "1.7.5" ) - debugImplementation ( "androidx.compose.ui" , "ui-tooling" , "1.7.5" ) + implementation ( "androidx.compose.ui" , "ui" , "1.7.6" ) + implementation ( "androidx.compose.ui" , "ui-graphics" , "1.7.6" ) + debugImplementation ( "androidx.compose.ui" , "ui-tooling" , "1.7.6" ) implementation ( "androidx.datastore" , "datastore-preferences" , "1.1.1" ) implementation ( "androidx.lifecycle" , "lifecycle-runtime-ktx" , "2.8.7" ) implementation ( "org.jetbrains.kotlinx" , "kotlinx-coroutines-android" , "1.9.0" ) implementation ( "org.jetbrains.kotlinx" , "kotlinx-serialization-json" , "1.7.3" ) // Other libraries - implementation ( "io.github.davidepianca98" , "kmqtt-common" , "0.4.8" ) - implementation ( "io.github.davidepianca98" , "kmqtt-client" , "0.4.8" ) + implementation ( "io.github.davidepianca98" , "kmqtt-common-jvm" , "1.0.0" ) + implementation ( "io.github.davidepianca98" , "kmqtt-client-jvm" , "1.0.0" ) } tasks . withType ( KotlinCompile :: class ) . all { diff --git a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt b/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt index 5d633ac..eda0cec 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt @@ -1,16 +1,16 @@ package com.kernelmaft.zanbur -import MQTTClient import com.kernelmaft.zanbur.Config.MQTT_SERVER_HOST import com.kernelmaft.zanbur.Config.MQTT_SERVER_PORT import com.kernelmaft.zanbur.Config.MQTT_TOPIC +import io.github.davidepianca98.* +import io.github.davidepianca98.mqtt.* +import io.github.davidepianca98.mqtt.MQTTVersion.* +import io.github.davidepianca98.mqtt.packets.Qos.* +import io.github.davidepianca98.mqtt.packets.mqtt.* import kotlinx.coroutines.* import kotlinx.coroutines.Dispatchers.IO import kotlinx.serialization.json.* -import mqtt.* -import mqtt.MQTTVersion.* -import mqtt.packets.Qos.* -import mqtt.packets.mqtt.*