Lint

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -13,7 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - .
 
 ### Fixed
-- .
+- (WebUI) Handle serving non-default webui with "bundled"
 
 ## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08
 
@@ -89,7 +89,7 @@ See our [conversion server](https://github.com/Suwayomi/Suwayomi-converter) for
 - (**Cloudflare/flaresolverr**) Fix sending POST requests as GET to flaresolverr
 
 ### WebUI
-- [See WebUI changes here][WebUI: v20250703.01]
+- [See WebUI changes here][WebUI: v20260508.01]
 
 ### Contributors
 @cpiber, @Syer10, @lamaxama, @schroda, @AwkwardPeak7, @ItsGlassPlus1, @manti-X, @Youwes09, @renovate[bot], @D-Brox, @weblate, @Micka149, @TheRay82, @UnknownSkyrimPasserby, @KaceyKoo-gif, @333fred, @KolbyML, @Robonau, @ornaras, @SpicyCatGames, @FadedSociety, @ginocic, @zeedif, @CzechuPL, @mrintrepide, @renjfk, @thiagoalcr, @Smileskun, @dejavui, @allrobot

build.gradle.kts

@@ -53,7 +53,7 @@ subprojects {
             }
             compilerOptions {
                 jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-                freeCompilerArgs.add("-Xcontext-receivers")
+                freeCompilerArgs.add("-Xcontext-parameters")
             }
         }
     }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.3.10"
+kotlin = "2.3.21"
 coroutines = "1.10.2"
 serialization = "1.10.0"
 jvmTarget = "21"
@@ -11,7 +11,7 @@ exposed = "0.61.0"
 dex2jar = "2.4.34"
 polyglot = "24.2.2"
 settings = "1.3.0"
-twelvemonkeys = "3.13.0"
+twelvemonkeys = "3.13.1"
 graphqlkotlin = "8.8.1"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
@@ -115,7 +115,7 @@ appdirs = "ca.gosyer:kotlin-multiplatform-appdirs:2.0.0"
 cache4k = "io.github.reactivecircus.cache4k:cache4k:0.14.0"
 zip4j = "net.lingala.zip4j:zip4j:2.11.6"
 commonscompress = "org.apache.commons:commons-compress:1.28.0"
-junrar = "com.github.junrar:junrar:7.5.7"
+junrar = "com.github.junrar:junrar:7.5.10"
 
 # AES/CBC/PKCS7Padding Cypher provider
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.83"

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -140,17 +140,16 @@ fun OkHttpClient.newCachelessCallWithProgress(
     return progressClient.newCall(request)
 }
 
-context(Json)
+context(_: Json)
 inline fun <reified T> Response.parseAs(): T = decodeFromJsonResponse(serializer(), this)
 
-@OptIn(ExperimentalSerializationApi::class)
+context(json: Json)
-context(Json)
 fun <T> decodeFromJsonResponse(
     deserializer: DeserializationStrategy<T>,
     response: Response,
 ): T =
     response.body.source().use {
-        decodeFromBufferedSource(deserializer, it)
+        json.decodeFromBufferedSource(deserializer, it)
     }
 
 class HttpException(

server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt

@@ -304,11 +304,25 @@ object WebInterfaceManager {
             return
         }
 
-        val flavor = WebUIFlavor.current
         val servedFlavor = getServedWebUIFlavor()
 
         val log =
-            KotlinLogging.logger("${logger.name} setupWebUI(flavor= ${flavor.uiName}, servedFlavor= ${servedFlavor.uiName})")
+            KotlinLogging.logger(
+                "${logger.name} setupWebUI(flavor= ${WebUIFlavor.current.uiName}, servedFlavor= ${servedFlavor.uiName}, channel= ${serverConfig.webUIChannel})",
+            )
+
+        val flavor =
+            if (serverConfig.webUIChannel.value == WebUIChannel.BUNDLED) {
+                if (serverConfig.webUIFlavor.value != WebUIFlavor.default) {
+                    log.warn {
+                        "Changed flavor to ${WebUIFlavor.default.uiName}. Channel \"${WebUIChannel.BUNDLED}\" only works with the default flavor"
+                    }
+                }
+
+                WebUIFlavor.default
+            } else {
+                WebUIFlavor.current
+            }
 
         if (doesLocalWebUIExist(applicationDirs.webUIRoot)) {
             val currentVersion = getLocalVersion()