downgraded dependencies to kotlin 2.0 for better integration on large projects

This commit is contained in:
Florent Champigny 2025-07-30 11:02:45 +02:00
parent dc212004ab
commit 348784d478
6 changed files with 11 additions and 12 deletions

View file

@ -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")
}

View file

@ -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
}

View file

@ -24,5 +24,5 @@ android.nonTransitiveRClass=true
floconGroupId=io.github.openflocon
floconVersion=0.0.1
floconDescription=Android Personnal Assistant
floconVersion=0.0.2
floconDescription=A powerful desktop companion for Android apps, inspect, debug, and control your app in real time.

View file

@ -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" }

View file

@ -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)

View file

@ -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 {