ARIA
96b60daf08
Kotlin 2.1.0->2.4.10, Compose Multiplatform 1.7.3->1.11.1, AGP 8.7.3->9.3.1, Gradle 8.10.2->9.7.1. The two libs that pinned us to Compose 1.7.x -- compose-webview-multiplatform (1.9.40->2.0.3) and multiplatform-markdown-renderer (0.33.0->0.44.0) -- now have Compose 1.8+ releases, so the whole stack moves. Also coroutines/serialization 1.11.0, okhttp 5.5.0, media3 1.11.0, activity-compose 1.13.0, firebase-messaging 25.1.2, compose-bom 2026.08.00, google-services 4.5.0, KCEF 2025.03.23 (JBR pin ->17.0.14); material3 1.9.0 / material-icons-extended 1.7.3 (each one's latest stable -- they lag the core).
AGP 9 migration: :shared swaps com.android.library->com.android.kotlin.multiplatform.library (android config moves into kotlin{android{}}, withHostTest{} keeps host tests); :androidApp drops kotlin(android) for AGP 9 built-in Kotlin. compileSdk 34->37 (minSdk stays 29 / Android 10).
Code fixes for API breaks: markdown link->textLink + highlights->highlightsBuilder; kotlinOptions{jvmTarget}->compilerOptions{jvmTarget}.
95 lines
3.5 KiB
Kotlin
95 lines
3.5 KiB
Kotlin
import org.gradle.internal.os.OperatingSystem
|
|
|
|
plugins {
|
|
kotlin("jvm")
|
|
id("org.jetbrains.compose")
|
|
id("org.jetbrains.kotlin.plugin.compose")
|
|
}
|
|
|
|
val composeVersion = "1.11.1"
|
|
val os = OperatingSystem.current()
|
|
val arch = System.getProperty("os.arch") ?: "amd64"
|
|
val desktopTarget = when {
|
|
os.isMacOsX -> if (arch == "aarch64") "macos-arm64" else "macos-x64"
|
|
os.isWindows -> "windows-x64"
|
|
else -> if (arch == "aarch64") "linux-arm64" else "linux-x64"
|
|
}
|
|
|
|
dependencies {
|
|
implementation(project(":shared"))
|
|
implementation("org.jetbrains.compose.desktop:desktop-jvm-$desktopTarget:$composeVersion")
|
|
// M6: window-state persistence (window.json).
|
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
|
|
}
|
|
|
|
compose.desktop {
|
|
application {
|
|
mainClass = "iris.desktop.MainKt"
|
|
}
|
|
}
|
|
|
|
// M9: KCEF (JCEF/Chromium) for HTML artifact previews needs AWT reflection
|
|
// access on modern JDKs. Applied to the `run` task (JavaExec) and, below, to
|
|
// the jpackage `--java-options`.
|
|
afterEvaluate {
|
|
tasks.withType<JavaExec> {
|
|
jvmArgs("--add-opens", "java.desktop/sun.awt=ALL-UNNAMED")
|
|
jvmArgs("--add-opens", "java.desktop/java.awt.peer=ALL-UNNAMED")
|
|
}
|
|
}
|
|
|
|
// ── M6: native packaging (docs/11 §11.4) ─────────────────────────────────
|
|
// `./gradlew :desktopApp:jpackage` builds a self-contained app image under
|
|
// build/jpackage (JRE bundled). `./gradlew :desktopApp:jpackage
|
|
// -PjpackageType=deb` builds a .deb instead (needs dpkg-deb).
|
|
|
|
val jpackageInputDir = layout.buildDirectory.dir("jpackage-input")
|
|
|
|
val fatJar = tasks.register<Jar>("fatJar") {
|
|
archiveClassifier.set("all")
|
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
|
manifest { attributes("Main-Class" to "iris.desktop.MainKt") }
|
|
from(sourceSets.main.get().output)
|
|
from({
|
|
configurations.runtimeClasspath.get()
|
|
.filter { it.name.endsWith(".jar") }
|
|
.map { zipTree(it) }
|
|
}) {
|
|
exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
|
|
}
|
|
}
|
|
|
|
// Stage the fat jar into the jpackage input dir. A dedicated Sync task keeps
|
|
// the Exec task free of task references (configuration-cache compatible) and
|
|
// prunes stale jars from the input dir automatically.
|
|
tasks.register<Sync>("stageJpackageInput") {
|
|
dependsOn(fatJar)
|
|
from(fatJar)
|
|
into(jpackageInputDir)
|
|
}
|
|
|
|
tasks.register<Exec>("jpackage") {
|
|
dependsOn("stageJpackageInput")
|
|
val jpackageBin = file("${System.getProperty("java.home")}/bin/jpackage")
|
|
val type = (project.findProperty("jpackageType") as? String) ?: "app-image"
|
|
val inputDir = jpackageInputDir.get().asFile
|
|
val destDir = layout.buildDirectory.dir("jpackage").get().asFile
|
|
inputs.dir(inputDir)
|
|
outputs.dir(destDir)
|
|
commandLine(
|
|
if (jpackageBin.exists()) jpackageBin.absolutePath else "jpackage",
|
|
"--name", "iris",
|
|
"--app-version", "0.1.0",
|
|
"--vendor", "Iris",
|
|
"--type", type,
|
|
"--input", inputDir.absolutePath,
|
|
"--main-jar", "desktopApp-all.jar",
|
|
"--main-class", "iris.desktop.MainKt",
|
|
"--icon", file("src/main/resources/icon.png").absolutePath,
|
|
"--dest", destDir.absolutePath,
|
|
"--java-options", "-Xmx1g",
|
|
// M9: KCEF (JCEF) AWT reflection access (see the JavaExec block above).
|
|
"--java-options", "--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
|
|
"--java-options", "--add-opens=java.desktop/java.awt.peer=ALL-UNNAMED",
|
|
)
|
|
} |