Commit Graph

9 Commits

  • Fix two Windows ARM64 failures: JDK-8371740 and a needless JDK download
    Neither is related to the jmods work; both were visible only on the
    windows-11-arm runner.
    
    1. Gradle hung at build shutdown. The runner's ambient JAVA_HOME is Temurin
       21.0.12 aarch64, and JDK-8371740 — a LinkedTransferQueue race fixed only
       in JDK 26 — makes Gradle on Windows ARM64 hang whenever it runs on JDK
       21+, failing the build after the installer was already written with
       "Timeout waiting for concurrent jobs to complete". Gradle's own repo and
       linroid/Ketch both carry workarounds for this. Pin the Gradle JVM to 17,
       which is what the x64 job already does; Adoptium ships no Windows aarch64
       17, hence the new `java-distribution` input and zulu there. Packaging is
       unaffected: resolvePackagingJdkHome() rejects 17 as too old and falls back
       to the Java 25 toolchain JDK for jpackage.
    
    2. "Ensure ARM64 packaging JDK" stalled for minutes and looked hung. The
       script only scanned C:\Program Files\Eclipse Adoptium, but hosted ARM64
       runners ship their ARM64 Temurin 21 under the hostedtoolcache, so the scan
       missed it and fell through to downloading a ~180 MB JDK via
       Invoke-WebRequest + Expand-Archive. Re-running the job showed it still
       installing 3m24s later. Accept JAVA_HOME when it reports os.arch=aarch64 —
       the script's own comments already call Java 21 good enough as the Gradle
       daemon JVM.
  • Use setup-java's path output for FROMCHAT_PACKAGING_JDK
    setup-java@v5 names the installed JDK's location `path`, not `java-path`
    (the v4 name), so the beta4 run exported an empty value, fell back to the
    jmods-less /usr/lib/jvm/temurin-25-jdk-amd64 and failed with the same
    "can't find superclass or interface java.lang.Object" wall of warnings.
    
    The Gradle-side guard added in b0159eb correctly named the offending JDK
    in the beta4 log, which is what pointed at the empty export.
  • Fix release ProGuard: Adoptium JDK 25 ships no jmods
    Compose Desktop's AbstractProguardTask builds ProGuard's -libraryjars by
    walking <javaHome>/jmods and nothing else. Adoptium stopped shipping the
    jmods/ directory in JDK 25 archives (verified: 0 jmods entries in both the
    linux/x64 and macOS/aarch64 Temurin 25.0.4.1 tarballs, vs 71 for Temurin
    17), so on the runners the desktop packaging JDK resolves to
    /usr/lib/jvm/temurin-25-jdk-amd64 and ProGuard gets no JDK whatsoever.
    Every class then fails to resolve java.lang.Object — 1.3M
    "can't find superclass or interface java.lang.Object" warnings, followed by
    "Please correct the above warnings first".
    
    This is why the Java 25 toolchain bump broke every release while the
    v1.2.0-beta release on the toolchain 17 build kept working, and why a local
    build with the JetBrains Runtime (which does ship jmods) succeeded while CI
    did not. ProGuard's version was never the cause; 7.10.0 was still kept
    because it is what understands this project's Kotlin 2.4 metadata.
    
    Install Zulu 25 (still ships jmods) in the desktop-proguard job and export
    it as FROMCHAT_PACKAGING_JDK; setup-java runs before Temurin 17 so JAVA_HOME
    stays on 17 for Gradle and the Android build. resolvePackagingJdkHome() now
    warns loudly when the JDK it picks has no jmods/, instead of leaving it to
    ProGuard's wall of warnings.
  • Fix release publish artifact download and per-job Gradle cache keys.
    download-artifact accepts one glob pattern, not multiline lists; split platform and Android downloads. Scope Gradle build cache keys per job and use read-only setup-gradle on parallel jobs to avoid cache reservation races.
    
    Co-authored-by: Cursor <cursoragent@cursor.com>
  • Add optimized multi-platform release CI/CD pipeline.
    Split Windows builds into shared x64 prep and arch-specific packaging, add comprehensive caching, verification scripts, and a PR smoke workflow.
    
    Co-authored-by: Cursor <cursoragent@cursor.com>