jacobras · jacobras · Jan 22, 2026 · Jan 22, 2026 · Jan 22, 2026 · Jan 22, 2026
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     kotlin("jvm") version libs.versions.kotlin apply false
     kotlin("multiplatform") version libs.versions.kotlin apply false
     kotlin("android") version libs.versions.kotlin apply false
-    alias(libs.plugins.android.application) version libs.versions.agp apply false
-    alias(libs.plugins.android.library) version libs.versions.agp apply false
-    alias(libs.plugins.compose.multiplatform) version libs.versions.compose.multiplatform apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.compose.multiplatform) apply false
 }
diff --git a/compose-action-menu/build.gradle.kts b/compose-action-menu/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "nl.jacobras"
-version = "3.0.1"
+version = "3.1.0"
 
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.S01, true)
@@ -41,14 +41,14 @@ mavenPublishing {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
     namespace = "nl.jacobras.composeactionmenu"
 
     buildFeatures {
         compose = true
     }
     defaultConfig {
-        minSdk = 21
+        minSdk = 23
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -73,9 +73,10 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(compose.foundation)
-                implementation(compose.material3)
-                implementation(compose.ui)
+                implementation(libs.compose.foundation)
+                implementation(libs.compose.icons)
+                implementation(libs.compose.material3)
+                implementation(libs.compose.ui)
             }
         }
         val androidMain by getting {

diff --git a/docs/809.js b/docs/809.js
diff --git a/docs/809.js.map b/docs/809.js.map
diff --git a/docs/873.js b/docs/873.js
diff --git a/docs/873.js.LICENSE.txt b/docs/873.js.LICENSE.txt
@@ -0,0 +1,35 @@
+/*
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/*
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/*
+ * @copyright (c) 2016, Philipp Thürwächter, Pattrick Hüper
+ * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/**
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/**
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+//! @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+
+//! @copyright (c) 2015-present, Philipp Thürwächter, Pattrick Hüper & js-joda contributors
+
+//! @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+
+//! @version @js-joda/core - 3.2.0
diff --git a/docs/873.js.map b/docs/873.js.map
diff --git a/docs/8b586cd980cf66dcff7e.wasm b/docs/8b586cd980cf66dcff7e.wasm
diff --git a/docs/META-INF/MANIFEST.MF b/docs/META-INF/MANIFEST.MF
diff --git a/docs/composeApp.js b/docs/composeApp.js
diff --git a/docs/composeApp.js.map b/docs/composeApp.js.map
diff --git a/docs/e9b28911e687b1ee6b42.wasm b/docs/e9b28911e687b1ee6b42.wasm
diff --git a/docs/index.html b/docs/index.html
@@ -2,12 +2,27 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Compose Action Menu web demo</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script type="application/javascript" src="skiko.js"></script>
+    <link type="text/css" rel="stylesheet" href="styles.css">
     <script type="application/javascript" src="composeApp.js"></script>
 </head>
-<body>
-<canvas id="ComposeTarget"></canvas>
+<body style="background: #f2f3f9; text-align: center; align-content: center;">
+<noscript>
+    You need to enable JavaScript to run Notes for Web.
+</noscript>
+
+<svg width="40" height="40" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+    <circle cx="25" cy="25" r="20" stroke="#ccc" stroke-width="4" fill="none"/>
+    <circle cx="25" cy="25" r="20" stroke="#333" stroke-width="4" fill="none"
+            stroke-linecap="round" stroke-dasharray="90 125">
+        <animateTransform attributeName="transform"
+                          type="rotate"
+                          from="0 25 25"
+                          to="360 25 25"
+                          dur="1s"
+                          repeatCount="indefinite"/>
+    </circle>
+</svg>
 </body>
 </html>
diff --git a/docs/js-reexport-symbols.mjs b/docs/js-reexport-symbols.mjs
diff --git a/docs/originJsComposeApp.js b/docs/originJsComposeApp.js
diff --git a/docs/originJsComposeApp.js.map b/docs/originJsComposeApp.js.map
diff --git a/docs/originWasmComposeApp.js b/docs/originWasmComposeApp.js
diff --git a/docs/originWasmComposeApp.js.map b/docs/originWasmComposeApp.js.map
diff --git a/docs/skiko.js b/docs/skiko.js
diff --git a/docs/skiko.mjs b/docs/skiko.mjs
diff --git a/docs/skiko.wasm b/docs/skiko.wasm
diff --git a/docs/skikod8.mjs b/docs/skikod8.mjs
diff --git a/docs/styles.css b/docs/styles.css
@@ -0,0 +1,7 @@
+html, body {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,25 @@
 [versions]
-agp = "8.7.2"
-compose-bom = "2024.11.00"
-compose-multiplatform = "1.7.1"
-kotlin = "2.0.21"
+agp = "8.13.2"
+compose = "1.10.0"
+compose-icons = "1.7.3"
+compose-material3 = "1.9.0"
+kotlin = "2.3.0"
 
 [libraries]
-compose-activity = { group = "androidx.activity", name = "activity-compose", version = "1.9.3" }
-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
-compose-ui = { group = "androidx.compose.ui", name = "ui" }
+compose-activity = { group = "androidx.activity", name = "activity-compose", version = "1.12.2" }
+compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose" }
+compose-icons = { module = "org.jetbrains.compose.material:material-icons-core", version.ref = "compose-icons" }
+compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose-material3" }
+compose-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose" }
+compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
+compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose" }
+compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose" }
 
 [bundles]
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
+compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose" }
 maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/kotlin-js-store/wasm/yarn.lock b/kotlin-js-store/wasm/yarn.lock
@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@js-joda/core@3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
+  integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==
diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("android")
     alias(libs.plugins.android.application)
@@ -6,7 +8,7 @@ plugins {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
     namespace = "nl.jacobras.composeactionmenu.sample"
 
     buildFeatures {
@@ -19,32 +21,33 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     defaultConfig {
         applicationId = "nl.jacobras.composeactionmenu"
-        minSdk = 21
+        minSdk = 23
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
     }
 }
 
 dependencies {
-    // BoMs
-    implementation(platform(libs.compose.bom))
-
     // The actual library
     implementation(project(":compose-action-menu"))
 
     implementation(libs.compose.activity)
     implementation(libs.compose.foundation)
+    implementation(libs.compose.icons)
     implementation(libs.compose.material3)
     implementation(libs.compose.ui)
 }
diff --git a/sample-desktop/build.gradle.kts b/sample-desktop/build.gradle.kts
@@ -7,13 +7,12 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
     sourceSets {
         val jvmMain by getting {
             dependencies {
                 implementation(compose.desktop.currentOs)
+                implementation(libs.compose.icons)
                 implementation(project(":compose-action-menu"))
             }
         }

diff --git a/sample-web/README.md b/sample-web/README.md
@@ -4,6 +4,6 @@
 
 ## Publication
 
-1. `gradlew :sample-web:jsBrowserDistribution`
-2. Copy files from `/sample-web/build/dist/js/productionExecutable` into `/docs`
+1. `gradlew :sample-web:composeCompatibilityBrowserDistribution`
+2. Copy files from `/sample-web/build/dist/composeWebCompatibility/productionExecutable` into `/docs`
 3. Push files to repository
diff --git a/sample-web/build.gradle.kts b/sample-web/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
@@ -10,30 +10,35 @@ plugins {
 }
 
 kotlin {
-    js(IR) {
-        moduleName = "composeApp"
+    js {
+        outputModuleName = "composeApp"
+        browser {
+            commonWebpackConfig {
+                outputFileName = "composeApp.js"
+            }
+        }
+        binaries.executable()
+    }
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        outputModuleName = "composeApp"
         browser {
             commonWebpackConfig {
                 outputFileName = "composeApp.js"
-                devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
-                    static = (static ?: mutableListOf()).apply {
-                        // Serve sources to debug inside browser
-                        add(project.projectDir.path)
-                    }
-                }
             }
         }
         binaries.executable()
     }
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
-            implementation(compose.components.uiToolingPreview)
+            implementation(libs.compose.foundation)
+            implementation(libs.compose.icons)
+            implementation(libs.compose.material3)
+            implementation(libs.compose.resources)
+            implementation(libs.compose.runtime)
+            implementation(libs.compose.ui)
+            implementation(libs.compose.uiToolingPreview)
 
             implementation(project(":compose-action-menu"))
         }