From fe87dabe31927f9b0ed7d6019ce20e7a13328d86 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Fri, 15 Mar 2024 09:49:24 +0300 Subject: [PATCH] Update project --- android-app/build.gradle.kts | 4 ++-- benchmark/build.gradle.kts | 4 ++-- core/analytics/build.gradle.kts | 4 ++-- core/common/build.gradle.kts | 4 ++-- core/interactor/build.gradle.kts | 4 ++-- core/navigation/build.gradle.kts | 4 ++-- core/network/build.gradle.kts | 4 ++-- core/notifications/build.gradle.kts | 4 ++-- core/persistence/build.gradle.kts | 4 ++-- core/platform-services/foss/build.gradle.kts | 4 ++-- core/platform-services/gms/build.gradle.kts | 4 ++-- core/platform-services/hms/build.gradle.kts | 4 ++-- core/platform-services/inject/build.gradle.kts | 4 ++-- core/platform-services/interactor/build.gradle.kts | 4 ++-- core/repository/build.gradle.kts | 4 ++-- core/ui/build.gradle.kts | 4 ++-- core/widget/build.gradle.kts | 4 ++-- core/work/build.gradle.kts | 4 ++-- feature/account-impl/build.gradle.kts | 4 ++-- feature/account/build.gradle.kts | 4 ++-- feature/auth-impl/build.gradle.kts | 4 ++-- feature/auth/build.gradle.kts | 4 ++-- feature/details-impl/build.gradle.kts | 4 ++-- feature/details/build.gradle.kts | 4 ++-- feature/feed-impl/build.gradle.kts | 4 ++-- feature/feed/build.gradle.kts | 4 ++-- feature/gallery-impl/build.gradle.kts | 4 ++-- feature/gallery/build.gradle.kts | 4 ++-- feature/search-impl/build.gradle.kts | 4 ++-- feature/search/build.gradle.kts | 4 ++-- feature/settings-impl/build.gradle.kts | 4 ++-- feature/settings/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 1 + instant/build.gradle.kts | 4 ++-- 34 files changed, 67 insertions(+), 66 deletions(-) diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts index 554780dd1..4c47a8470 100644 --- a/android-app/build.gradle.kts +++ b/android-app/build.gradle.kts @@ -150,8 +150,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 554a3361c..8e985e555 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } targetProjectPath = ":android-app" diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index a57b1826a..68f9dc67a 100644 --- a/core/analytics/build.gradle.kts +++ b/core/analytics/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 02ff6b951..e54175e0f 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -31,8 +31,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/interactor/build.gradle.kts b/core/interactor/build.gradle.kts index 8ddb7be4a..178425144 100644 --- a/core/interactor/build.gradle.kts +++ b/core/interactor/build.gradle.kts @@ -28,8 +28,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts index 9a6d6b17a..5cf64e0b6 100644 --- a/core/navigation/build.gradle.kts +++ b/core/navigation/build.gradle.kts @@ -21,8 +21,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 3f356d263..5534c0f67 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -36,8 +36,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/notifications/build.gradle.kts b/core/notifications/build.gradle.kts index bf9303ff1..fac56a78f 100644 --- a/core/notifications/build.gradle.kts +++ b/core/notifications/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/persistence/build.gradle.kts b/core/persistence/build.gradle.kts index 5b8911327..1a8ae8564 100644 --- a/core/persistence/build.gradle.kts +++ b/core/persistence/build.gradle.kts @@ -26,8 +26,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/platform-services/foss/build.gradle.kts b/core/platform-services/foss/build.gradle.kts index 68e31693b..7e5c50035 100644 --- a/core/platform-services/foss/build.gradle.kts +++ b/core/platform-services/foss/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/platform-services/gms/build.gradle.kts b/core/platform-services/gms/build.gradle.kts index f62c39ba2..062158c4f 100644 --- a/core/platform-services/gms/build.gradle.kts +++ b/core/platform-services/gms/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/platform-services/hms/build.gradle.kts b/core/platform-services/hms/build.gradle.kts index 7b473a4f6..4636e45d0 100644 --- a/core/platform-services/hms/build.gradle.kts +++ b/core/platform-services/hms/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/platform-services/inject/build.gradle.kts b/core/platform-services/inject/build.gradle.kts index 6babe6fbf..f81757646 100644 --- a/core/platform-services/inject/build.gradle.kts +++ b/core/platform-services/inject/build.gradle.kts @@ -36,8 +36,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/platform-services/interactor/build.gradle.kts b/core/platform-services/interactor/build.gradle.kts index 19e7b1206..b688ca153 100644 --- a/core/platform-services/interactor/build.gradle.kts +++ b/core/platform-services/interactor/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/repository/build.gradle.kts b/core/repository/build.gradle.kts index 3120a2872..62ae39875 100644 --- a/core/repository/build.gradle.kts +++ b/core/repository/build.gradle.kts @@ -22,8 +22,8 @@ android { }*/ compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } kotlinOptions { diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 19a168fad..b04f0ad5c 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/core/widget/build.gradle.kts b/core/widget/build.gradle.kts index 7c6588a2f..b651bfd4b 100644 --- a/core/widget/build.gradle.kts +++ b/core/widget/build.gradle.kts @@ -32,8 +32,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } kotlinOptions { diff --git a/core/work/build.gradle.kts b/core/work/build.gradle.kts index 17d008553..990ac5b11 100644 --- a/core/work/build.gradle.kts +++ b/core/work/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/account-impl/build.gradle.kts b/feature/account-impl/build.gradle.kts index 2d051540d..fc4e8b44c 100644 --- a/feature/account-impl/build.gradle.kts +++ b/feature/account-impl/build.gradle.kts @@ -37,8 +37,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/account/build.gradle.kts b/feature/account/build.gradle.kts index 87497dd6a..5324079a7 100644 --- a/feature/account/build.gradle.kts +++ b/feature/account/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/auth-impl/build.gradle.kts b/feature/auth-impl/build.gradle.kts index 25ad131c5..1eaf43469 100644 --- a/feature/auth-impl/build.gradle.kts +++ b/feature/auth-impl/build.gradle.kts @@ -37,8 +37,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts index f4ce1a863..a0e8cb36d 100644 --- a/feature/auth/build.gradle.kts +++ b/feature/auth/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/details-impl/build.gradle.kts b/feature/details-impl/build.gradle.kts index bd0c2d628..c680a4528 100644 --- a/feature/details-impl/build.gradle.kts +++ b/feature/details-impl/build.gradle.kts @@ -38,8 +38,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/details/build.gradle.kts b/feature/details/build.gradle.kts index 5fa4f8b91..83d86ad62 100644 --- a/feature/details/build.gradle.kts +++ b/feature/details/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/feed-impl/build.gradle.kts b/feature/feed-impl/build.gradle.kts index c9fe83af6..a6749e0e4 100644 --- a/feature/feed-impl/build.gradle.kts +++ b/feature/feed-impl/build.gradle.kts @@ -38,8 +38,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/feed/build.gradle.kts b/feature/feed/build.gradle.kts index 03fd62d3e..1118ce895 100644 --- a/feature/feed/build.gradle.kts +++ b/feature/feed/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/gallery-impl/build.gradle.kts b/feature/gallery-impl/build.gradle.kts index 6ad08a2b2..a5c387e2e 100644 --- a/feature/gallery-impl/build.gradle.kts +++ b/feature/gallery-impl/build.gradle.kts @@ -37,8 +37,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/gallery/build.gradle.kts b/feature/gallery/build.gradle.kts index 9496764a9..3c36b52a6 100644 --- a/feature/gallery/build.gradle.kts +++ b/feature/gallery/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/search-impl/build.gradle.kts b/feature/search-impl/build.gradle.kts index ac564be7a..6e3211809 100644 --- a/feature/search-impl/build.gradle.kts +++ b/feature/search-impl/build.gradle.kts @@ -38,8 +38,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts index bbbc8d6ef..d2f17def5 100644 --- a/feature/search/build.gradle.kts +++ b/feature/search/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/settings-impl/build.gradle.kts b/feature/settings-impl/build.gradle.kts index 988ac6f15..5378950a7 100644 --- a/feature/settings-impl/build.gradle.kts +++ b/feature/settings-impl/build.gradle.kts @@ -38,8 +38,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index c11ef7cbf..bde51c0ab 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } lint { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b80aba91..1ac16a52f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ min-sdk = "23" compile-sdk = "34" target-sdk = "34" +jdk = "17" gradle = "8.3.0" kotlin = "1.9.22" kotlin-ksp = "1.9.23-1.0.19" diff --git a/instant/build.gradle.kts b/instant/build.gradle.kts index 99210432a..43bb452ca 100644 --- a/instant/build.gradle.kts +++ b/instant/build.gradle.kts @@ -33,8 +33,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) + targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt()) } }