Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/website/rexml-3.2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
twyatt authored May 20, 2024
2 parents 24734bf + 22fc5dd commit ffe3f00
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ android-compile = "34"
android-min = "21"
android-target = "32"
compose = "1.6.2"
coroutines = "1.8.0"
coroutines = "1.8.1"
jacoco = "0.8.7"
jvm-toolchain = "11"
kotlin = "1.9.23"

[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" }

Expand Down

0 comments on commit ffe3f00

Please sign in to comment.