From ccd9fe9534255e2c570d2fd38b05f41cab0bab98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:00:00 +0100 Subject: [PATCH] fix(deps): update kotlin (#4774) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.devtools.ksp](https://goo.gle/ksp) ([source](https://redirect.github.com/google/ksp)) | `2.0.21-1.0.28` -> `2.1.0-1.0.29` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin/2.1.0-1.0.29?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin/2.1.0-1.0.29?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.28/2.1.0-1.0.29?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.28/2.1.0-1.0.29?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | org.jetbrains.kotlin.plugin.parcelize | `2.0.21` -> `2.1.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlin.plugin.parcelize:org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlin.plugin.parcelize:org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlin.plugin.parcelize:org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlin.plugin.parcelize:org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | org.jetbrains.kotlin.android | `2.0.21` -> `2.1.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin/2.0.21/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin/2.0.21/2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jetbrains.kotlinx:kotlinx-coroutines-test](https://redirect.github.com/Kotlin/kotlinx.coroutines) | `1.9.0` -> `1.10.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlinx:kotlinx-coroutines-test/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlinx:kotlinx-coroutines-test/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlinx:kotlinx-coroutines-test/1.9.0/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlinx:kotlinx-coroutines-test/1.9.0/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jetbrains.kotlinx:kotlinx-coroutines-android](https://redirect.github.com/Kotlin/kotlinx.coroutines) | `1.9.0` -> `1.10.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.kotlinx:kotlinx-coroutines-android/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.kotlinx:kotlinx-coroutines-android/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.kotlinx:kotlinx-coroutines-android/1.9.0/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.kotlinx:kotlinx-coroutines-android/1.9.0/1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/ksp (com.google.devtools.ksp) ### [`v2.1.0-1.0.29`](https://redirect.github.com/google/ksp/releases/tag/2.1.0-1.0.29) [Compare Source](https://redirect.github.com/google/ksp/compare/2.1.0-1.0.28...2.1.0-1.0.29) ##### Updates - KSP2: Sanitize dots to underscores in suffixes of internals by [@​ting-yuan](https://redirect.github.com/ting-yuan) in [https://github.com/google/ksp/pull/2229](https://redirect.github.com/google/ksp/pull/2229) - KSP2: clean up legacy incremental code by [@​ting-yuan](https://redirect.github.com/ting-yuan) in [https://github.com/google/ksp/pull/2231](https://redirect.github.com/google/ksp/pull/2231) ##### Contributors Thanks to everyone who reported bugs and participated in discussions! ### [`v2.1.0-1.0.28`](https://redirect.github.com/google/ksp/releases/tag/2.1.0-1.0.28) [Compare Source](https://redirect.github.com/google/ksp/compare/2.0.21-1.0.28...2.1.0-1.0.28) ##### What's Changed - Bump Kotlin to 2.1.0 by [@​mkmuir0](https://redirect.github.com/mkmuir0) in [https://github.com/google/ksp/pull/2235](https://redirect.github.com/google/ksp/pull/2235) - Update intellij to 233.13135.128 by [@​ting-yuan](https://redirect.github.com/ting-yuan) in [https://github.com/google/ksp/pull/2238](https://redirect.github.com/google/ksp/pull/2238) **Full Changelog**: https://github.com/google/ksp/compare/2.1.0-RC2-1.0.28...2.1.0-1.0.28
Kotlin/kotlinx.coroutines (org.jetbrains.kotlinx:kotlinx-coroutines-test) ### [`v1.10.1`](https://redirect.github.com/Kotlin/kotlinx.coroutines/blob/HEAD/CHANGES.md#Version-1101) [Compare Source](https://redirect.github.com/Kotlin/kotlinx.coroutines/compare/1.10.0...1.10.1) - Fixed binary incompatibility introduced for non-JVM targets in [#​4261](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4261) ([#​4309](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4309)). ### [`v1.10.0`](https://redirect.github.com/Kotlin/kotlinx.coroutines/blob/HEAD/CHANGES.md#Version-1100) [Compare Source](https://redirect.github.com/Kotlin/kotlinx.coroutines/compare/1.9.0...1.10.0) - Kotlin was updated to 2.1.0 ([#​4284](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4284)). - Introduced `Flow.any`, `Flow.all`, and `Flow.none` ([#​4212](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4212)). Thanks, [@​CLOVIS-AI](https://redirect.github.com/CLOVIS-AI)! - Reorganized `kotlinx-coroutines-debug` and `kotlinx-coroutines-core` code to avoid a split package between the two artifacts ([#​4247](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4247)). Note that directly referencing `kotlinx.coroutines.debug.AgentPremain` must now be replaced with `kotlinx.coroutines.debug.internal.AgentPremain`. Thanks, [@​sellmair](https://redirect.github.com/sellmair)! - No longer shade byte-buddy in `kotlinx-coroutines-debug`, reducing the artifact size and simplifying the build configuration of client code. Thanks, [@​sellmair](https://redirect.github.com/sellmair)! - Fixed `NullPointerException` when using Java-deserialized `kotlinx-coroutines-core` exceptions ([#​4291](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4291)). Thanks, [@​AlexRiedler](https://redirect.github.com/AlexRiedler)! - Properly report exceptions thrown by `CoroutineDispatcher.dispatch` instead of raising internal errors ([#​4091](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4091)). Thanks, [@​zuevmaxim](https://redirect.github.com/zuevmaxim)! - Fixed a bug that delayed scheduling of a `Dispatchers.Default` or `Dispatchers.IO` task after a `yield()` in rare scenarios ([#​4248](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4248)). - Fixed a bug that prevented the `main()` coroutine on Wasm/WASI from executing after a `delay()` call in some scenarios ([#​4239](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4239)). - Fixed scheduling of `runBlocking` tasks on Kotlin/Native that arrive after the `runBlocking` block was exited ([#​4245](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4245)). - Fixed some terminal `Flow` operators sometimes resuming without taking cancellation into account ([#​4254](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4254)). Thanks, [@​jxdabc](https://redirect.github.com/jxdabc)! - Fixed a bug on the JVM that caused coroutine-bound `ThreadLocal` values not to get cleaned when using non-`CoroutineDispatcher` continuation interceptors ([#​4296](https://redirect.github.com/Kotlin/kotlinx.coroutines/issues/4296)). - Small tweaks, fixes, and documentation improvements.
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/tuskyapp/Tusky). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Conny Duck Co-authored-by: Konrad Pozniak --- app/lint.xml | 6 + .../compose/ComposeTokenizerTest.kt | 2 +- .../components/compose/StatusLengthTest.kt | 2 +- .../tusky/util/LinkHelperTest.kt | 2 +- .../tusky/util/NumberUtilsTest.kt | 2 +- gradle/libs.versions.toml | 6 +- gradle/verification-metadata.xml | 356 ++++++++++++++++++ 7 files changed, 369 insertions(+), 7 deletions(-) diff --git a/app/lint.xml b/app/lint.xml index 88ad21f05..4092b89ac 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -71,6 +71,12 @@ + + + + + diff --git a/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeTokenizerTest.kt b/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeTokenizerTest.kt index c7988c181..c745c0045 100644 --- a/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeTokenizerTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/components/compose/ComposeTokenizerTest.kt @@ -30,7 +30,7 @@ class ComposeTokenizerTest( companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun data(): Iterable { + fun data(): Iterable> { return listOf( arrayOf("@mention", 0, 8), arrayOf("@ment10n", 0, 8), diff --git a/app/src/test/java/com/keylesspalace/tusky/components/compose/StatusLengthTest.kt b/app/src/test/java/com/keylesspalace/tusky/components/compose/StatusLengthTest.kt index b833be6ff..37a19b2ed 100644 --- a/app/src/test/java/com/keylesspalace/tusky/components/compose/StatusLengthTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/components/compose/StatusLengthTest.kt @@ -35,7 +35,7 @@ class StatusLengthTest( companion object { @ParameterizedRobolectricTestRunner.Parameters(name = "{0}") @JvmStatic - fun data(): Iterable { + fun data(): Iterable> { return listOf( arrayOf("", 0), arrayOf(" ", 1), diff --git a/app/src/test/java/com/keylesspalace/tusky/util/LinkHelperTest.kt b/app/src/test/java/com/keylesspalace/tusky/util/LinkHelperTest.kt index 38ce2abb3..376fc7abf 100644 --- a/app/src/test/java/com/keylesspalace/tusky/util/LinkHelperTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/util/LinkHelperTest.kt @@ -403,7 +403,7 @@ class LinkHelperTest { companion object { @Parameterized.Parameters(name = "match_{0}") @JvmStatic - fun data(): Iterable { + fun data(): Iterable> { return listOf( arrayOf("https://mastodon.foo.bar/@User", true), arrayOf("http://mastodon.foo.bar/@abc123", true), diff --git a/app/src/test/java/com/keylesspalace/tusky/util/NumberUtilsTest.kt b/app/src/test/java/com/keylesspalace/tusky/util/NumberUtilsTest.kt index 08b5dd5a7..8de0f885b 100644 --- a/app/src/test/java/com/keylesspalace/tusky/util/NumberUtilsTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/util/NumberUtilsTest.kt @@ -35,7 +35,7 @@ class NumberUtilsTest(private val input: Long, private val want: String) { @Parameterized.Parameters(name = "formatNumber_{0}") @JvmStatic - fun data(): Iterable { + fun data(): Iterable> { return listOf( arrayOf(0, "0"), arrayOf(1, "1"), diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f3bda80b8..1668710bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ androidx-work = "2.9.1" androidx-room = "2.6.1" bouncycastle = "1.70" conscrypt = "2.5.3" -coroutines = "1.9.0" +coroutines = "1.10.1" diffx = "1.1.1" emoji2 = "1.4.0" filemoji-compat = "3.2.7" @@ -33,7 +33,7 @@ glide = "4.16.0" # Deliberate downgrade, https://github.com/tuskyapp/Tusky/issues/3631 glide-animation-plugin = "3.0.2" hilt = "2.55" -kotlin = "2.0.21" +kotlin = "2.1.0" image-cropper = "4.3.2" material = "1.12.0" material-drawer = "9.0.2" @@ -54,7 +54,7 @@ xmlwriter = "1.0.4" [plugins] android-application = { id = "com.android.application", version.ref = "agp" } -google-ksp = "com.google.devtools.ksp:2.0.21-1.0.28" +google-ksp = "com.google.devtools.ksp:2.1.0-1.0.29" hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 251f26764..8d46ae61e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -9959,6 +9959,11 @@ + + + + + @@ -10039,6 +10044,14 @@ + + + + + + + + @@ -10145,6 +10158,14 @@ + + + + + + + + @@ -10225,6 +10246,14 @@ + + + + + + + + @@ -10305,6 +10334,14 @@ + + + + + + + + @@ -10385,6 +10422,14 @@ + + + + + + + + @@ -12392,6 +12437,14 @@ + + + + + + + + @@ -12449,6 +12502,14 @@ + + + + + + + + @@ -12481,6 +12542,14 @@ + + + + + + + + @@ -12513,6 +12582,14 @@ + + + + + + + + @@ -12545,6 +12622,14 @@ + + + + + + + + @@ -12585,6 +12670,14 @@ + + + + + + + + @@ -12617,6 +12710,14 @@ + + + + + + + + @@ -12649,6 +12750,14 @@ + + + + + + + + @@ -12689,6 +12798,14 @@ + + + + + + + + @@ -12721,6 +12838,14 @@ + + + + + + + + @@ -12753,6 +12878,14 @@ + + + + + + + + @@ -12785,6 +12918,14 @@ + + + + + + + + @@ -12817,6 +12958,14 @@ + + + + + + + + @@ -12849,6 +12998,14 @@ + + + + + + + + @@ -12881,6 +13038,14 @@ + + + + + + + + @@ -12913,6 +13078,14 @@ + + + + + + + + @@ -12945,6 +13118,14 @@ + + + + + + + + @@ -12977,6 +13158,14 @@ + + + + + + + + @@ -13031,6 +13220,14 @@ + + + + + + + + @@ -13063,6 +13260,14 @@ + + + + + + + + @@ -13098,6 +13303,14 @@ + + + + + + + + @@ -13170,6 +13383,14 @@ + + + + + + + + @@ -13202,6 +13423,14 @@ + + + + + + + + @@ -13234,6 +13463,14 @@ + + + + + + + + @@ -13266,6 +13503,14 @@ + + + + + + + + @@ -13298,6 +13543,14 @@ + + + + + + + + @@ -13419,6 +13672,17 @@ + + + + + + + + + + + @@ -13480,6 +13744,11 @@ + + + + + @@ -13624,6 +13893,14 @@ + + + + + + + + @@ -13656,6 +13933,14 @@ + + + + + + + + @@ -13688,6 +13973,22 @@ + + + + + + + + + + + + + + + + @@ -13708,6 +14009,11 @@ + + + + + @@ -13728,6 +14034,11 @@ + + + + + @@ -13744,6 +14055,14 @@ + + + + + + + + @@ -13768,6 +14087,11 @@ + + + + + @@ -13793,6 +14117,14 @@ + + + + + + + + @@ -13827,6 +14159,14 @@ + + + + + + + + @@ -13872,6 +14212,14 @@ + + + + + + + + @@ -13888,6 +14236,14 @@ + + + + + + + +