Merge branch 'main' into renovate/kotlin

JuulLabs · Sep 5, 2023 · 26b3651 · 26b3651
2 parents 6022d8e + 92ba9d5
commit 26b3651
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 android-compile = "31"
-coroutines = "1.7.2"
+coroutines = "1.7.3"
 jacoco = "0.8.7"
 jvm-toolchain = "8"
 kotlin = "1.9.0"
@@ -11,7 +11,7 @@ androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.1
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.0" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.1" }
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
@@ -21,6 +21,6 @@ android-library = { id = "com.android.library", version = "8.0.2" }
 android-publish = { id = "com.vanniktech.maven.publish", version = "0.25.3" }
 atomicfu = { id = "kotlinx-atomicfu", version = "0.21.0" }
 binary-compatibility-validator = { id = "binary-compatibility-validator", version = "0.13.0" }
-dokka = { id = "org.jetbrains.dokka", version = "1.8.20" }
+dokka = { id = "org.jetbrains.dokka", version = "1.9.0" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlinter = { id = "org.jmailen.kotlinter", version = "3.15.0" }
+kotlinter = { id = "org.jmailen.kotlinter", version = "3.16.0" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -27,7 +27,7 @@ pluginManagement {
 plugins {
     // Provides repositories for auto-downloading JVM toolchains.
     // https://github.com/gradle/foojay-toolchains
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
 include(
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ env: @@
     jobs:
       deploy:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
           - uses: actions/checkout@v3
@@ Expand Down @@