diff --git a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts index 861604708..8beff4844 100644 --- a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts +++ b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts @@ -29,7 +29,7 @@ android { viewBinding = true // for the samples } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlin { + jvmToolchain(JavaVersion.VERSION_17.majorVersion.toInt()) } } diff --git a/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts index 8787d65f5..f8a3e2d8c 100644 --- a/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts +++ b/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts @@ -6,8 +6,8 @@ configure { compileSdkVersion(33) compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { @@ -16,9 +16,9 @@ configure { } packagingOptions { - merges.apply { - add("META-INF/LGPL2.1") - add("META-INF/AL2.0") + resources { + merges.add("META-INF/LGPL2.1") + merges.add("META-INF/AL2.0") } } diff --git a/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts b/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts index 7e6076e55..4440af777 100644 --- a/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts +++ b/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts @@ -5,7 +5,7 @@ val kotlinLanguageVersion = "1.7" tasks.withType().configureEach { kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() // TODO: fix all warnings before // allWarningsAsErrors = true diff --git a/build.gradle.kts b/build.gradle.kts index 4d901ee6a..6073dce8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ val detektAll = tasks.register("detektAll") { exclude("**/resources/**") exclude("**/build/**") reports { - xml.enabled = false - html.enabled = false + xml.required.set(false) + html.required.set(false) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6732693d9..7579d2d80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ thirdPartyReport = "0.18.956" # plugins kotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } androidPlugin = "com.android.tools.build:gradle:8.1.4" -versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.39.0" +versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.50.0" thirdPartyReportPlugin = { module = "com.kaspersky.gradle:third-party-report", version.ref = "thirdPartyReport" } airPlugin = { module = "com.kaspersky.gradle:air", version.ref = "thirdPartyReport" }