Merge pull request #1728 from DimensionDev/dependabot/gradle/ktor-3.4.0

Bump ktor from 3.3.3 to 3.4.0

Author: Tlaster

gradle/libs.versions.toml

@@ -26,7 +26,7 @@ kotlinx-collections-immutable = "0.4.0"
 kotlinx-serialization = "1.10.0"
 coil3 = "3.3.0"
 ktorfit = "2.7.2"
-ktor = "3.3.3"
+ktor = "3.4.0"
 platformtoolsDarkmodedetector = "0.7.5"
 prettytime = "5.0.9.Final"
 reorderable = "3.0.0"

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/bluesky/BlueskyService.kt

@@ -11,7 +11,6 @@ import io.ktor.client.plugins.api.createClientPlugin
 import io.ktor.client.request.HttpRequestPipeline
 import io.ktor.http.Url
 import io.ktor.util.AttributeKey
-import io.ktor.util.encodeBase64
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flowOf
@@ -20,6 +19,7 @@ import sh.christian.ozone.BlueskyApi
 import sh.christian.ozone.XrpcBlueskyApi
 import sh.christian.ozone.oauth.OAuthApi
 import sh.christian.ozone.oauth.OAuthCodeChallengeMethod
+import kotlin.io.encoding.Base64
 
 // compatibility support for darwin (iOS, macOS) since Ktor's SHA-256 implementation is not available there
 // see: https://github.com/ktorio/ktor/blob/477d76409fec6c2d71683817c6060f1b2afdcbb2/ktor-utils/posix/src/io/ktor/util/CryptoNative.kt#L25C57-L25C92
@@ -35,7 +35,12 @@ internal data object OAuthCodeChallengeMethodS256 : OAuthCodeChallengeMethod("S2
         return base64UrlSafe
     }
 
-    private fun ByteArray.encodeBase64Url(): String = encodeBase64().trimEnd('=').replace('+', '-').replace('/', '_')
+    private fun ByteArray.encodeBase64Url(): String =
+        Base64
+            .encode(this)
+            .trimEnd('=')
+            .replace('+', '-')
+            .replace('/', '_')
 }
 
 internal data class BlueskyService private constructor(

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/xqt/elonmusk114514/ElonMusk1145141919810.kt

@@ -6,12 +6,11 @@ import dev.whyoleg.cryptography.CryptographyProvider
 import dev.whyoleg.cryptography.algorithms.SHA256
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
-import io.ktor.util.decodeBase64Bytes
-import io.ktor.util.encodeBase64
-import kotlinx.serialization.Serializable
 import kotlin.experimental.xor
+import kotlin.io.encoding.Base64
 import kotlin.random.Random
 import kotlin.time.Clock
+import kotlinx.serialization.Serializable
 
 internal object ElonMusk1145141919810 {
     @Serializable
@@ -29,9 +28,9 @@ internal object ElonMusk1145141919810 {
             .hasher()
             .hash(data.encodeToByteArray())
 
-    fun encodeBase64(data: ByteArray): String = data.encodeBase64()
+    fun encodeBase64(data: ByteArray): String = Base64.encode(data)
 
-    fun decodeBase64(data: String): ByteArray = data.decodeBase64Bytes()
+    fun decodeBase64(data: String): ByteArray = Base64.decode(data)
 
     suspend fun senpaiSukissu(
         method: String,

shared/src/commonMain/kotlin/dev/dimension/flare/model/PlatformType.kt

@@ -1,8 +1,8 @@
 package dev.dimension.flare.model
 
 import androidx.compose.runtime.Immutable
-import io.ktor.util.decodeBase64String
 import kotlinx.serialization.Serializable
+import kotlin.io.encoding.Base64
 
 @Immutable
 @Serializable
@@ -35,10 +35,10 @@ public val PlatformType.logoUrl: String
 
 public val xqtOldHost: String =
     buildString {
-        append("dHc=".decodeBase64String())
-        append("aXR0".decodeBase64String())
-        append("ZXI=".decodeBase64String())
-        append("LmNvbQ==".decodeBase64String())
+        append(Base64.decode("dHc=").decodeToString())
+        append(Base64.decode("aXR0").decodeToString())
+        append(Base64.decode("ZXI=").decodeToString())
+        append(Base64.decode("LmNvbQ==").decodeToString())
     }
 
 public val xqtHost: String =
@@ -49,25 +49,25 @@ public val xqtHost: String =
 
 public val vvo: String =
     buildString {
-        append("d2Vp".decodeBase64String())
-        append("Ym8=".decodeBase64String())
+        append(Base64.decode("d2Vp").decodeToString())
+        append(Base64.decode("Ym8=").decodeToString())
     }
 
 public val vvoHost: String =
     buildString {
-        append("bS53".decodeBase64String())
-        append("ZWli".decodeBase64String())
-        append("by5jbg==".decodeBase64String())
+        append(Base64.decode("bS53").decodeToString())
+        append(Base64.decode("ZWli").decodeToString())
+        append(Base64.decode("by5jbg==").decodeToString())
     }
 
 public val vvoHostShort: String =
     buildString {
         append(vvo)
-        append("LmNu".decodeBase64String())
+        append(Base64.decode("LmNu").decodeToString())
     }
 
 public val vvoHostLong: String =
     buildString {
-        append("d2Vp".decodeBase64String())
-        append("Ym8uY29t".decodeBase64String())
+        append(Base64.decode("d2Vp").decodeToString())
+        append(Base64.decode("Ym8uY29t").decodeToString())
     }

shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt

@@ -7,12 +7,12 @@ import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.ui.model.UiTimeline
 import dev.dimension.flare.ui.render.toUi
 import io.ktor.http.Url
-import io.ktor.util.encodeBase64
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.Month
 import kotlinx.datetime.UtcOffset
 import kotlinx.datetime.toInstant
+import kotlin.io.encoding.Base64
 import kotlin.time.Instant
 
 internal fun StatusContent.Rss.RssContent.render(): UiTimeline =
@@ -132,7 +132,7 @@ internal fun StatusContent.Rss.RssContent.RDF.render(): UiTimeline =
 
 internal fun MicroBlogKey.Companion.fromRss(url: String) =
     MicroBlogKey(
-        id = url.encodeBase64(),
+        id = Base64.encode(url.encodeToByteArray()),
         host = "RSS",
     )