ARIA
678c0344c8
Gateway (gateway-plugin/): - Fix interactive_setup broken imports: print helpers were imported from the wrong hermes module (hermes_cli.config instead of hermes_cli.cli_output) plus a non-existent print_code; the try/except swallowed the ImportError so `hermes gateway setup` for android always bailed out early. - Fix release_scoped_lock type error (str | None passed where str required). - Rewrite empty `except: pass` blocks as contextlib.suppress with rationale. - Restructure two ambiguous ws_server try blocks (hello-auth, frame loop). - Ruff cleanup: type annotations, import sorting, line wrapping, magic values -> named constants, `raise ... from e`, complexity. Add gateway-plugin/ruff.toml. - Add pyrightconfig.json so the Python LSP resolves hermes-runtime imports. - Suppress verified false positives inline (parameterized SQL, column-name "secrets", hermes-generated media path). Android (app/androidApp + app/shared): - Consolidate launcher icons into a single mipmap-anydpi (minSdk 29 >= 26) with the monochrome layer; clears ObsoleteSdkInt + MonochromeLauncherIcon. - Bump core-splashscreen 1.0.1 -> 1.2.0; pin targetSdk 34 (deliberate). - Suppress verified findings inline (LAN ws:// default, correct GCM IV usage). Desktop (app/desktopApp): - Move the desktop to a Java 21 runtime (org.gradle.java.home) and set the desktop jvmTarget to 21 (Android stays JVM 17 / minSdk 29). Fixes the startup UnsupportedClassVersionError and restores Markdown renderer 0.44.0. Tooling/config: - .pi-lens.json: disable verified-noisy heuristics (documented in docs). - .gitleaks.toml: allowlist git-ignored false-positive paths. - docs/18-code-review.md: full findings + verification. Verified: ruff clean, pyright 0 errors, 64/64 gateway tests, all Kotlin tests, Android lint 0 issues, Android installed+launched on device, desktop launches on JDK 21.
103 lines
5.0 KiB
Kotlin
103 lines
5.0 KiB
Kotlin
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
|
|
plugins {
|
|
kotlin("multiplatform")
|
|
kotlin("plugin.serialization")
|
|
id("com.android.kotlin.multiplatform.library")
|
|
id("org.jetbrains.compose")
|
|
id("org.jetbrains.kotlin.plugin.compose")
|
|
}
|
|
|
|
val composeVersion = "1.11.1"
|
|
// material3 and material-icons-extended are published on their own cadence and
|
|
// lag the core artifacts; use each one's latest stable release.
|
|
val material3Version = "1.9.0"
|
|
val materialIconsVersion = "1.7.3"
|
|
val coroutinesVersion = "1.11.0"
|
|
val serializationVersion = "1.11.0"
|
|
val okhttpVersion = "5.5.0"
|
|
// 2.0.x is the first line built against Compose 1.8+ (1.9.40 was the last
|
|
// 1.7.x-compatible release). HTML artifact previews (M9): Android uses the
|
|
// platform WebView, desktop uses KCEF (JCEF/Chromium, downloaded on first use).
|
|
val webviewVersion = "2.0.3"
|
|
val kcefVersion = "2025.03.23"
|
|
// 0.34.0+ moved to Compose 1.8+ (0.33.0 was the last 1.7.x / Kotlin 2.1.x
|
|
// release). Provides GFM tables, bold/italic/underscore, and the -code module
|
|
// for language-aware syntax highlighting (Highlights).
|
|
val markdownVersion = "0.44.0"
|
|
|
|
kotlin {
|
|
android {
|
|
namespace = "iris.shared"
|
|
compileSdk = 37
|
|
minSdk = 29
|
|
compilerOptions {
|
|
jvmTarget.set(JvmTarget.JVM_17)
|
|
}
|
|
withHostTest { }
|
|
}
|
|
jvm("desktop") {
|
|
// Desktop runs on the Java 21 runtime (see gradle.properties
|
|
// org.gradle.java.home); target 21 so the Markdown renderer 0.44.0
|
|
// (Java-21 bytecode) loads. Android keeps its JVM 17 target above.
|
|
compilerOptions {
|
|
jvmTarget.set(JvmTarget.JVM_21)
|
|
}
|
|
}
|
|
|
|
sourceSets {
|
|
// Both targets are JVM-based (androidTarget + jvm("desktop")), so
|
|
// shared JVM code (File I/O, SHA-256, media cache) lives in jvmMain.
|
|
val jvmMain by creating { dependsOn(commonMain.get()) }
|
|
val androidMain by getting { dependsOn(jvmMain) }
|
|
val desktopMain by getting { dependsOn(jvmMain) }
|
|
|
|
commonMain.dependencies {
|
|
implementation("org.jetbrains.compose.runtime:runtime:$composeVersion")
|
|
implementation("org.jetbrains.compose.foundation:foundation:$composeVersion")
|
|
implementation("org.jetbrains.compose.material3:material3:$material3Version")
|
|
implementation("org.jetbrains.compose.ui:ui:$composeVersion")
|
|
// Full Material icon set (Icons.Filled.ContentCopy for the code
|
|
// copy buttons); -core only ships a small subset.
|
|
implementation("org.jetbrains.compose.material:material-icons-extended:$materialIconsVersion")
|
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
|
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
|
|
// OkHttp is a JVM library; both targets here are JVM-based
|
|
// (androidTarget + jvm("desktop")), so it resolves on both.
|
|
implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
|
|
// Markdown rendering for chat bubbles (M8): core parser/renderer,
|
|
// Material 3 themed defaults, and the -code module for syntax
|
|
// highlighting of fenced code blocks (Highlights).
|
|
implementation("com.mikepenz:multiplatform-markdown-renderer:$markdownVersion")
|
|
implementation("com.mikepenz:multiplatform-markdown-renderer-m3:$markdownVersion")
|
|
implementation("com.mikepenz:multiplatform-markdown-renderer-code:$markdownVersion")
|
|
// M9: HTML artifact previews — WebView composable (platform WebView
|
|
// on Android, KCEF/JCEF on desktop).
|
|
implementation("io.github.kevinnzou:compose-webview-multiplatform:$webviewVersion")
|
|
}
|
|
commonTest.dependencies {
|
|
implementation(kotlin("test"))
|
|
}
|
|
// M9: KCEF (JCEF/Chromium) for desktop HTML artifact previews. The
|
|
// webview library exposes it transitively, but we reference KCEF
|
|
// directly (init + progress) so declare it explicitly.
|
|
desktopMain.dependencies {
|
|
implementation("dev.datlag:kcef:$kcefVersion")
|
|
}
|
|
// M4: ExoPlayer (Media3) for inline audio/video playback (Android only).
|
|
androidMain.dependencies {
|
|
// M7: EncryptedSharedPreferences for the pairing token
|
|
// (docs/09 §9.7; AndroidSecureStore).
|
|
implementation("androidx.security:security-crypto:1.1.0")
|
|
implementation("androidx.media3:media3-exoplayer:1.11.0")
|
|
implementation("androidx.media3:media3-ui:1.11.0")
|
|
// SAF picker (rememberLauncherForActivityResult).
|
|
implementation("androidx.activity:activity-compose:1.13.0")
|
|
// M5: FCM push (inert without a Firebase project / google-services.json;
|
|
// the ntfy listener is the fallback). The google-services plugin is
|
|
// applied conditionally in the app module.
|
|
implementation("com.google.firebase:firebase-messaging:25.1.2")
|
|
}
|
|
}
|
|
}
|