Merge branch 'main' into renovate/ktor

JuulLabs · Dec 20, 2024 · fcda8c2 · fcda8c2
2 parents feca788 + 07d1204
commit fcda8c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,8 @@
 [versions]
-android-compile = "34"
 android-agp = "8.7.3"
+android-compile = "34"
 android-tools = "31.7.3" # If the AGP version is X.Y.Z, then the Lint library version is X+23.Y.Z.
+atomicfu = "0.26.1"
 jacoco = "0.8.7"
 jvm-target = "1.8"
 kotlin = "2.1.0"
@@ -12,8 +13,9 @@ android-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "
 android-lint-test = { module = "com.android.tools.lint:lint-tests", version.ref = "android-tools" }
 androidx-test-junit = "androidx.test.ext:junit:1.2.1"
 androidx-test-runner = "androidx.test:runner:1.6.2"
+atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
 junit = "junit:junit:4.13.2"
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.9.0" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.10.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" }
@@ -22,8 +24,8 @@ robolectric = "org.robolectric:robolectric:4.14.1"
 [plugins]
 android-library = { id = "com.android.library", version.ref = "android-agp" }
 android-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
-api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version = "0.26.1" }
+api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" }
+atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinter = { id = "org.jmailen.kotlinter", version = "5.0.1" }
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.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

diff --git a/khronicle-core/build.gradle.kts b/khronicle-core/build.gradle.kts
@@ -29,6 +29,12 @@ kotlin {
             languageSettings.optIn("com.juul.khronicle.KhronicleInternal")
         }
 
+        androidMain.dependencies {
+            // Workaround for AtomicFU plugin not automatically adding JVM dependency for Android.
+            // https://github.com/Kotlin/kotlinx-atomicfu/issues/145
+            implementation(libs.atomicfu)
+        }
+
         androidUnitTest.dependencies {
             implementation(libs.androidx.test.junit)
             implementation(libs.androidx.test.runner)