From debc838893613fcd25242696672a859b9559f253 Mon Sep 17 00:00:00 2001 From: Shcherbatykh Oleg Date: Fri, 13 Feb 2026 11:24:29 +0300 Subject: [PATCH] fix jvmTarget in build.gradle --- app/build.gradle.kts | 9 +++++--- core/common/build.gradle.kts | 7 +++--- core/database/build.gradle.kts | 7 +++--- gradle/libs.versions.toml | 40 ++++++++++++++++++++-------------- settings.gradle.kts | 2 ++ 5 files changed, 40 insertions(+), 25 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b1a19bc..a0601c1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,15 +29,18 @@ android { ) } } + buildFeatures { buildConfig = true } + + val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get()) compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = jvm + targetCompatibility = jvm } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = jvm.toString() } } diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index b21520b..2f53a00 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -21,12 +21,13 @@ android { ) } } + val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get()) compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = jvm + targetCompatibility = jvm } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = jvm.toString() } } diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 9caa830..a667871 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -21,12 +21,13 @@ android { ) } } + val jvm = JavaVersion.toVersion(libs.versions.jvmTarget.get()) compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = jvm + targetCompatibility = jvm } kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() + jvmTarget = jvm.toString() } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f09eec..96c089b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,33 +23,41 @@ moshi = "1.15.1" lifecycle = "2.7.0" coroutines = "1.8.1" +room = "2.6.1" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" + + [libraries] +#Android +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +#UI: AndroidX, Jetpack Compose androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } -# Network +# Network: okhhtp3+retrofit2 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } -retrofit-simplexml = { module = "com.squareup.retrofit2:converter-simplexml", version.ref = "retrofit" } -# DI – Hilt +# Network-parse: Moshi+Gson +moshi = { group = "com.squareup.moshi", name = "moshi", version.ref = "moshi" } +moshiKotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "moshi" } +retrofitMoshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit" } +converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } +# DI: Hilt hiltandroid = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hiltcompiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } - -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } -kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } - - -moshi = { group="com.squareup.moshi", name="moshi", version.ref="moshi" } -moshiKotlin = { group="com.squareup.moshi", name="moshi-kotlin", version.ref="moshi" } -retrofitMoshi = { group="com.squareup.retrofit2", name="converter-moshi", version.ref="retrofit" } - -converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } - - - +# DB: Room +room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } [plugins] hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 26cd699..c7b07ce 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,3 +31,5 @@ include(":core:database") include(":feature:schedule") include(":feature:news") include(":feature:progress") + +