Merge branch 'main' into colin/kotlin_2

* main:
  Fix deploy docs timeout.
  Fix disabling polyfills for samples.
  Update dependency org.jetbrains.compose.compiler:compiler to v1.5.10.2 (#2216)
  Publish the sample wasmJs app automatically when deploying the docs. (#2213)
  Update androidx.activity to v1.9.0 (#2209)
  Update androidx.benchmark to v1.2.4 (#2208)
  Update dependency org.jetbrains.kotlinx:atomicfu-gradle-plugin to v0.24.0 (#2206)
  Update dependency org.jetbrains.skiko:skiko to v0.8.1 (#2207)
  Update dependency androidx.core:core-ktx to v1.13.0 (#2210)
  Update roborazzi to v1.13.0 (#2212)
  Upgrade to gradle/actions/wrapper-validation@v3. (#2203)
  Update gradle/wrapper-validation-action action to v3 (#2202)
  fix VP8X feature flags byte offset (#2199)
  Update roborazzi to v1.12.0 (#2201)

Author: colinrtwhite

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
                   java-version: ${{ env.JAVA_VERSION }}
 
             - name: Check Gradle wrapper
-              uses: gradle/wrapper-validation-action@v2
+              uses: gradle/actions/wrapper-validation@v3
 
             - name: Check style
               run: ./gradlew spotlessCheck
@@ -142,7 +142,7 @@ jobs:
     deploy-docs:
         name: Deploy docs
         runs-on: ubuntu-latest
-        timeout-minutes: 20
+        timeout-minutes: 40
         if: github.repository == 'coil-kt/coil' && github.ref == 'refs/heads/main'
         needs: [checks, unit-tests, instrumentation-tests, build-samples]
         steps:

.gitignore

@@ -18,6 +18,7 @@ build
 
 # Docs
 docs/api
+docs/sample
 site
 
 # Xcode

build.gradle.kts

@@ -177,6 +177,11 @@ allprojects {
 
 // https://github.com/square/okio/issues/1163
 fun Project.applyOkioJsTestWorkaround() {
+    if (":samples" in displayName) {
+        // The polyfills cause issues with the samples.
+        return
+    }
+
     plugins.withId("org.jetbrains.kotlin.multiplatform") {
         val applyNodePolyfillPlugin by lazy {
             tasks.register("applyNodePolyfillPlugin") {

coil-gif/src/main/java/coil3/gif/decodeUtils.kt

@@ -42,8 +42,8 @@ fun DecodeUtils.isWebP(source: BufferedSource): Boolean {
 fun DecodeUtils.isAnimatedWebP(source: BufferedSource): Boolean {
     return isWebP(source) &&
         source.rangeEquals(12, WEBP_HEADER_VPX8) &&
-        source.request(17) &&
-        (source.buffer[16] and 0b00000010) > 0
+        source.request(21) &&
+        (source.buffer[20] and 0b00000010) > 0
 }
 
 /**

deploy_docs.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 set -e
 
+# Build the Compose WASM sample.
+./gradlew samples:compose:wasmJsBrowserDistribution
+
+# Copy outside files into the docs folder.
+cp -R samples/compose/build/dist/wasmJs/productionExecutable docs/sample
+
 # Build the Dokka docs.
 ./assemble_docs.sh
 
@@ -40,5 +46,6 @@ rm docs/index.md \
    docs/README-sv.md \
    docs/README-tr.md \
    docs/README-zh.md
-rm -r docs/api
-rm -r site
+rm -r docs/api \
+      docs/sample \
+      site

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-androidx-activity = "1.8.2"
-androidx-benchmark = "1.2.3"
+androidx-activity = "1.9.0"
+androidx-benchmark = "1.2.4"
 androidx-lifecycle = "2.7.0"
 coroutines = "1.8.0"
 jetbrains-compose = "1.6.2"
@@ -12,7 +12,7 @@ ktor-wasm = "3.0.0-wasm2"
 okhttp = "4.12.0"
 okio = "3.9.0"
 paparazzi = "1.3.3"
-roborazzi = "1.11.0"
+roborazzi = "1.13.0"
 skiko = "0.7.97"
 
 [plugins]
@@ -24,7 +24,7 @@ spotless = "com.diffplug.spotless:6.25.0"
 
 [libraries]
 gradlePlugin-android = "com.android.tools.build:gradle:8.3.2"
-gradlePlugin-atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.23.2"
+gradlePlugin-atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.24.0"
 gradlePlugin-jetbrainsCompose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrains-compose" }
 gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 gradlePlugin-mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.28.0"
@@ -37,7 +37,7 @@ androidx-appcompat-resources = "androidx.appcompat:appcompat-resources:1.6.1"
 androidx-annotation = "androidx.annotation:annotation:1.7.1"
 androidx-benchmark-macro = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
-androidx-core = "androidx.core:core-ktx:1.12.0"
+androidx-core = "androidx.core:core-ktx:1.13.0"
 androidx-exifinterface = "androidx.exifinterface:exifinterface:1.3.7"
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }