From 33c1de3f2dd671f99a48fff28540ca9e70162f6a Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 17 Sep 2025 16:52:13 +0000
Subject: [PATCH] chore: restructure source sets to be hierarchically correct

---
 .../sdk/kotlin/gradle/kmp/ConfigureTargets.kt | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt b/build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt
index 828afe8..7a69af2 100644
--- a/build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt
+++ b/build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt
@@ -82,28 +82,34 @@ fun Project.configureKmpTargets() {
 
             if (hasWindows) {
                 common {
-                    group("windows") {
-                        withMingw()
+                    group("native") {
+                        group("windows") {
+                            withMingw()
+                        }
                     }
                 }
             }
 
             if (hasDesktop) {
                 common {
-                    group("desktop") {
-                        withLinux()
-                        withMingw()
-                        withMacos()
+                    group("native") {
+                        group("desktop") {
+                            withLinux()
+                            withMingw()
+                            withMacos()
+                        }
                     }
                 }
             }
 
             if (hasPosix) {
                 common {
-                    group("posix") {
-                        // Linux and Apple but NOT Mingw/Windows
-                        withLinux()
-                        withMacos()
+                    group("native") {
+                        group("posix") {
+                            // Linux and Apple but NOT Mingw/Windows
+                            withLinux()
+                            withApple()
+                        }
                     }
                 }
             }