Skip to content

Commit be35826

Browse files
committed
Update Develocity plugin and configure Kotlin JVM target
- Updated `com.gradle.develocity` plugin to version `4.1` in `settings.gradle.kts`. - Set `kotlin.compilerOptions.jvmTarget` in `android-compose-app/build.gradle.kts` using `JvmTarget.fromTarget()` and removed the redundant `kotlinOptions { jvmTarget }` block.
1 parent 98459cb commit be35826

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

android-compose-app/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
44
import com.google.firebase.crashlytics.buildtools.gradle.tasks.UploadMappingFileTask
5+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
56
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
67

78
plugins {
@@ -13,6 +14,9 @@ plugins {
1314
alias(libs.plugins.crashlytics)
1415
}
1516
apply(from = "$rootDir/gradle/common-android-sign-conf.gradle")
17+
18+
kotlin.compilerOptions.jvmTarget = JvmTarget.fromTarget(libs.versions.jdk.get())
19+
1620
android {
1721
namespace = "com.softartdev.notedelight"
1822
compileSdk = libs.versions.compileSdk.get().toInt()
@@ -47,9 +51,6 @@ android {
4751
sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
4852
targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
4953
}
50-
kotlinOptions {
51-
jvmTarget = libs.versions.jdk.get()
52-
}
5354
tasks.withType<KotlinCompilationTask<*>>().configureEach {
5455
compilerOptions.freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
5556
}

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pluginManagement {
2424

2525
plugins {
2626
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
27+
id("com.gradle.develocity") version "4.1"
2728
}
2829

2930
dependencyResolutionManagement {

0 commit comments

Comments
 (0)