Merge branch 'main' into twyatt/project-name

JuulLabs · May 21, 2024 · e68b1b6 · e68b1b6
2 parents 90d16e9 + e83b034
commit e68b1b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           arguments: check jacocoTestReport
 
-      - uses: EnricoMi/publish-unit-test-result-action/composite@v2
+      - uses: EnricoMi/publish-unit-test-result-action/macos@v2
         with:
           junit_files: '**/build/test-results/**/*.xml'
           report_individual_runs: 'true'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,22 +3,22 @@ agp = "8.4.0" # 7.4.1 is the maximum version supported by IDEA 2023.1
 android-compile = "34"
 android-min = "21"
 android-target = "32"
-compose = "1.6.2"
-coroutines = "1.8.0"
+compose = "1.6.10"
+coroutines = "1.8.1"
 jacoco = "0.8.7"
 jvm-toolchain = "11"
-kotlin = "1.9.23"
+kotlin = "1.9.24"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.0" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
-androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.7.0" }
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.8.0" }
 androidx-test = { module = "androidx.test:core", version = "1.5.0" }
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-js = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.5.0" }
+datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.0" }
 material = { module = "com.google.android.material:material", version = "1.12.0" }
 robolectric = { module = "org.robolectric:robolectric", version = "4.12.1" }
 

diff --git a/website/Gemfile.lock b/website/Gemfile.lock
@@ -76,14 +76,16 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass-embedded (1.69.7-arm64-darwin)
       google-protobuf (~> 3.25)
     sass-embedded (1.69.7-x86_64-linux-gnu)
       google-protobuf (~> 3.25)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.5.0)