Merge pull request #46 from jacobras/improvement/icons

Improve icons

Author: jacobras

.github/actions/build-setup/action.yml

@@ -0,0 +1,17 @@
+name: Build Setup
+description: Sets up Java, Gradle and Android.
+
+runs:
+  using: composite
+  steps:
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 24 # Can't upgrade to 25 before Detekt 2.0 is out.
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4

.github/workflows/build.yml

@@ -15,15 +15,12 @@ jobs:
         timeout-minutes: 15
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v6
           with:
             clean: ${{ github.ref == 'refs/heads/develop' }}
 
-        - name: Set up JDK 17
-          uses: actions/setup-java@v4
-          with:
-            distribution: 'temurin'
-            java-version: 17
+        - name: Build setup
+          uses: ./.github/actions/build-setup
 
         - name: Compile
           run: ./gradlew assemble

.github/workflows/publish.yml

@@ -7,13 +7,10 @@ jobs:
         runs-on: macos-latest
 
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
 
-            - name: Set up JDK 17
-              uses: actions/setup-java@v4
-              with:
-                  distribution: 'temurin'
-                  java-version: 17
+            - name: Build setup
+              uses: ./.github/actions/build-setup
 
             - name: Publish Library
               env:

compose-action-menu/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.vanniktech.maven.publish.SonatypeHost
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -7,13 +7,14 @@ plugins {
     alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.maven.publish)
+    signing
 }
 
 group = "nl.jacobras"
 version = "3.1.0"
 
 mavenPublishing {
-    publishToMavenCentral(SonatypeHost.S01, true)
+    publishToMavenCentral()
     signAllPublications()
 
     pom {
@@ -71,26 +72,30 @@ kotlin {
     wasmJs { browser() }
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                implementation(libs.compose.foundation)
-                implementation(libs.compose.icons)
-                implementation(libs.compose.material3)
-                implementation(libs.compose.ui)
-            }
+        commonMain.dependencies {
+            implementation(libs.compose.foundation)
+            implementation(libs.compose.icons)
+            implementation(libs.compose.material3)
+            implementation(libs.compose.ui)
+            implementation(libs.compose.uiToolingPreview)
         }
-        val androidMain by getting {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        invokeWhenCreated("androidDebug") {
             dependencies {
-                implementation(compose.uiTooling)
+                implementation(libs.compose.uiTooling)
             }
         }
     }
-
-    jvmToolchain(17)
 }
 
 // From https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
 tasks.withType<AbstractPublishToMaven>().configureEach {
     val signingTasks = tasks.withType<Sign>()
     mustRunAfter(signingTasks)
+}
+
+signing {
+    setRequired {
+        !gradle.taskGraph.allTasks.any { it is PublishToMavenLocal }
+    }
 }

compose-action-menu/src/androidMain/kotlin/nl/jacobras/composeactionmenu/IconActionItemPreviews.kt

@@ -102,7 +102,8 @@ fun ActionMenu(
                     modifier = Modifier.testTag("ActionMenu#${item.key}"),
                     hideTopMenu = { showOverflowMenu = false },
                     showSubMenu = { subMenuContent = it },
-                    hideSubMenu = { subMenuContent = emptyList() }
+                    hideSubMenu = { subMenuContent = emptyList() },
+                    addPaddingIfNoIcon = content.any { it.icon != null || it.iconVector != null }
                 )
             }
         }