adjust version catalog

diasDominik · Feb 25, 2024 · 6e3d638 · 6e3d638
1 parent ed10c17
commit 6e3d638
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -28,7 +28,7 @@ android {
         }
     }
 
-    kotlin.jvmToolchain(17)
+    kotlin.jvmToolchain(libs.versions.java.jdk.get().toInt())
 
 }
 

diff --git a/extensions/build.gradle.kts b/extensions/build.gradle.kts
@@ -18,7 +18,7 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-    kotlin.jvmToolchain(17)
+    kotlin.jvmToolchain(libs.versions.java.jdk.get().toInt())
 }
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@ activityCompose = "1.8.2"
 agp = "8.3.0-rc02"
 androidx-room = "2.6.1"
 composeBom = "2024.02.01"
+composeCompiler = "1.5.10"
 composeFoundation = "1.3.0"
 composeMaterial = "1.3.0"
 constraintlayout = "2.1.4"
@@ -24,13 +25,15 @@ tiles = "1.3.0"
 tilesMaterial = "1.3.0"
 watchfaceComplicationsDataSourceKtx = "1.2.1"
 wear-tooling-preview = "1.0.0"
+java-jdk = "17"
 
 [libraries]
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
 androidx-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "composeFoundation" }
 androidx-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
@@ -19,9 +19,9 @@ android {
 
     buildFeatures.compose = true
 
-    composeOptions.kotlinCompilerExtensionVersion = "1.5.10"
+    composeOptions.kotlinCompilerExtensionVersion = libs.androidx.compose.compiler.toString()
 
-    kotlin.jvmToolchain(17)
+    kotlin.jvmToolchain(libs.versions.java.jdk.get().toInt())
 
     buildTypes {
         release {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,8 +1,5 @@
 @file:Suppress("UnstableApiUsage")
 
-include(":extensions")
-
-
 pluginManagement {
     repositories {
         google {
@@ -28,3 +25,4 @@ rootProject.name = "Gym Rest Timer"
 include(":mobile")
 include(":wear")
 include(":database")
+include(":extensions")
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
@@ -18,9 +18,9 @@ android {
         }
     }
 
-    kotlin.jvmToolchain(17)
+    kotlin.jvmToolchain(libs.versions.java.jdk.get().toInt())
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion = "1.5.10"
+    composeOptions.kotlinCompilerExtensionVersion = libs.androidx.compose.compiler.toString()
 
     buildTypes {
         release {