Update kotlin

android · May 21, 2024 · b890c15 · b890c15
1 parent b164378
commit b890c15
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/health-connect/HealthConnectSample/app/build.gradle b/health-connect/HealthConnectSample/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.12"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
     packagingOptions {
         resources {

diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.0.0'
     ext {
         activity_compose_version = '1.9.0'
         hilt_navigation_compose_version = '1.0.0'

diff --git a/health-platform-v1/HealthPlatformSample/app/build.gradle b/health-platform-v1/HealthPlatformSample/app/build.gradle
@@ -59,7 +59,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.12"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
     packagingOptions {
         resources {

diff --git a/health-platform-v1/HealthPlatformSample/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.0.0'
     ext {
         activity_compose_version = '1.9.0'
         hilt_navigation_compose_version = '1.2.0'

diff --git a/health-services/ExerciseSample/build.gradle b/health-services/ExerciseSample/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = "1.9.23"
+        kotlin_version = "2.0.0"
         hilt_version = '2.51.1'
         lifecycle_version = "2.8.0"
     }

diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ core-splashscreen = "1.0.1"
 dagger = "2.51.1"
 health-services = "1.0.0-rc02"
 horologist = "0.5.27"
-org-jetbrains-kotlin = "1.9.23"
+org-jetbrains-kotlin = "2.0.0"
 ui-test-junit4 = "1.6.7"
 robolectric = "4.12.2"
 roborazzi = "1.16.1"
@@ -32,7 +32,7 @@ androidx-material-icons-extended = { module = "androidx.compose.material:materia
 androidx-wear = "androidx.wear:wear:1.3.0"
 androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "ui-test-junit4" }
 androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "ui-test-junit4" }
-compose-compiler = "androidx.compose.compiler:compiler:1.5.12"
+compose-compiler = "androidx.compose.compiler:compiler:1.5.14"
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }

diff --git a/health-services/MeasureData/build.gradle b/health-services/MeasureData/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.9.23'
+        kotlin_version = '2.0.0'
         hilt_version = '2.51.1'
         lifecycle_version = '2.3.1'
     }

diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml
@@ -5,12 +5,12 @@ androidx-activity = "1.9.0"
 androidx-lifecycle = "2.8.0"
 androidx-wear-compose = "1.3.1"
 compose = "1.6.7"
-compose-compiler = "1.5.12"
+compose-compiler = "1.5.14"
 concurrent-futures = "1.1.0"
 guava = "33.2.0-android"
 health-services = "1.0.0-rc02"
 ktlint = "0.46.1"
-org-jetbrains-kotlin = "1.9.23"
+org-jetbrains-kotlin = "2.0.0"
 org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]

diff --git a/health-services/PassiveData/build.gradle b/health-services/PassiveData/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.9.23'
+        kotlin_version = '2.0.0'
         hilt_version = '2.51.1'
         lifecycle_version = '2.8.0'
     }

diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml
@@ -9,12 +9,12 @@ androidx-wear-tiles = "1.0.1"
 androidx-wear-watchface = "1.0.1"
 androidx-work = "2.9.0"
 compose = "1.6.7"
-compose-compiler = "1.5.12"
+compose-compiler = "1.5.14"
 concurrent-futures = "1.1.0"
 guava = "33.2.0-android"
 health-services = "1.0.0-rc02"
 ktlint = "0.46.1"
-org-jetbrains-kotlin = "1.9.23"
+org-jetbrains-kotlin = "2.0.0"
 org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]

diff --git a/health-services/PassiveGoals/build.gradle b/health-services/PassiveGoals/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = "1.9.23"
+        kotlin_version = "2.0.0"
         hilt_version = '2.51.1'
         lifecycle_version = "2.8.0"
     }

diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
@@ -9,12 +9,12 @@ androidx-wear-tiles = "1.0.1"
 androidx-wear-watchface = "1.0.1"
 androidx-work = "2.9.0"
 compose = "1.6.7"
-compose-compiler = "1.5.12"
+compose-compiler = "1.5.14"
 concurrent-futures = "1.1.0"
 guava = "33.2.0-android"
 health-services = "1.0.0-rc02"
 ktlint = "0.46.1"
-org-jetbrains-kotlin = "1.9.23"
+org-jetbrains-kotlin = "2.0.0"
 org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]