update libs

Author: softartdev

android-compose-app/build.gradle.kts

@@ -48,16 +48,19 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
+        targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = libs.versions.jdk.get()
     }
     tasks.withType<KotlinCompilationTask<*>>().configureEach {
         compilerOptions.freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
-    buildFeatures.compose = true
+    buildFeatures {
+        buildConfig = true
+        compose = true
+    }
     packagingOptions.resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
 }

desktop-compose-app/build.gradle.kts

@@ -9,7 +9,7 @@ group = "com.softartdev"
 kotlin {
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "11"
+            kotlinOptions.jvmTarget = libs.versions.jdk.get()
         }
     }
     applyDefaultHierarchyTemplate()

gradle.properties

@@ -17,6 +17,5 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
-android.defaults.buildfeatures.buildconfig=true
 
 xcodeproj=iosApp/iosApp.xcworkspace

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 compileSdk = "34"
 targetSdk = "34"
 minSdk = "21"
-
+jdk = "17"
 kotlin = "1.9.21"
-agp = "8.2.0"
+agp = "8.2.1"
 gms = "4.4.0"
 crashlytics = "2.9.9"
 compose = "1.5.11"
@@ -19,7 +19,7 @@ sqlcipherKtnPod = "1.4.2"
 decompose = "2.2.1-compose-experimental"
 koin = "3.5.0"
 kotlinx-datetime = "0.5.0"
-napier = "2.6.1"
+napier = "2.7.1"
 mokoResources = "0.23.0"
 materialThemePrefs = "0.6.1"
 androidxActivityCompose = "1.8.2"
@@ -35,7 +35,7 @@ androidxTest = "1.5.2"
 androidxTestOrchestrator = "1.4.2"
 googleAndroidMaterial = "1.11.0"
 firebase = "32.7.0"
-leakCanary = "2.12"
+leakCanary = "2.13"
 junit = "4.13.2"
 mockito = "5.2.0"
 turbine = "1.0.0"

jvm-compose-test/build.gradle.kts

@@ -9,9 +9,9 @@ compose {
 }
 
 java {
-    toolchain { languageVersion.set(JavaLanguageVersion.of(11)) }
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    toolchain { languageVersion.set(JavaLanguageVersion.of(libs.versions.jdk.get().toInt())) }
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
+    targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
 }
 
 dependencies {

settings.gradle.kts

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 dependencyResolutionManagement {

shared-compose-ui/build.gradle.kts

@@ -8,10 +8,10 @@ compose {
     kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
 }
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.jdk.get().toInt())
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "11"
+            kotlinOptions.jvmTarget = libs.versions.jdk.get()
         }
     }
     androidTarget()
@@ -52,7 +52,7 @@ android {
     compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig.minSdk = libs.versions.minSdk.get().toInt()
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
+        targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
     }
 }

shared/build.gradle.kts

@@ -38,11 +38,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
+        targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
     }
     tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = libs.versions.jdk.get()
         kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
     }
     packagingOptions.resources {
@@ -58,7 +58,7 @@ multiplatformResources {
     multiplatformResourcesPackage = "com.softartdev.notedelight"
 }
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.jdk.get().toInt())
     jvm()
     androidTarget()
     iosIntermediateSourceSets(iosArm64(), iosSimulatorArm64())