From 3ed63012f44714cd1c13640872bf87dffa3ffd27 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Thu, 20 Aug 2026 10:51:07 +0300 Subject: [PATCH] =?UTF-8?q?build:=20Kotlin=202.2.0=20=E2=86=92=202.4.10=20?= =?UTF-8?q?(AGP=208.9.2,=20Gradle=208.14=20=E2=80=94=20=D0=B2=20=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC=20?= =?UTF-8?q?=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - libs.versions.toml: kotlin = 2.4.10 - jvmTarget '17' (kotlinOptions, String) — в 2.4.10 ошибка → compilerOptions DSL (JvmTarget.JVM_17) в app-phone и app-glasses - Compose-плагин (org.jetbrains.kotlin.plugin.compose) версионируется с Kotlin — 2.4.10 - Проверено: lib-core allTests + phone/glasses тесты + оба APK — BUILD SUCCESSFUL - Открывает дорогу Koog (требует Kotlin 2.3.10+) --- app-glasses/build.gradle.kts | 6 ++++-- app-phone/build.gradle.kts | 6 ++++-- gradle/libs.versions.toml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app-glasses/build.gradle.kts b/app-glasses/build.gradle.kts index 437fe99..578737a 100644 --- a/app-glasses/build.gradle.kts +++ b/app-glasses/build.gradle.kts @@ -28,8 +28,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + } } buildFeatures { diff --git a/app-phone/build.gradle.kts b/app-phone/build.gradle.kts index 1a366ad..fa40216 100644 --- a/app-phone/build.gradle.kts +++ b/app-phone/build.gradle.kts @@ -28,8 +28,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + } } buildFeatures { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 91312ae..5435f8d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.2.0" +kotlin = "2.4.10" kotlinx-serialization = "1.8.1" kotlinx-coroutines = "1.10.2" ktor = "3.3.0"