From 348784d47861e662f8ef389ae04b2ba8d0bf3a87 Mon Sep 17 00:00:00 2001
From: Florent Champigny <florent@bere.al>
Date: Wed, 30 Jul 2025 11:02:45 +0200
Subject: [PATCH] downgraded dependencies to kotlin 2.0 for better integration
 on large projects

---
 FloconAndroid/app/build.gradle.kts                     |  2 +-
 FloconAndroid/build.gradle.kts                         |  2 +-
 FloconAndroid/gradle.properties                        |  4 ++--
 FloconAndroid/gradle/libs.versions.toml                | 10 ++++++----
 FloconAndroid/settings.gradle.kts                      |  3 ---
 .../flocondesktop/common/AdbExecutor.desktop.kt        |  2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/FloconAndroid/app/build.gradle.kts b/FloconAndroid/app/build.gradle.kts
index e418d4da..fa7be7e5 100644
--- a/FloconAndroid/app/build.gradle.kts
+++ b/FloconAndroid/app/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.ksp)
     id("com.google.protobuf")
 }
 
diff --git a/FloconAndroid/build.gradle.kts b/FloconAndroid/build.gradle.kts
index 872ae8d9..b21adea7 100644
--- a/FloconAndroid/build.gradle.kts
+++ b/FloconAndroid/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.android.library) apply false
-    id("com.google.devtools.ksp") apply false
+    alias(libs.plugins.ksp) apply false
     id("com.google.protobuf") version "0.9.5" apply false
 }
\ No newline at end of file
diff --git a/FloconAndroid/gradle.properties b/FloconAndroid/gradle.properties
index 70f2fe4c..08f01125 100644
--- a/FloconAndroid/gradle.properties
+++ b/FloconAndroid/gradle.properties
@@ -24,5 +24,5 @@ android.nonTransitiveRClass=true
 
 
 floconGroupId=io.github.openflocon
-floconVersion=0.0.1
-floconDescription=Android Personnal Assistant
\ No newline at end of file
+floconVersion=0.0.2
+floconDescription=A powerful desktop companion for Android apps, inspect, debug, and control your app in real time.
\ No newline at end of file
diff --git a/FloconAndroid/gradle/libs.versions.toml b/FloconAndroid/gradle/libs.versions.toml
index 478d6aea..8bf0e131 100644
--- a/FloconAndroid/gradle/libs.versions.toml
+++ b/FloconAndroid/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.11.0-rc02"
-coilCompose = "3.3.0"
-kotlin = "2.2.0"
+coilCompose = "3.2.0"
+kotlin = "2.0.0"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -9,17 +9,18 @@ espressoCore = "3.6.1"
 kotlinxCoroutinesBom = "1.10.2"
 lifecycleRuntimeKtx = "2.9.1"
 activityCompose = "1.10.1"
-composeBom = "2024.09.00"
+composeBom = "2025.06.01"
 appcompat = "1.7.1"
 material = "1.12.0"
 okhttpBom = "4.12.0"
-roomRuntime = "2.7.2"
+roomRuntime = "2.7.1"
 # for grpc
 gson = "2.11.0"
 grpc = "1.73.0"
 protobufPlugin = "0.9.5"
 grpcKotlin = "1.4.3"
 protobuf = "4.26.1"
+ksp = "2.0.0-1.0.23"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -65,3 +66,4 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/FloconAndroid/settings.gradle.kts b/FloconAndroid/settings.gradle.kts
index 5fa7655e..fc7e5a46 100644
--- a/FloconAndroid/settings.gradle.kts
+++ b/FloconAndroid/settings.gradle.kts
@@ -4,9 +4,6 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-    plugins {
-        id("com.google.devtools.ksp") version "2.1.21-2.0.1" apply false
-    }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
diff --git a/FloconDesktop/composeApp/src/desktopMain/kotlin/com/florent37/flocondesktop/common/AdbExecutor.desktop.kt b/FloconDesktop/composeApp/src/desktopMain/kotlin/com/florent37/flocondesktop/common/AdbExecutor.desktop.kt
index 902b1e3d..da121b52 100644
--- a/FloconDesktop/composeApp/src/desktopMain/kotlin/com/florent37/flocondesktop/common/AdbExecutor.desktop.kt
+++ b/FloconDesktop/composeApp/src/desktopMain/kotlin/com/florent37/flocondesktop/common/AdbExecutor.desktop.kt
@@ -54,7 +54,7 @@ actual fun findAdbPath(): String? {
 
 actual fun executeSystemCommand(command: String): Either<Throwable, String> = try {
     val devices = listConnectedDevices()
-    if (devices.isEmpty()) {
+    if (devices.isEmpty() || devices.size == 1) {
         singleDeviceExecuteSystemCommand(command)
     } else {
         devices.map {