Skip to content

Commit

Permalink
Merge branch 'main' into renovate/com.juul.tuulbox-logging-7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
twyatt authored Dec 1, 2023
2 parents dba8a15 + fe32a3c commit 0fe4cf3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dokka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ agp = "8.1.4"
android-compile = "30"
android-min = "21"
jvm-toolchain = "11"
kotlin = "1.9.20"
kotlin = "1.9.21"

[libraries]
assertj = { module = "org.assertj:assertj-core", version = "3.24.2" }
kotlinpoet = { module = "com.squareup:kotlinpoet", version = "1.15.1" }
kotlinpoet = { module = "com.squareup:kotlinpoet", version = "1.15.2" }
kotlin-parcelize-runtime = { module = "org.jetbrains.kotlin:kotlin-parcelize-runtime", version.ref = "kotlin" }
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version = "1.9.20-1.0.14" }
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version = "1.9.21-1.0.15" }
ksp-testing = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version = "1.5.0" }
robolectric = { module = "org.robolectric:robolectric", version = "4.11.1" }
tuulbox-logging = { module = "com.juul.tuulbox:logging", version = "7.0.0" }
Expand Down

0 comments on commit 0fe4cf3

Please sign in to comment.