diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 6f657bfe4..465c38162 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -21,12 +21,12 @@ on:
       configuration:
         type: choice
         options:
-          - release
           - debug
+          - release
         required: true
-        default: release
+        default: debug
         description:
-          'The configuration to use for the tests. "release" will produce release builds, "debug" will produce debug builds (and skip type mapping tests for now).'
+          'The configuration to use for the tests. "release" will produce release builds, "debug" will produce debug builds (type mapping tests currently always use release).'
       target:
         type: choice
         options:
@@ -50,6 +50,7 @@ concurrency:
 jobs:
   acceptance-tests:
     name: Acceptance Tests
+    needs: [gradle-tests]
     runs-on: self-hosted
     steps:
       - name: Checkout Repo
@@ -67,18 +68,18 @@ jobs:
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
           KOTLIN_BUILD_CONFIGURATION: ${{ inputs.configuration }}
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        if: ${{ failure() || success() }}
-        with:
-          check_name: "Smoke Test Reports - Functional Tests"
-          report_paths: 'SKIE/acceptance-tests/build/test-results/functional__*/TEST-*.xml'
-          require_tests: true
+      # Log size can be too large which causes significant performance issues
+      # - name: Publish Test Report
+      #   uses: mikepenz/action-junit-report@v3
+      #   if: ${{ failure() || success() }}
+      #   with:
+      #     check_name: "Smoke Test Reports - Functional Tests"
+      #     report_paths: 'SKIE/acceptance-tests/build/test-results/functional__*/TEST-*.xml'
+      #     require_tests: true
 
   type-mapping-tests:
     name: Type Mapping Tests
-    needs: [acceptance-tests]
-    runs-on: self-hosted
+    runs-on: macos-14
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
@@ -90,7 +91,6 @@ jobs:
       - name: Run Type Mapping Tests
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
-        if: ${{ inputs.configuration != 'debug' }}
         with:
           arguments: ':acceptance-tests:type-mapping__kgp_latestTest'
           build-root-directory: SKIE
@@ -98,17 +98,18 @@ jobs:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
           KOTLIN_TARGET: ${{ inputs.target }}
           KOTLIN_BUILD_CONFIGURATION: ${{ inputs.configuration }}
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        if: ${{ (failure() || success()) && steps.run-tests.outcome != 'skipped' }}
-        with:
-          check_name: "Smoke Test Reports - Type Mapping Tests"
-          report_paths: 'SKIE/acceptance-tests/build/test-results/type-mapping__*/TEST-*.xml'
-          require_tests: true
+      # Log size can be too large which causes significant performance issues
+      # - name: Publish Test Report
+      #   uses: mikepenz/action-junit-report@v3
+      #   if: ${{ (failure() || success()) && steps.run-tests.outcome != 'skipped' }}
+      #   with:
+      #     check_name: "Smoke Test Reports - Type Mapping Tests"
+      #     report_paths: 'SKIE/acceptance-tests/build/test-results/type-mapping__*/TEST-*.xml'
+      #     require_tests: true
 
   external-libraries-tests:
     name: External Libraries Tests
-    needs: [type-mapping-tests]
+    needs: [acceptance-tests, gradle-tests]
     runs-on: self-hosted
     steps:
       - name: Checkout Repo
@@ -126,10 +127,42 @@ jobs:
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
           KOTLIN_BUILD_CONFIGURATION: ${{ inputs.configuration }}
+      # Log size can be too large which causes significant performance issues
+      # - name: Publish Test Report
+      #   uses: mikepenz/action-junit-report@v3
+      #   if: ${{ failure() || success() }}
+      #   with:
+      #     check_name: "Smoke Test Reports - External Libraries Tests"
+      #     report_paths: 'SKIE/acceptance-tests/build/test-results/libraries__*/TEST-*.xml'
+      #     require_tests: true
+
+  gradle-tests:
+    name: Gradle Tests
+    runs-on: self-hosted
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          token: ${{ secrets.ACCEPTANCE_TESTS_TOKEN }}
+      - name: Prepare Worker
+        uses: ./.github/actions/prepare-worker
+      - name: Run Gradle Tests
+        uses: gradle/gradle-build-action@v2.4.2
+        id: run-tests
+        with:
+          arguments: >-
+            :test
+            -PtestLevel=smoke
+            -PtestType=gradle
+            "-Pmatrix.targets=${{ inputs.target || 'macosArm64' }}"
+            "-Pmatrix.configurations=${{ inputs.configuration || 'debug' }}"
+            "-Pmatrix.linkModes=${{ inputs.linkage || 'static' }}"
+          build-root-directory: test-runner
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         if: ${{ failure() || success() }}
         with:
-          check_name: "Smoke Test Reports - External Libraries Tests"
-          report_paths: 'SKIE/acceptance-tests/build/test-results/libraries__*/TEST-*.xml'
+          check_name: "Smoke Test Reports - Gradle Tests"
+          report_paths: 'test-runner/build/test-results/test/TEST-*.xml'
           require_tests: true
diff --git a/SKIE/.run/Latest_Tests_Acceptance_Selected.run.xml b/SKIE/.run/Tests_Acceptance_Selected.run.xml
similarity index 96%
rename from SKIE/.run/Latest_Tests_Acceptance_Selected.run.xml
rename to SKIE/.run/Tests_Acceptance_Selected.run.xml
index 6fb27d8bf..9bfaaa1af 100644
--- a/SKIE/.run/Latest_Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/Tests_Acceptance_Selected.run.xml
@@ -3,7 +3,7 @@
     <ExternalSystemSettings>
       <option name="env">
         <map>
-          <entry key="acceptanceTest" value="tests/coroutines/suspend/type_params_copied" />
+          <entry key="acceptanceTest" value="tests/coroutines/suspend/objects" />
         </map>
       </option>
       <option name="executionName" />
@@ -26,4 +26,4 @@
     <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/SKIE/settings.gradle.kts b/SKIE/settings.gradle.kts
index 73d81d653..b25085366 100644
--- a/SKIE/settings.gradle.kts
+++ b/SKIE/settings.gradle.kts
@@ -63,8 +63,8 @@ buildSetup {
 
     val gradle by group("skie-gradle") {
         val plugin by module
-        val `plugin-api` by module
-        val `plugin-loader` by module
+        val `plugin-shim-api` by module
+        val `plugin-shim-impl` by module
     }
 
     val `acceptance-tests` by module {
diff --git a/SKIE/skie-gradle/plugin-loader/gradle-plugin-loader.gradle.kts b/SKIE/skie-gradle/plugin-loader/gradle-plugin-loader.gradle.kts
deleted file mode 100644
index 8471b60a3..000000000
--- a/SKIE/skie-gradle/plugin-loader/gradle-plugin-loader.gradle.kts
+++ /dev/null
@@ -1,110 +0,0 @@
-import co.touchlab.skie.gradle.KotlinCompilerVersion
-import co.touchlab.skie.gradle.publish.dependencyName
-import co.touchlab.skie.gradle.util.enquoted
-import co.touchlab.skie.gradle.util.stringListProperty
-import co.touchlab.skie.gradle.version.KotlinToolingVersionComponent
-import co.touchlab.skie.gradle.version.gradleApiVersionDimension
-import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
-
-plugins {
-    id("skie.gradle.plugin")
-    id("skie.publishable")
-    id("dev.buildconfig")
-}
-
-skiePublishing {
-    name = "SKIE Gradle Plugin Loader"
-    description = "Gradle plugin that loads the correct SKIE version based on Kotlin and Gradle versions."
-}
-
-buildConfig {
-    val gradlePlugin = projects.gradle.gradlePlugin.dependencyProject
-    buildConfigField("String", "SKIE_GRADLE_PLUGIN", "\"${gradlePlugin.dependencyName}\"")
-
-    val kotlinToSkieKgpVersion = project.kotlinToolingVersionDimension().components
-        .flatMap { versionComponent ->
-            versionComponent.supportedVersions.map { version ->
-                version to versionComponent.name
-            }
-        }
-        .joinToString { (version, name) ->
-            "${version.toString().enquoted()} to ${name.toString().enquoted()}"
-        }
-
-    buildConfigField("co.touchlab.skie.plugin.util.StringMap", "KOTLIN_TO_SKIE_KGP_VERSION", "mapOf($kotlinToSkieKgpVersion)")
-
-    buildConfigField("String", "SKIE_VERSION", "\"${project.version}\"")
-}
-
-kotlin {
-    sourceSets {
-        main {
-            kotlin.srcDirs(
-                "src/main/kotlin-compiler-attribute",
-            )
-        }
-    }
-}
-
-configurations.configureEach {
-    attributes {
-        @Suppress("UnstableApiUsage")
-        attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(gradleApiVersionDimension().components.min().value))
-    }
-}
-
-dependencies {
-    api(projects.gradle.gradlePluginApi)
-    api(projects.common.configuration.configurationDeclaration)
-    compileOnly("dev.gradleplugins:gradle-api:${gradleApiVersionDimension().components.min().value}")
-    compileOnly(libs.plugin.kotlin.gradle.api)
-
-    testImplementation(kotlin("test"))
-}
-
-tasks.named("compileKotlin").configure {
-    val gradleApiVersions = project.gradleApiVersionDimension()
-    val kotlinToolingVersions = project.kotlinToolingVersionDimension()
-
-    gradleApiVersions.components.forEach { gradleApiVersion ->
-        kotlinToolingVersions.components.forEach { kotlinToolingVersion ->
-            val shimConfiguration = configurations.detachedConfiguration(
-                projects.gradle.gradlePlugin,
-            ).apply {
-                attributes {
-                    attribute(
-                        KotlinCompilerVersion.attribute,
-                        objects.named(KotlinCompilerVersion::class.java, kotlinToolingVersion.value),
-                    )
-                    attribute(
-                        GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
-                        objects.named(GradlePluginApiVersion::class.java, gradleApiVersion.value),
-                    )
-                }
-            }
-            dependsOn(shimConfiguration)
-        }
-    }
-}
-
-gradlePlugin {
-    website = "https://skie.touchlab.co"
-    vcsUrl = "https://github.com/touchlab/SKIE.git"
-
-    this.plugins {
-        create("co.touchlab.skie") {
-            id = "co.touchlab.skie"
-            displayName = "Swift and Kotlin, unified"
-            implementationClass = "co.touchlab.skie.plugin.SkieLoaderPlugin"
-            version = project.version
-
-            description = "A Gradle plugin to add Swift into Kotlin/Native framework."
-            tags = listOf(
-                "swift",
-                "kotlin",
-                "native",
-                "compiler",
-            )
-        }
-    }
-}
diff --git a/SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts b/SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts
similarity index 63%
rename from SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts
rename to SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts
index e05ebf641..beaf1862c 100644
--- a/SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts
+++ b/SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 }
 
 skiePublishing {
-    name = "SKIE Gradle Plugin API"
-    description = "API that's implemented by the SKIE Gradle Plugin, used by the loader module."
+    name = "SKIE Gradle Plugin Shim API"
+    description = "API that's implemented by the SKIE Gradle Plugin Shim Impl, used by the main plugin module to interact with Kotlin Gradle Plugin."
 }
 
 kotlin {
@@ -14,6 +14,9 @@ kotlin {
             dependencies {
                 api(projects.common.configuration.configurationDeclaration)
                 implementation(projects.common.configuration.configurationApi)
+
+                compileOnly(libs.plugin.kotlin.gradle)
+                compileOnly(libs.plugin.kotlin.gradle.api)
             }
         }
     }
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/DistributionProvider.kt b/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/DistributionProvider.kt
new file mode 100644
index 000000000..41cbdd642
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/DistributionProvider.kt
@@ -0,0 +1,11 @@
+package co.touchlab.skie.plugin.shim
+
+import org.jetbrains.kotlin.konan.target.Distribution
+
+interface DistributionProvider {
+
+    fun provideDistribution(
+        konanHome: String,
+        propertyOverrides: Map<String, String>?
+    ): Distribution
+}
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/NativeCompilerDownloaderProvider.kt b/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/NativeCompilerDownloaderProvider.kt
new file mode 100644
index 000000000..560e9515e
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/NativeCompilerDownloaderProvider.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.plugin.shim
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
+
+interface NativeCompilerDownloaderProvider {
+    fun provide(project: Project): NativeCompilerDownloader
+}
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/ShimEntrypoint.kt b/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/ShimEntrypoint.kt
new file mode 100644
index 000000000..2742b97b8
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/ShimEntrypoint.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.plugin.shim
+
+interface ShimEntrypoint {
+    val distributionProvider: DistributionProvider
+
+    val nativeCompilerDownloaderProvider: NativeCompilerDownloaderProvider
+}
diff --git a/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts b/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts
new file mode 100644
index 000000000..c82593575
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts
@@ -0,0 +1,97 @@
+import co.touchlab.skie.gradle.publish.dependencyName
+import co.touchlab.skie.gradle.util.enquoted
+import co.touchlab.skie.gradle.version.gradleApiVersion
+import co.touchlab.skie.gradle.version.kotlinToolingVersion
+import co.touchlab.skie.gradle.version.target.ExpectActualBuildConfigGenerator
+
+plugins {
+    id("skie.shim")
+    id("skie.publishable")
+
+    id("dev.buildconfig")
+}
+
+skiePublishing {
+    name = "SKIE Gradle Plugin"
+    description = "Gradle plugin for configuring SKIE compiler plugin.."
+
+    name = "SKIE Gradle Plugin Shim Implementation"
+    description = "Implementation of the SKIE Gradle Plugin Shim API, used by the main plugin module to interact with Kotlin Gradle Plugin."
+}
+
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                // TODO: It might be worthwhile to make this compile-time safe, so we don't have to manually check. Or at least a test?
+                // Whichever dependency is brought in by `gradle-plugin-loader` has to be `compileOnly` as we don't want duplicate classes.
+                compileOnly(projects.gradle.gradlePluginShimApi)
+                compileOnly(projects.common.configuration.configurationDeclaration)
+
+                implementation(libs.ci.info)
+                implementation(libs.jgit)
+                implementation(libs.mixpanel)
+
+                implementation(projects.common.analytics)
+                implementation(projects.common.util)
+            }
+        }
+    }
+}
+
+buildConfig {
+    generator(
+        ExpectActualBuildConfigGenerator(
+            isActualImplementation = false,
+            internalVisibility = false,
+        )
+    )
+
+    buildConfigField("String", "KOTLIN_PLUGIN_GROUP", "")
+    buildConfigField("String", "KOTLIN_PLUGIN_NAME", "")
+    buildConfigField("String", "KOTLIN_PLUGIN_VERSION", "")
+    buildConfigField("String", "KOTLIN_TOOLING_VERSION", "")
+    buildConfigField("String", "GRADLE_API_VERSION", "")
+    buildConfigField("String", "RUNTIME_DEPENDENCY_GROUP", "")
+    buildConfigField("String", "RUNTIME_DEPENDENCY_NAME", "")
+    buildConfigField("String", "RUNTIME_DEPENDENCY_VERSION", "")
+    buildConfigField("String", "KOTLIN_PLUGIN_ID", "")
+    buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "")
+}
+
+multiDimensionTarget.configureSourceSet { sourceSet ->
+    if (sourceSet.isRoot) {
+        kotlinSourceSet.kotlin.srcDir(
+            "src/kgp_common/gradle_common/kotlin-compiler-attribute-local",
+        )
+    }
+}
+
+multiDimensionTarget.configureSourceSet { sourceSet ->
+    if (!sourceSet.isTarget || compilation.isTest) { return@configureSourceSet }
+
+    buildConfig {
+        this.sourceSets.named(kotlinSourceSet.name).configure {
+            generator(ExpectActualBuildConfigGenerator(isActualImplementation = true, internalVisibility = false))
+            className.set("BuildConfig")
+
+            val kotlinPlugin = projects.compiler.kotlinPlugin.dependencyProject
+
+            buildConfigField("String", "KOTLIN_PLUGIN_GROUP", kotlinPlugin.group.toString().enquoted())
+            buildConfigField("String", "KOTLIN_PLUGIN_NAME", kotlinPlugin.name.enquoted())
+            buildConfigField("String", "KOTLIN_PLUGIN_VERSION", kotlinPlugin.version.toString().enquoted())
+            buildConfigField("String", "KOTLIN_TOOLING_VERSION", sourceSet.kotlinToolingVersion.value.enquoted())
+            buildConfigField("String", "GRADLE_API_VERSION", sourceSet.gradleApiVersion.value.enquoted())
+
+            val runtime = project.provider { projects.runtime.runtimeKotlin.dependencyProject }
+            buildConfigField("String", "RUNTIME_DEPENDENCY_GROUP", runtime.map { it.group.toString().enquoted() })
+            buildConfigField("String", "RUNTIME_DEPENDENCY_NAME", runtime.map { it.name.enquoted() })
+            buildConfigField("String", "RUNTIME_DEPENDENCY_VERSION", runtime.map { it.version.toString().enquoted() })
+
+            val pluginId: String by properties
+            buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"$pluginId\"")
+
+            buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "\"a4c9352b6713103c0f8621757a35b8c9\"")
+        }
+    }
+}
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin-compiler-attribute-local b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin-compiler-attribute-local
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin-compiler-attribute-local
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin-compiler-attribute-local
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/DistributionProviderImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/DistributionProviderImpl.kt
new file mode 100644
index 000000000..996d964c1
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/DistributionProviderImpl.kt
@@ -0,0 +1,12 @@
+package co.touchlab.skie.plugin.shim
+
+import org.jetbrains.kotlin.konan.target.Distribution
+
+object DistributionProviderImpl: DistributionProvider {
+    override fun provideDistribution(
+        konanHome: String,
+        propertyOverrides: Map<String, String>?,
+    ): Distribution {
+        return Distribution(konanHome = konanHome, propertyOverrides = propertyOverrides)
+    }
+}
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/NativeCompilerDownloaderProviderImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/NativeCompilerDownloaderProviderImpl.kt
new file mode 100644
index 000000000..760ed5ac1
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/NativeCompilerDownloaderProviderImpl.kt
@@ -0,0 +1,11 @@
+package co.touchlab.skie.plugin.shim
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
+
+object NativeCompilerDownloaderProviderImpl: NativeCompilerDownloaderProvider {
+    override fun provide(project: Project): NativeCompilerDownloader {
+        return NativeCompilerDownloader(project)
+    }
+
+}
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ShimEntrypointImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ShimEntrypointImpl.kt
new file mode 100644
index 000000000..cc8550b9a
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ShimEntrypointImpl.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.plugin.shim
+
+// Constructed through reflection in SKIE Gradle Plugin.
+@Suppress("unused")
+class ShimEntrypointImpl: ShimEntrypoint {
+    override val distributionProvider = DistributionProviderImpl
+    override val nativeCompilerDownloaderProvider = NativeCompilerDownloaderProviderImpl
+}
diff --git a/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts b/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts
index a3cc79ce2..3db9f63d0 100644
--- a/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts
+++ b/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts
@@ -1,94 +1,133 @@
+import co.touchlab.skie.gradle.KotlinCompilerVersion
 import co.touchlab.skie.gradle.publish.dependencyName
 import co.touchlab.skie.gradle.util.enquoted
-import co.touchlab.skie.gradle.version.gradleApiVersion
-import co.touchlab.skie.gradle.version.kotlinToolingVersion
-import co.touchlab.skie.gradle.version.target.ExpectActualBuildConfigGenerator
+import co.touchlab.skie.gradle.util.stringListProperty
+import co.touchlab.skie.gradle.version.KotlinToolingVersionComponent
+import co.touchlab.skie.gradle.version.gradleApiVersionDimension
+import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
 
 plugins {
-    id("skie.shim")
+    id("skie.gradle.plugin")
     id("skie.publishable")
-
     id("dev.buildconfig")
 }
 
 skiePublishing {
     name = "SKIE Gradle Plugin"
-    description = "Gradle plugin for configuring SKIE compiler plugin.."
+    description = "Gradle plugin for configuring SKIE compiler plugin."
 }
 
-kotlin {
-    sourceSets {
-        val commonMain by getting {
-            dependencies {
-                // TODO: It might be worthwhile to make this compile-time safe, so we don't have to manually check. Or at least a test?
-                // Whichever dependency is brought in by `gradle-plugin-loader` has to be `compileOnly` as we don't want duplicate classes.
-                compileOnly(projects.gradle.gradlePluginApi)
-                compileOnly(projects.common.configuration.configurationDeclaration)
-
-                implementation(libs.ci.info)
-                implementation(libs.jgit)
-                implementation(libs.mixpanel)
-
-                implementation(projects.common.analytics)
-                implementation(projects.common.util)
+buildConfig {
+    val shimImpl = project.provider { projects.gradle.gradlePluginShimImpl.dependencyProject }
+    buildConfigField("String", "SKIE_GRADLE_PLUGIN", shimImpl.map { it.dependencyName.enquoted() })
+
+    val kotlinToSkieKgpVersion = project.kotlinToolingVersionDimension().components
+        .flatMap { versionComponent ->
+            versionComponent.supportedVersions.map { version ->
+                version to versionComponent.name
             }
         }
-    }
-}
+        .joinToString { (version, name) ->
+            "${version.toString().enquoted()} to ${name.toString().enquoted()}"
+        }
 
-buildConfig {
-    generator(
-        ExpectActualBuildConfigGenerator(
-            isActualImplementation = false,
-            internalVisibility = false,
-        )
-    )
-
-    buildConfigField("String", "KOTLIN_PLUGIN_GROUP", "")
-    buildConfigField("String", "KOTLIN_PLUGIN_NAME", "")
-    buildConfigField("String", "KOTLIN_PLUGIN_VERSION", "")
-    buildConfigField("String", "KOTLIN_TOOLING_VERSION", "")
-    buildConfigField("String", "GRADLE_API_VERSION", "")
-    buildConfigField("String", "RUNTIME_DEPENDENCY_GROUP", "")
-    buildConfigField("String", "RUNTIME_DEPENDENCY_NAME", "")
-    buildConfigField("String", "RUNTIME_DEPENDENCY_VERSION", "")
-    buildConfigField("String", "KOTLIN_PLUGIN_ID", "")
-    buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "")
+    buildConfigField("co.touchlab.skie.plugin.util.StringMap", "KOTLIN_TO_SKIE_KGP_VERSION", "mapOf($kotlinToSkieKgpVersion)")
+
+    buildConfigField("String", "SKIE_VERSION", "\"${project.version}\"")
+
+    val kotlinPlugin = project.provider { projects.compiler.kotlinPlugin.dependencyProject }
+    buildConfigField("String", "KOTLIN_PLUGIN_GROUP", kotlinPlugin.map { it.group.toString().enquoted() })
+    buildConfigField("String", "KOTLIN_PLUGIN_NAME", kotlinPlugin.map { it.name.enquoted() })
+    buildConfigField("String", "KOTLIN_PLUGIN_VERSION", kotlinPlugin.map { it.version.toString().enquoted() })
+
+    val runtime = project.provider { projects.runtime.runtimeKotlin.dependencyProject }
+    buildConfigField("String", "RUNTIME_DEPENDENCY_GROUP", runtime.map { it.group.toString().enquoted() })
+    buildConfigField("String", "RUNTIME_DEPENDENCY_NAME", runtime.map { it.name.enquoted() })
+    buildConfigField("String", "RUNTIME_DEPENDENCY_VERSION", runtime.map { it.version.toString().enquoted() })
+
+    val pluginId: String by properties
+    buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"$pluginId\"")
+
+    buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "\"a4c9352b6713103c0f8621757a35b8c9\"")
 }
 
-multiDimensionTarget.configureSourceSet { sourceSet ->
-    if (sourceSet.isRoot) {
-        kotlinSourceSet.kotlin.srcDir(
-            "src/kgp_common/gradle_common/kotlin-compiler-attribute-local",
-        )
+kotlin {
+    sourceSets {
+        main {
+            kotlin.srcDirs(
+                "src/main/kotlin-compiler-attribute",
+            )
+        }
     }
 }
 
-multiDimensionTarget.configureSourceSet { sourceSet ->
-    if (!sourceSet.isTarget || compilation.isTest) { return@configureSourceSet }
+configurations.configureEach {
+    attributes {
+        @Suppress("UnstableApiUsage")
+        attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(gradleApiVersionDimension().components.min().value))
+    }
+}
 
-    buildConfig {
-        this.sourceSets.named(kotlinSourceSet.name).configure {
-            generator(ExpectActualBuildConfigGenerator(isActualImplementation = true, internalVisibility = false))
-            className.set("BuildConfig")
+dependencies {
+    api(projects.gradle.gradlePluginShimApi)
+    api(projects.common.configuration.configurationDeclaration)
+    compileOnly("dev.gradleplugins:gradle-api:${gradleApiVersionDimension().components.min().value}")
+    compileOnly(libs.plugin.kotlin.gradle.api)
+    compileOnly(libs.plugin.kotlin.gradle)
 
-            val kotlinPlugin = projects.compiler.kotlinPlugin.dependencyProject
+    implementation(libs.ci.info)
+    implementation(libs.jgit)
+    implementation(libs.mixpanel)
 
-            buildConfigField("String", "KOTLIN_PLUGIN_GROUP", kotlinPlugin.group.toString().enquoted())
-            buildConfigField("String", "KOTLIN_PLUGIN_NAME", kotlinPlugin.name.enquoted())
-            buildConfigField("String", "KOTLIN_PLUGIN_VERSION", kotlinPlugin.version.toString().enquoted())
-            buildConfigField("String", "KOTLIN_TOOLING_VERSION", sourceSet.kotlinToolingVersion.value.enquoted())
-            buildConfigField("String", "GRADLE_API_VERSION", sourceSet.gradleApiVersion.value.enquoted())
+    implementation(projects.common.analytics)
+    implementation(projects.common.util)
 
-            val runtime = project.provider { projects.runtime.runtimeKotlin.dependencyProject }
-            buildConfigField("String", "RUNTIME_DEPENDENCY_GROUP", runtime.map { it.group.toString().enquoted() })
-            buildConfigField("String", "RUNTIME_DEPENDENCY_NAME", runtime.map { it.name.enquoted() })
-            buildConfigField("String", "RUNTIME_DEPENDENCY_VERSION", runtime.map { it.version.toString().enquoted() })
+    testImplementation(kotlin("test"))
+}
 
-            val pluginId: String by properties
-            buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"$pluginId\"")
+tasks.named("compileKotlin").configure {
+    val gradleApiVersions = project.gradleApiVersionDimension()
+    val kotlinToolingVersions = project.kotlinToolingVersionDimension()
+
+    gradleApiVersions.components.forEach { gradleApiVersion ->
+        kotlinToolingVersions.components.forEach { kotlinToolingVersion ->
+            val shimConfiguration = configurations.detachedConfiguration(
+                projects.gradle.gradlePluginShimImpl,
+            ).apply {
+                attributes {
+                    attribute(
+                        KotlinCompilerVersion.attribute,
+                        objects.named(KotlinCompilerVersion::class.java, kotlinToolingVersion.value),
+                    )
+                    attribute(
+                        GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
+                        objects.named(GradlePluginApiVersion::class.java, gradleApiVersion.value),
+                    )
+                }
+            }
+            dependsOn(shimConfiguration)
+        }
+    }
+}
 
-            buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "\"a4c9352b6713103c0f8621757a35b8c9\"")
+gradlePlugin {
+    website = "https://skie.touchlab.co"
+    vcsUrl = "https://github.com/touchlab/SKIE.git"
+
+    this.plugins {
+        create("co.touchlab.skie") {
+            id = "co.touchlab.skie"
+            displayName = "Swift and Kotlin, unified"
+            implementationClass = "co.touchlab.skie.plugin.SkieGradlePlugin"
+            version = project.version
+
+            description = "A Gradle plugin to add Swift into Kotlin/Native framework."
+            tags = listOf(
+                "swift",
+                "kotlin",
+                "native",
+                "compiler",
+            )
         }
     }
 }
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/SkieGradlePlugin.kt b/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/SkieGradlePlugin.kt
deleted file mode 100644
index 673cf601c..000000000
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/SkieGradlePlugin.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package co.touchlab.skie.plugin
-
-import co.touchlab.skie.plugin.analytics.GradleAnalyticsManager
-import co.touchlab.skie.plugin.configuration.CreateSkieConfigurationTask
-import co.touchlab.skie.plugin.configuration.skieExtension
-import co.touchlab.skie.plugin.coroutines.addDependencyOnSkieRuntime
-import co.touchlab.skie.plugin.coroutines.registerConfigureMinOsVersionTaskIfNeeded
-import co.touchlab.skie.plugin.defaultarguments.disableCachingIfNeeded
-import co.touchlab.skie.plugin.dependencies.SkieCompilerPluginDependencyProvider
-import co.touchlab.skie.plugin.directory.SkieDirectoriesManager
-import co.touchlab.skie.plugin.fatframework.FatFrameworkConfigurator
-import co.touchlab.skie.plugin.subplugin.SkieSubPluginManager
-import co.touchlab.skie.plugin.switflink.SwiftLinkingConfigurator
-import co.touchlab.skie.plugin.util.*
-import co.touchlab.skie.util.plugin.SkiePlugin
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinNativeArtifact
-import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
-import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.kotlinArtifactsExtension
-import org.jetbrains.kotlin.konan.target.HostManager
-
-abstract class SkieGradlePlugin : Plugin<Project> {
-
-    override fun apply(project: Project) {
-        project.extensions.create("skieInternal", SkieInternalExtension::class.java)
-
-        project.configureSkieGradlePlugin()
-
-        project.afterEvaluate {
-            project.configureRuntimeVariantFallback()
-            project.configureSkieCompilerPlugin()
-        }
-    }
-
-    private fun Project.configureSkieGradlePlugin() {
-        SkieSubPluginManager.configureDependenciesForSubPlugins(project)
-    }
-
-    private fun Project.configureRuntimeVariantFallback() {
-        if (!skieInternal.runtimeVariantFallback.isPresent) {
-            val extraPropertiesKey = "skieRuntimeVariantFallback"
-            skieInternal.runtimeVariantFallback.set(
-                project.properties[extraPropertiesKey]?.toString().toBoolean()
-            )
-        }
-    }
-
-    private fun Project.configureSkieCompilerPlugin() {
-        if (!isSkieEnabled) {
-            return
-        }
-
-        warnOnEmptyFrameworks()
-
-        FatFrameworkConfigurator.configureSkieForFatFrameworks(project)
-
-        kotlinMultiplatformExtension?.appleTargets?.all {
-            val target = this
-            binaries.withType<Framework>().all {
-                val binary = this
-                skieInternal.targets.add(
-                    SkieTarget.TargetBinary(
-                        project = project,
-                        target = target,
-                        binary = binary,
-                    )
-                )
-            }
-        }
-
-        kotlinArtifactsExtension.artifacts.withType<KotlinNativeArtifact>().all {
-            skieInternal.targets.addAll(skieTargetsOf(this))
-        }
-
-        skieInternal.targets.all {
-            configureSkie()
-        }
-    }
-
-    private fun SkieTarget.configureSkie() {
-        SkieDirectoriesManager.configureCreateSkieBuildDirectoryTask(this)
-
-        GradleAnalyticsManager(project).configureAnalytics(this)
-
-        registerConfigureMinOsVersionTaskIfNeeded()
-
-        CreateSkieConfigurationTask.registerTask(this)
-
-        SwiftLinkingConfigurator.configureCustomSwiftLinking(this)
-
-        disableCachingIfNeeded()
-
-        addDependencyOnSkieRuntime()
-
-        SkieSubPluginManager.registerSubPlugins(this)
-
-        configureKotlinCompiler()
-    }
-
-    private fun SkieTarget.configureKotlinCompiler() {
-        addPluginArgument(
-            SkiePlugin.id,
-            SkiePlugin.Options.skieDirectories.subpluginOption(skieDirectories.get()),
-        )
-
-        addToCompilerClasspath(
-            SkieCompilerPluginDependencyProvider.getOrCreateDependencyConfiguration(project)
-        )
-    }
-}
-
-internal fun Project.warnOnEmptyFrameworks() {
-    gradle.taskGraph.whenReady {
-        if (skieInternal.targets.isEmpty()) {
-            logger.warn("w: No Apple frameworks configured in module ${this@warnOnEmptyFrameworks.path}. Make sure you applied SKIE plugin in the correct module.")
-        }
-    }
-}
-
-private val Project.isSkieEnabled: Boolean
-    get() = project.skieExtension.isEnabled.get() && HostManager.hostIsMac
-
-internal val Project.kotlinMultiplatformExtension: KotlinMultiplatformExtension?
-    get() = project.extensions.findByType(KotlinMultiplatformExtension::class.java)
-
-internal val Project.skieInternal: SkieInternalExtension
-    get() = project.extensions.getByType(SkieInternalExtension::class.java)
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersionTask.kt b/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersionTask.kt
deleted file mode 100644
index c41e86ebd..000000000
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersionTask.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package co.touchlab.skie.plugin.coroutines
-
-import co.touchlab.skie.plugin.util.SkieTarget
-import co.touchlab.skie.plugin.util.getKonanHome
-import co.touchlab.skie.util.version.getMinRequiredOsVersionForSwiftAsync
-import co.touchlab.skie.util.version.isLowerVersionThan
-import org.gradle.api.DefaultTask
-import org.gradle.api.Project
-import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.TaskAction
-import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBinary
-import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.KotlinNativeLinkArtifactTask
-import org.jetbrains.kotlin.konan.properties.resolvablePropertyString
-import org.jetbrains.kotlin.konan.target.Distribution
-import org.jetbrains.kotlin.konan.target.KonanTarget
-import java.util.Properties
-
-internal abstract class ConfigureMinOsVersionTask : DefaultTask() {
-
-    @get:Internal
-    abstract val target: Property<SkieTarget>
-
-    @TaskAction
-    fun runTask() {
-        val target = target.get()
-        val konanTarget = target.konanTarget
-        val distribution = target.distribution.get()
-
-        fun overrideVersion(name: String) {
-            val currentMinVersion = distribution.properties.targetString(name, konanTarget)
-            val minRequiredVersion = getMinRequiredOsVersionForSwiftAsync(konanTarget.name)
-
-            if (currentMinVersion == null || currentMinVersion.isLowerVersionThan(minRequiredVersion)) {
-                target.addFreeCompilerArgs("$overrideKonanPropertiesKey=${name}.${konanTarget.name}=$minRequiredVersion")
-            }
-        }
-
-        overrideVersion("osVersionMin")
-        overrideVersion("osVersionMinSinceXcode15")
-    }
-
-    sealed interface NativeBinaryOrArtifact {
-        data class Binary(val binary: NativeBinary): NativeBinaryOrArtifact
-        data class Artifact(val task: KotlinNativeLinkArtifactTask): NativeBinaryOrArtifact
-
-        val project: Project
-            get() = when (this) {
-                is Binary -> binary.project
-                is Artifact -> task.project
-            }
-
-        val konanTarget: KonanTarget
-            get() = when (this) {
-                is Binary -> binary.target.konanTarget
-                is Artifact -> task.konanTarget
-            }
-
-        var freeCompilerArgs: List<String>
-            get() = when (this) {
-                is Binary -> binary.freeCompilerArgs
-                is Artifact -> task.toolOptions.freeCompilerArgs.get()
-            }
-            set(value) {
-                when (this) {
-                    is Binary -> binary.freeCompilerArgs = value
-                    is Artifact -> task.toolOptions.freeCompilerArgs.set(value)
-                }
-            }
-
-
-    }
-}
-
-private val SkieTarget.distribution: Provider<Distribution>
-    get() = freeCompilerArgs.map {
-        val overrideKonanProperties = parseOverrideKonanProperties(it)
-        Distribution(konanHome = project.getKonanHome().absolutePath, propertyOverrides = overrideKonanProperties)
-    }
-
-private fun Properties.targetString(name: String, target: KonanTarget): String? =
-    resolvablePropertyString(name, target.name)
-
-private const val overrideKonanPropertiesKey = "-Xoverride-konan-properties"
-
-
-private fun parseOverrideKonanProperties(
-    arguments: List<String>,
-): Map<String, String> =
-    arguments.associate { it.substringBefore('=') to it.substringAfter('=') }
-        .filterKeys { it == overrideKonanPropertiesKey }
-        .flatMap { it.value.split(";") }
-        .associate { it.substringBefore('=') to it.substringAfter('=') }
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt b/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
deleted file mode 100644
index 94f5b794b..000000000
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package co.touchlab.skie.plugin.coroutines
-
-import co.touchlab.skie.plugin.util.SkieTarget
-import co.touchlab.skie.plugin.util.registerSkieTargetBasedTask
-
-internal fun SkieTarget.registerConfigureMinOsVersionTaskIfNeeded() {
-    if (!project.isCoroutinesInteropEnabled) {
-        return
-    }
-
-    val configureMinOsVersionTask = registerSkieTargetBasedTask<ConfigureMinOsVersionTask>("configureMinOsVersion") {
-        this.target.set(this@registerConfigureMinOsVersionTaskIfNeeded)
-    }
-
-    task.configure {
-        dependsOn(configureMinOsVersionTask)
-    }
-}
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KonanHome.kt b/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KonanHome.kt
deleted file mode 100644
index fe4ff32d7..000000000
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KonanHome.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package co.touchlab.skie.plugin.util
-
-import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
-import java.io.File
-
-internal fun Project.getKonanHome(): File =
-    NativeCompilerDownloader(this).compilerDirectory
diff --git a/SKIE/skie-gradle/plugin-loader/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt b/SKIE/skie-gradle/plugin/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-loader/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt
diff --git a/SKIE/skie-gradle/plugin-loader/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt b/SKIE/skie-gradle/plugin/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-loader/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt
diff --git a/SKIE/skie-gradle/plugin-loader/src/main/kotlin/co/touchlab/skie/plugin/SkieLoaderPlugin.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/SkieGradlePlugin.kt
similarity index 58%
rename from SKIE/skie-gradle/plugin-loader/src/main/kotlin/co/touchlab/skie/plugin/SkieLoaderPlugin.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/SkieGradlePlugin.kt
index 4b09e455c..133dbed39 100644
--- a/SKIE/skie-gradle/plugin-loader/src/main/kotlin/co/touchlab/skie/plugin/SkieLoaderPlugin.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/SkieGradlePlugin.kt
@@ -1,24 +1,41 @@
 package co.touchlab.skie.plugin
 
 import co.touchlab.skie.gradle.KotlinCompilerVersion
-import co.touchlab.skie.gradle_plugin_loader.BuildConfig
+import co.touchlab.skie.gradle_plugin.BuildConfig
+import co.touchlab.skie.plugin.analytics.GradleAnalyticsManager
+import co.touchlab.skie.plugin.configuration.CreateSkieConfigurationTask
 import co.touchlab.skie.plugin.configuration.SkieExtension
-import org.gradle.api.Named
+import co.touchlab.skie.plugin.configuration.SkieExtension.Companion.createExtension
+import co.touchlab.skie.plugin.configuration.skieExtension
+import co.touchlab.skie.plugin.coroutines.addDependencyOnSkieRuntime
+import co.touchlab.skie.plugin.coroutines.configureMinOsVersionIfNeeded
+import co.touchlab.skie.plugin.defaultarguments.disableCachingIfNeeded
+import co.touchlab.skie.plugin.dependencies.SkieCompilerPluginDependencyProvider
+import co.touchlab.skie.plugin.directory.SkieDirectoriesManager
+import co.touchlab.skie.plugin.fatframework.FatFrameworkConfigurator
+import co.touchlab.skie.plugin.shim.ShimEntrypoint
+import co.touchlab.skie.plugin.subplugin.SkieSubPluginManager
+import co.touchlab.skie.plugin.switflink.SwiftLinkingConfigurator
+import co.touchlab.skie.plugin.util.*
+import co.touchlab.skie.util.plugin.SkiePlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.attributes.Category
 import org.gradle.api.attributes.LibraryElements
 import org.gradle.api.attributes.Usage
 import org.gradle.api.attributes.plugin.GradlePluginApiVersion
-import org.gradle.api.model.ObjectFactory
 import org.gradle.configurationcache.extensions.serviceOf
 import org.gradle.internal.classloader.HashingClassLoaderFactory
 import org.gradle.internal.classpath.DefaultClassPath
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinNativeArtifact
+import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
+import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.kotlinArtifactsExtension
+import org.jetbrains.kotlin.konan.target.HostManager
 
-@Suppress("unused")
-abstract class SkieLoaderPlugin : Plugin<Project> {
+abstract class SkieGradlePlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
         // We need to register the extension here, so that Gradle knows the type of it in the build script.
@@ -27,10 +44,19 @@ abstract class SkieLoaderPlugin : Plugin<Project> {
         }
 
         val kotlinVersion = project.getValidKotlinVersion() ?: return
+        val shims = project.loadSkieGradlePluginShim(kotlinVersion) ?: return
 
-        project.loadSkieGradlePlugin(kotlinVersion)
+        project.extensions.create("skieInternal", SkieInternalExtension::class.java)
+
+        project.configureSkieGradlePlugin()
+
+        project.afterEvaluate {
+            project.configureRuntimeVariantFallback()
+            project.configureSkieCompilerPlugin(shims, kotlinVersion)
+        }
     }
 
+
     private fun Project.getValidKotlinVersion(): String? {
         val kotlinVersion = getKotlinVersionString()
         val kgpVersion = kotlinVersion?.let { BuildConfig.KOTLIN_TO_SKIE_KGP_VERSION[it] }
@@ -89,7 +115,7 @@ abstract class SkieLoaderPlugin : Plugin<Project> {
     private fun Project.getKotlinVersionString(): String? =
         (project.kotlinGradlePluginVersionOverride ?: project.kotlinGradlePluginVersion ?: project.rootProject.kotlinGradlePluginVersion)
 
-    private fun Project.loadSkieGradlePlugin(kotlinVersion: String) {
+    private fun Project.loadSkieGradlePluginShim(kotlinVersion: String): ShimEntrypoint? {
         val gradleVersion = GradleVersion.current().version
         logger.info("Resolving SKIE gradle plugin for Kotlin plugin version $kotlinVersion and Gradle version $gradleVersion")
 
@@ -132,20 +158,18 @@ abstract class SkieLoaderPlugin : Plugin<Project> {
             null,
         )
 
-        val probablySkiePluginClass = skieGradleClassLoader.loadClass("co.touchlab.skie.plugin.SkieGradlePlugin")
-        if (!Plugin::class.java.isAssignableFrom(probablySkiePluginClass)) {
+        val probablyShimEntrypointImplClass = skieGradleClassLoader.loadClass("co.touchlab.skie.plugin.shim.ShimEntrypointImpl")
+        if (!ShimEntrypoint::class.java.isAssignableFrom(probablyShimEntrypointImplClass)) {
             reportSkieLoaderError(
                 """
-                    Loaded class ${probablySkiePluginClass.name} does not implement ${Plugin::class.java.name}!
+                    Loaded class ${probablyShimEntrypointImplClass.name} does not implement ${ShimEntrypoint::class.java.name}!
                     This is a bug in SKIE - please report it to the SKIE developers.
                 """.trimIndent(),
             )
-            return
+            return null
         }
 
-        @Suppress("UNCHECKED_CAST")
-        val shimPlugin: Class<Plugin<Project>> = probablySkiePluginClass as Class<Plugin<Project>>
-        plugins.apply(shimPlugin)
+        return probablyShimEntrypointImplClass.getConstructor().newInstance() as ShimEntrypoint
     }
 
     private val Project.kotlinGradlePluginVersion: String?
@@ -174,6 +198,96 @@ abstract class SkieLoaderPlugin : Plugin<Project> {
         return artifact?.moduleVersion?.id?.version
     }
 
-    private inline fun <reified T : Named> ObjectFactory.named(name: String): T =
-        named(T::class.java, name)
+    private fun Project.configureSkieGradlePlugin() {
+        SkieSubPluginManager.configureDependenciesForSubPlugins(project)
+    }
+
+    private fun Project.configureRuntimeVariantFallback() {
+        if (!skieInternal.runtimeVariantFallback.isPresent) {
+            val extraPropertiesKey = "skieRuntimeVariantFallback"
+            skieInternal.runtimeVariantFallback.set(
+                project.properties[extraPropertiesKey]?.toString().toBoolean()
+            )
+        }
+    }
+
+    private fun Project.configureSkieCompilerPlugin(shims: ShimEntrypoint, kotlinToolingVersion: String) {
+        if (!isSkieEnabled) {
+            return
+        }
+
+        warnOnEmptyFrameworks()
+
+        FatFrameworkConfigurator.configureSkieForFatFrameworks(project)
+
+        kotlinMultiplatformExtension?.appleTargets?.all {
+            val target = this
+            binaries.withType<Framework>().all {
+                val binary = this
+                skieInternal.targets.add(
+                    SkieTarget.TargetBinary(
+                        project = project,
+                        target = target,
+                        binary = binary,
+                    )
+                )
+            }
+        }
+
+        kotlinArtifactsExtension.artifacts.withType<KotlinNativeArtifact>().all {
+            skieInternal.targets.addAll(skieTargetsOf(this))
+        }
+
+        skieInternal.targets.all {
+            configureSkie(shims, kotlinToolingVersion)
+        }
+    }
+
+    private fun SkieTarget.configureSkie(shims: ShimEntrypoint, kotlinToolingVersion: String) {
+        SkieDirectoriesManager.configureCreateSkieBuildDirectoryTask(this)
+
+        GradleAnalyticsManager(project).configureAnalytics(this)
+
+        configureMinOsVersionIfNeeded(shims)
+
+        CreateSkieConfigurationTask.registerTask(this)
+
+        SwiftLinkingConfigurator.configureCustomSwiftLinking(this)
+
+        disableCachingIfNeeded()
+
+        addDependencyOnSkieRuntime(kotlinToolingVersion)
+
+        SkieSubPluginManager.registerSubPlugins(this)
+
+        configureKotlinCompiler(kotlinToolingVersion)
+    }
+
+    private fun SkieTarget.configureKotlinCompiler(kotlinToolingVersion: String) {
+        addPluginArgument(
+            SkiePlugin.id,
+            SkiePlugin.Options.skieDirectories.subpluginOption(skieDirectories.get()),
+        )
+
+        addToCompilerClasspath(
+            SkieCompilerPluginDependencyProvider.getOrCreateDependencyConfiguration(project, kotlinToolingVersion)
+        )
+    }
 }
+
+internal fun Project.warnOnEmptyFrameworks() {
+    gradle.taskGraph.whenReady {
+        if (skieInternal.targets.isEmpty()) {
+            logger.warn("w: No Apple frameworks configured in module ${this@warnOnEmptyFrameworks.path}. Make sure you applied SKIE plugin in the correct module.")
+        }
+    }
+}
+
+private val Project.isSkieEnabled: Boolean
+    get() = project.skieExtension.isEnabled.get() && HostManager.hostIsMac
+
+internal val Project.kotlinMultiplatformExtension: KotlinMultiplatformExtension?
+    get() = project.extensions.findByType(KotlinMultiplatformExtension::class.java)
+
+internal val Project.skieInternal: SkieInternalExtension
+    get() = project.extensions.getByType(SkieInternalExtension::class.java)
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
similarity index 74%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
index 1e5e22d77..8e9d883c9 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
@@ -3,6 +3,7 @@ package co.touchlab.skie.plugin.analytics
 import co.touchlab.skie.plugin.util.SkieTarget
 import co.touchlab.skie.plugin.analytics.environment.GradleEnvironmentAnalytics
 import co.touchlab.skie.plugin.analytics.git.GitAnalytics
+import co.touchlab.skie.plugin.analytics.git.getGitRoot
 import co.touchlab.skie.plugin.analytics.hardware.HardwareAnalytics
 import co.touchlab.skie.plugin.analytics.performance.GradlePerformanceAnalytics
 import co.touchlab.skie.plugin.analytics.project.ProjectAnalytics
@@ -13,6 +14,7 @@ import co.touchlab.skie.plugin.util.*
 import co.touchlab.skie.plugin.util.registerSkieTargetBasedTask
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import java.time.Duration
 
 internal class GradleAnalyticsManager(
@@ -39,8 +41,9 @@ internal class GradleAnalyticsManager(
 
             dependsOn(target.createSkieBuildDirectoryTask)
 
+            val skieExtension = project.skieExtension
             onlyIf {
-                val analyticsConfiguration = project.skieExtension.analytics
+                val analyticsConfiguration = skieExtension.analytics
 
                 analyticsConfiguration.enabled.get() && !analyticsConfiguration.disableUpload.get()
             }
@@ -55,15 +58,30 @@ internal class GradleAnalyticsManager(
         target: SkieTarget,
         analyticsCollectorProvider: Provider<AnalyticsCollector>,
     ) {
+        val gradleVersion = project.provider { project.gradle.gradleVersion }
+        val kotlinPluginVersion = project.provider { project.getKotlinPluginVersion() }
+        val gitRoot = project.getGitRoot()
+        val rootProjectName = project.rootProject.name
+        val projectPath = project.path
+        val projectGroup = project.group
         target.task.configureDoFirstOptimized {
             analyticsCollectorProvider.get().collectAsync(
-                GradleEnvironmentAnalytics.Producer(project),
+                GradleEnvironmentAnalytics.Producer(
+                    gradleVersion = gradleVersion,
+                    kotlinPluginVersion = kotlinPluginVersion,
+                ),
 
-                GitAnalytics.Producer(project),
+                GitAnalytics.Producer(
+                    gitRoot = gitRoot,
+                ),
 
                 HardwareAnalytics.Producer,
 
-                ProjectAnalytics.Producer(project),
+                ProjectAnalytics.Producer(
+                    rootProjectName = rootProjectName,
+                    projectPath = projectPath,
+                    projectGroup = projectGroup,
+                ),
             )
         }
 
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
similarity index 79%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
index 0139236bc..215c1be51 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
@@ -6,6 +6,7 @@ import co.touchlab.skie.plugin.util.toPrettyJson
 import co.touchlab.skie.util.BuildConfig
 import io.cloudflight.ci.info.CI
 import org.gradle.api.Project
+import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 internal data class GradleEnvironmentAnalytics(
@@ -18,7 +19,11 @@ internal data class GradleEnvironmentAnalytics(
     val timestampInMs: Long,
 ) {
 
-    class Producer(private val project: Project) : AnalyticsProducer {
+    class Producer(
+        private val gradleVersion: Provider<String>,
+        private val kotlinPluginVersion: Provider<String>,
+    ) : AnalyticsProducer {
+
 
         override val name: String = "gradle-environment"
 
@@ -28,8 +33,8 @@ internal data class GradleEnvironmentAnalytics(
             GradleEnvironmentAnalytics(
                 jvmVersion = Runtime.version().toString(),
                 skieVersion = BuildConfig.SKIE_VERSION,
-                gradleVersion = project.gradle.gradleVersion,
-                kotlinVersion = project.getKotlinPluginVersion(),
+                gradleVersion = gradleVersion.get(),
+                kotlinVersion = kotlinPluginVersion.get(),
                 macOSVersion = System.getProperty("os.version"),
                 ci = CI.server?.serverName,
                 timestampInMs = System.currentTimeMillis(),
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
similarity index 81%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
index 89db3e597..c4a330330 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
@@ -7,6 +7,7 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.ListBranchCommand
 import org.eclipse.jgit.lib.PersonIdent
 import org.gradle.api.Project
+import org.gradle.api.provider.Provider
 import java.io.File
 import java.text.Normalizer
 
@@ -17,14 +18,16 @@ internal data class GitAnalytics(
     val numberOfTags: Int,
 ) {
 
-    class Producer(private val project: Project) : AnalyticsProducer {
+    class Producer(
+        private val gitRoot: Provider<File?>,
+    ) : AnalyticsProducer {
 
         override val configurationFlag: SkieConfigurationFlag = SkieConfigurationFlag.Analytics_Git
 
         override val name: String = "git"
 
         override fun produce(): String {
-            val git = project.getGit() ?: return """{ "error": "git not found" }"""
+            val git = gitRoot.get()?.let { Git.open(it) } ?: return """{ "error": "git not found" }"""
 
             return GitAnalytics(
                 numberOfContributors = git.log().all().call().map { it.authorIdent.normalizedName }.distinct().size,
@@ -39,8 +42,9 @@ internal data class GitAnalytics(
 private val PersonIdent.normalizedName: String
     get() = Normalizer.normalize(name, Normalizer.Form.NFC)
 
-private fun Project.getGit(): Git? =
-    projectDir.findGitRoot()?.let { Git.open(it) }
+internal fun Project.getGitRoot(): Provider<File?> = provider {
+    projectDir.findGitRoot()
+}
 
 private tailrec fun File.findGitRoot(): File? =
     if (resolve(".git").exists()) this else parentFile?.findGitRoot()
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
similarity index 70%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
index d6b88b4a7..fb30b354f 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
@@ -10,7 +10,11 @@ internal data class ProjectAnalytics(
     val projectId: String,
 ) {
 
-    class Producer(private val project: Project) : AnalyticsProducer {
+    class Producer(
+        private val rootProjectName: String,
+        private val projectPath: String,
+        private val projectGroup: Any,
+    ) : AnalyticsProducer {
 
         override val configurationFlag: SkieConfigurationFlag = SkieConfigurationFlag.Analytics_Project
 
@@ -18,7 +22,7 @@ internal data class ProjectAnalytics(
 
         override fun produce(): String =
             ProjectAnalytics(
-                projectId = "${project.rootProject.name}${project.path}${project.group}".hashed(),
+                projectId = "${rootProjectName}${projectPath}${projectGroup}".hashed(),
             ).toPrettyJson()
     }
 }
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
similarity index 76%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
index 9b64e9975..b916bce2a 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
@@ -2,6 +2,7 @@ package co.touchlab.skie.plugin.configuration
 
 import co.touchlab.skie.plugin.util.SkieTarget
 import co.touchlab.skie.plugin.configuration.SkieExtension.Companion.buildConfiguration
+import co.touchlab.skie.plugin.configuration.util.GradleSkieConfiguration
 import co.touchlab.skie.plugin.directory.createSkieBuildDirectoryTask
 import co.touchlab.skie.plugin.util.registerSkieTargetBasedTask
 import co.touchlab.skie.plugin.util.skieBuildDirectory
@@ -9,12 +10,18 @@ import co.touchlab.skie.plugin.util.skieConfiguration
 import groovy.json.JsonOutput
 import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import org.jetbrains.kotlin.gradle.utils.provider
 import java.io.File
 
 internal abstract class CreateSkieConfigurationTask : DefaultTask() {
 
+    @get:Input
+    abstract val configuration: Property<GradleSkieConfiguration>
+
     @get:OutputFile
     abstract val configurationFile: Property<File>
 
@@ -28,7 +35,7 @@ internal abstract class CreateSkieConfigurationTask : DefaultTask() {
 
         configurationFile.parentFile.mkdirs()
 
-        val configuration = project.skieExtension.buildConfiguration()
+        val configuration = configuration.get()
         val serializedConfiguration = JsonOutput.toJson(configuration)
 
         configurationFile.writeText(serializedConfiguration)
@@ -39,12 +46,13 @@ internal abstract class CreateSkieConfigurationTask : DefaultTask() {
         fun registerTask(target: SkieTarget) {
             val createConfiguration = target.registerSkieTargetBasedTask<CreateSkieConfigurationTask>("createConfiguration") {
                 configurationFile.set(target.skieBuildDirectory.skieConfiguration)
+                configuration.set(project.provider { project.skieExtension.buildConfiguration() })
 
                 dependsOn(target.createSkieBuildDirectoryTask)
             }
 
             target.task.configure {
-                inputs.files(createConfiguration.map { it.outputs })
+                inputs.files(createConfiguration)
             }
         }
     }
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/configuration/Project.skieExtension.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/Project.skieExtension.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/configuration/Project.skieExtension.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/Project.skieExtension.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/util/BooleanProperty.takeIf.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/util/BooleanProperty.takeIf.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/util/BooleanProperty.takeIf.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/util/BooleanProperty.takeIf.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/util/GradleSkieConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/util/GradleSkieConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/util/GradleSkieConfiguration.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/util/GradleSkieConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
similarity index 93%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
index 47f54bc1f..0151e6ea4 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
@@ -4,12 +4,11 @@ import co.touchlab.skie.gradle_plugin.BuildConfig
 import co.touchlab.skie.plugin.util.SkieTarget
 import co.touchlab.skie.plugin.skieInternal
 import co.touchlab.skie.plugin.util.lowerCamelCaseName
-import org.jetbrains.kotlin.gradle.dsl.KotlinNativeXCFramework
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractNativeLibrary
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.target.presetName
 
-internal fun SkieTarget.addDependencyOnSkieRuntime() {
+internal fun SkieTarget.addDependencyOnSkieRuntime(kotlinToolingVersion: String) {
     if (!project.isCoroutinesInteropEnabled) {
         return
     }
@@ -32,7 +31,7 @@ internal fun SkieTarget.addDependencyOnSkieRuntime() {
     val dependency = if (project.skieInternal.runtimeVariantFallback.get()) {
         BuildConfig.DEFAULT_RUNTIME_DEPENDENCY
     } else {
-        BuildConfig.SPECIFIC_RUNTIME_DEPENDENCY(konanTarget, BuildConfig.KOTLIN_TOOLING_VERSION)
+        BuildConfig.SPECIFIC_RUNTIME_DEPENDENCY(konanTarget, kotlinToolingVersion)
     }
     configurationNames.forEach { configurationName ->
         project.dependencies.add(configurationName, dependency)
diff --git a/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
new file mode 100644
index 000000000..6d808264c
--- /dev/null
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
@@ -0,0 +1,56 @@
+package co.touchlab.skie.plugin.coroutines
+
+import co.touchlab.skie.plugin.shim.ShimEntrypoint
+import co.touchlab.skie.plugin.util.SkieTarget
+import co.touchlab.skie.plugin.util.getKonanHome
+import co.touchlab.skie.plugin.util.registerSkieTargetBasedTask
+import co.touchlab.skie.util.version.getMinRequiredOsVersionForSwiftAsync
+import co.touchlab.skie.util.version.isLowerVersionThan
+import org.gradle.api.provider.Provider
+import org.jetbrains.kotlin.konan.properties.resolvablePropertyString
+import org.jetbrains.kotlin.konan.target.Distribution
+import org.jetbrains.kotlin.konan.target.KonanTarget
+import java.util.*
+
+internal fun SkieTarget.configureMinOsVersionIfNeeded(shims: ShimEntrypoint) {
+    if (!project.isCoroutinesInteropEnabled) {
+        return
+    }
+
+    val distribution = distribution(shims).get()
+
+    fun overrideVersion(name: String) {
+        val currentMinVersion = distribution.properties.targetString(name, konanTarget)
+        val minRequiredVersion = getMinRequiredOsVersionForSwiftAsync(konanTarget.name)
+
+        if (currentMinVersion == null || currentMinVersion.isLowerVersionThan(minRequiredVersion)) {
+            addFreeCompilerArgs("$overrideKonanPropertiesKey=${name}.${konanTarget.name}=$minRequiredVersion")
+        }
+    }
+
+    overrideVersion("osVersionMin")
+    overrideVersion("osVersionMinSinceXcode15")
+}
+
+
+private fun SkieTarget.distribution(shims: ShimEntrypoint): Provider<Distribution> = freeCompilerArgs.map {
+    val overrideKonanProperties = parseOverrideKonanProperties(it)
+    shims.distributionProvider.provideDistribution(
+        konanHome = project.getKonanHome(shims).absolutePath,
+        propertyOverrides = overrideKonanProperties,
+    )
+}
+
+private fun Properties.targetString(name: String, target: KonanTarget): String? =
+    resolvablePropertyString(name, target.name)
+
+private const val overrideKonanPropertiesKey = "-Xoverride-konan-properties"
+
+
+private fun parseOverrideKonanProperties(
+    arguments: List<String>,
+): Map<String, String> =
+    arguments.associate { it.substringBefore('=') to it.substringAfter('=') }
+        .filterKeys { it == overrideKonanPropertiesKey }
+        .flatMap { it.value.split(";") }
+        .associate { it.substringBefore('=') to it.substringAfter('=') }
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
similarity index 78%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
index b966759db..9585997a9 100644
--- a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
@@ -10,17 +10,17 @@ internal object SkieCompilerPluginDependencyProvider {
 
     private const val configurationName = "skieCompilerPlugin"
 
-    fun getOrCreateDependencyConfiguration(project: Project): Configuration =
+    fun getOrCreateDependencyConfiguration(project: Project, kotlinToolingVersion: String): Configuration =
         project.configurations.findByName(configurationName)
-            ?: createDependencyConfiguration(project)
+            ?: createDependencyConfiguration(project, kotlinToolingVersion)
 
-    private fun createDependencyConfiguration(project: Project): Configuration {
+    private fun createDependencyConfiguration(project: Project, kotlinToolingVersion: String): Configuration {
         val skieCompilerPluginConfiguration = project.configurations.create(configurationName) {
             isCanBeConsumed = false
             isCanBeResolved = true
 
             attributes {
-                attribute(KotlinCompilerVersion.attribute, project.objects.named(BuildConfig.KOTLIN_TOOLING_VERSION))
+                attribute(KotlinCompilerVersion.attribute, project.objects.named(kotlinToolingVersion))
             }
 
             exclude(
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/switflink/SwiftLinkingConfigurator.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/switflink/SwiftLinkingConfigurator.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/switflink/SwiftLinkingConfigurator.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/switflink/SwiftLinkingConfigurator.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
diff --git a/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KonanHome.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KonanHome.kt
new file mode 100644
index 000000000..07c627574
--- /dev/null
+++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KonanHome.kt
@@ -0,0 +1,9 @@
+package co.touchlab.skie.plugin.util
+
+import co.touchlab.skie.plugin.shim.ShimEntrypoint
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
+import java.io.File
+
+internal fun Project.getKonanHome(shims: ShimEntrypoint): File =
+    shims.nativeCompilerDownloaderProvider.provide(this).compilerDirectory
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinPluginExtensions.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinPluginExtensions.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinPluginExtensions.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinPluginExtensions.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToCompilerPluginOption.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToCompilerPluginOption.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToCompilerPluginOption.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToCompilerPluginOption.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/SkieTarget.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/SkieTarget.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/SkieTarget.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/SkieTarget.kt
diff --git a/SKIE/skie-gradle/plugin-loader/src/main/kotlin/co/touchlab/skie/plugin/util/StringMap.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/StringMap.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-loader/src/main/kotlin/co/touchlab/skie/plugin/util/StringMap.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/StringMap.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/TargetTriple.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/TargetTriple.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/TargetTriple.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/TargetTriple.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt
diff --git a/SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt
rename to SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt
diff --git a/SKIE/skie-gradle/plugin-loader/src/test/kotlin/co/touchlab/skie/plugin/SkieGradlePluginTest.kt b/SKIE/skie-gradle/plugin/src/test/kotlin/co/touchlab/skie/plugin/SkieGradlePluginTest.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-loader/src/test/kotlin/co/touchlab/skie/plugin/SkieGradlePluginTest.kt
rename to SKIE/skie-gradle/plugin/src/test/kotlin/co/touchlab/skie/plugin/SkieGradlePluginTest.kt
diff --git a/build-setup/src/main/kotlin-compiler-attribute-local b/build-setup/src/main/kotlin-compiler-attribute-local
index 0d3830773..5d83bde69 120000
--- a/build-setup/src/main/kotlin-compiler-attribute-local
+++ b/build-setup/src/main/kotlin-compiler-attribute-local
@@ -1 +1 @@
-../../../SKIE/skie-gradle/plugin-loader/src/main/kotlin-compiler-attribute
\ No newline at end of file
+../../../SKIE/skie-gradle/plugin/src/main/kotlin-compiler-attribute
\ No newline at end of file
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt
index 1ff3ebecc..25b014d7b 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt
@@ -239,7 +239,7 @@ abstract class DevAcceptanceTests : Plugin<Project> {
             attributes {
                 attribute(KotlinCompilerVersion.attribute, objects.named(target.kotlinToolingVersion.value))
                 attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
-                attribute(KotlinNativeTarget.konanTargetAttribute, MacOsCpuArchitecture.getCurrent().konanTarget)
+                attributeProvider(KotlinNativeTarget.konanTargetAttribute, provider { MacOsCpuArchitecture.getCurrent().konanTarget })
                 attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
             }
         }
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt
index 2a046efe3..465ea7305 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt
@@ -29,12 +29,27 @@ abstract class SkiePublishable : Plugin<Project>, HasMavenPublishPlugin, HasSign
 
         val extension = extensions.create<SkiePublishingExtension>("skiePublishing")
 
+        configureSmokeTestTmpRepository()
         configureMetadata(extension)
         configureKotlinJvmPublicationIfNeeded()
         configureSourcesJar(extension)
         configureJavadocJar()
     }
 
+    private fun Project.configureSmokeTestTmpRepository() {
+        val smokeTestTmpRepositoryPath: String? by this
+        smokeTestTmpRepositoryPath?.let {
+            publishing {
+                repositories {
+                    maven {
+                        url = uri(it)
+                        name = "smokeTestTmp"
+                    }
+                }
+            }
+        }
+    }
+
     private fun Project.configureSigningIfNeeded() {
         val isRelease = !version.toString().endsWith("SNAPSHOT")
         val isPublishing = gradle.startParameter.taskNames.contains("publishToSonatype")
diff --git a/common-gradle/gradle.properties b/common-gradle/gradle.properties
index ed015d944..bc58e6a9f 100644
--- a/common-gradle/gradle.properties
+++ b/common-gradle/gradle.properties
@@ -17,3 +17,9 @@ touchlab.key=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 skieRuntimeVariantFallback=true
 
 kotlinNativeCompilerEmbeddableFromHome=false
+
+#org.gradle.configuration-cache=true
+
+#junit.jupiter.execution.parallel.enabled = true
+#junit.jupiter.execution.parallel.mode.default = concurrent
+#junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common-gradle/gradle/libs.versions.toml b/common-gradle/gradle/libs.versions.toml
index a756a75c0..1f92c4cbb 100644
--- a/common-gradle/gradle/libs.versions.toml
+++ b/common-gradle/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 java = "11"
 kotlin = "1.8.21"
 pluginPublish = "1.2.0"
-kotest = "5.4.0"
+kotest = "5.8.0"
 buildconfig = "4.1.1"
 ktor = "2.2.3"
 nexusPublish = "2.0.0-rc-1"
@@ -35,7 +35,7 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 kotlinx-coroutines-core-legacy = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-legacy" }
 kotlinx-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutines" }
 jackson-databind = { module = " com.fasterxml.jackson.core:jackson-databind", version = "2.14.2" }
-kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.12.0" }
+kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.15.1" }
 ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
 apache-compress = { module = "org.apache.commons:commons-compress", version = "1.22" }
 logback = { module = "ch.qos.logback:logback-classic", version = "1.4.14" }
@@ -47,6 +47,7 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
 kotest-framework-datatest = { module = "io.kotest:kotest-framework-datatest-jvm", version.ref = "kotest" }
+kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
 mockk = { module = "io.mockk:mockk", version = "1.12.5" }
 
 [bundles]
@@ -54,6 +55,7 @@ kotest = [
     "kotest-runner-junit5",
     "kotest-assertions-core",
     "kotest-framework-datatest",
+    "kotest-property",
 ]
 testing-jvm = [
     "kotlin-test",
diff --git a/common-gradle/gradle/wrapper/gradle-wrapper.properties b/common-gradle/gradle/wrapper/gradle-wrapper.properties
index a1f2792d7..d951fac2b 100644
--- a/common-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/common-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dev-support/pure-compiler/framework/build.gradle.kts b/dev-support/pure-compiler/framework/build.gradle.kts
index 5dba25c45..679d99ede 100644
--- a/dev-support/pure-compiler/framework/build.gradle.kts
+++ b/dev-support/pure-compiler/framework/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
                 baseName = "Kotlin"
                 freeCompilerArgs = freeCompilerArgs + listOf("-Xbinary=bundleId=Kotlin")
 
-                export(projects.devSupport.pureCompiler.dependency)
+                export(projects.devSupport.pureCompilerDependency)
 
                 exportedLibraries.forEach {
                     export(it)
@@ -36,7 +36,7 @@ kotlin {
             implementation(libs.kotlinx.coroutines.core)
             implementation("co.touchlab.skie:configuration-annotations")
 
-            api(projects.devSupport.pureCompiler.dependency)
+            api(projects.devSupport.pureCompilerDependency)
 
             exportedLibraries.forEach {
                 api(it)
diff --git a/dev-support/settings.gradle.kts b/dev-support/settings.gradle.kts
index c82db4a1a..90e35a996 100644
--- a/dev-support/settings.gradle.kts
+++ b/dev-support/settings.gradle.kts
@@ -12,7 +12,18 @@ plugins {
     id("dev.settings")
 }
 
-include(
+fun modules(vararg names: String) {
+    names.forEach { name ->
+        val path = name.drop(1).split(":")
+        val joinedName = path.joinToString("-", prefix = ":")
+        include(joinedName)
+        project(joinedName).projectDir = path.fold(rootDir) { acc, directoryName ->
+            acc.resolve(directoryName)
+        }
+    }
+}
+
+modules(
     ":skie:mac",
     ":skie:mac:framework",
     ":skie:mac:dependency",
diff --git a/dev-support/skie/ios/framework/build.gradle.kts b/dev-support/skie/ios/framework/build.gradle.kts
index 6fb78a70a..63e4a2ee7 100644
--- a/dev-support/skie/ios/framework/build.gradle.kts
+++ b/dev-support/skie/ios/framework/build.gradle.kts
@@ -49,7 +49,7 @@ kotlin {
                 baseName = "Kotlin"
                 freeCompilerArgs = freeCompilerArgs + listOf("-Xbinary=bundleId=Kotlin")
 
-                export(projects.devSupport.skie.ios.dependency)
+                export(projects.devSupport.skieIosDependency)
 
                 exportedLibraries.forEach {
                     export(it)
@@ -63,7 +63,7 @@ kotlin {
             implementation(libs.kotlinx.coroutines.core)
             implementation("co.touchlab.skie:configuration-annotations")
 
-            api(projects.devSupport.skie.ios.dependency)
+            api(projects.devSupport.skieIosDependency)
 
             exportedLibraries.forEach {
                 api(it)
diff --git a/dev-support/skie/mac/framework/build.gradle.kts b/dev-support/skie/mac/framework/build.gradle.kts
index 4c7a305bf..92d5f184e 100644
--- a/dev-support/skie/mac/framework/build.gradle.kts
+++ b/dev-support/skie/mac/framework/build.gradle.kts
@@ -57,7 +57,7 @@ kotlin {
                 baseName = "Kotlin"
                 freeCompilerArgs = freeCompilerArgs + listOf("-Xbinary=bundleId=Kotlin")
 
-                export(projects.skie.mac.dependency)
+                export(projects.skieMacDependency)
 
                 exportedLibraries.forEach {
                     export(it)
@@ -71,7 +71,7 @@ kotlin {
             implementation(libs.kotlinx.coroutines.core)
             implementation("co.touchlab.skie:configuration-annotations")
 
-            api(projects.skie.mac.dependency)
+            api(projects.skieMacDependency)
 
             exportedLibraries.forEach {
                 api(it)
diff --git a/test-runner/build.gradle.kts b/test-runner/build.gradle.kts
new file mode 100644
index 000000000..600987e46
--- /dev/null
+++ b/test-runner/build.gradle.kts
@@ -0,0 +1,70 @@
+import co.touchlab.skie.PublishSkieToTempMavenTask
+import org.gradle.tooling.GradleConnector
+
+plugins {
+    kotlin("jvm") version "1.9.22"
+}
+
+dependencies {
+    implementation(kotlin("test"))
+    implementation(gradleTestKit())
+    implementation(libs.kotlinPoet)
+    implementation(libs.bundles.kotest)
+}
+
+println("Start: ${gradle.startParameter}")
+
+val smokeTestRepository = layout.buildDirectory.dir("smokeTestRepo")
+
+
+val publishSkieToTempMaven by tasks.registering(PublishSkieToTempMavenTask::class) {
+    skieSources = rootDir.resolve("../SKIE")
+    tempRepository = smokeTestRepository
+}
+
+testing {
+    suites {
+        val test by getting(JvmTestSuite::class) {
+            useJUnitJupiter("5.10.1")
+
+            dependencies {
+                implementation("org.junit.platform:junit-platform-suite:1.10.2")
+                implementation("org.junit.platform:junit-platform-reporting:1.10.2")
+            }
+
+            targets.all {
+                testTask.configure {
+                    minHeapSize = "1024m"
+                    maxHeapSize = "4024m"
+                    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
+
+                    dependsOn(publishSkieToTempMaven)
+
+                    systemProperty("smokeTestRepository", smokeTestRepository.get().asFile.absolutePath)
+                    systemProperty("junit.platform.reporting.open.xml.enabled", "true")
+                    systemProperty("junit.platform.reporting.output.dir", reports.junitXml.outputLocation.get().asFile.absolutePath.also {
+                        println("Junitxml: ${it}")
+                    })
+
+                    listOf(
+                        "testLevel",
+                        "testTypes",
+                        "matrix.targets",
+                        "matrix.configurations",
+                        "matrix.linkModes",
+                        "matrix.kotlinVersions",
+                        "matrix.gradleVersions",
+                    ).forEach { property ->
+                        val propertyValue = findProperty(property) ?: return@forEach
+                        systemProperty(property, propertyValue)
+                    }
+
+                    testLogging {
+                        events("passed", "skipped", "failed")
+                        showStandardStreams = true
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test-runner/buildSrc/build.gradle.kts b/test-runner/buildSrc/build.gradle.kts
new file mode 100644
index 000000000..876c922b2
--- /dev/null
+++ b/test-runner/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/test-runner/buildSrc/src/main/kotlin/co/touchlab/skie/PublishSkieToTempMavenTask.kt b/test-runner/buildSrc/src/main/kotlin/co/touchlab/skie/PublishSkieToTempMavenTask.kt
new file mode 100644
index 000000000..f7d67836a
--- /dev/null
+++ b/test-runner/buildSrc/src/main/kotlin/co/touchlab/skie/PublishSkieToTempMavenTask.kt
@@ -0,0 +1,40 @@
+package co.touchlab.skie
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import org.gradle.tooling.GradleConnector
+import javax.inject.Inject
+
+abstract class PublishSkieToTempMavenTask @Inject constructor(objects: ObjectFactory): DefaultTask() {
+    // This is @Internal because we only want `.kt` files to be considered as inputs, which we do in `init { }`
+    @get:Internal
+    val skieSources: DirectoryProperty = objects.directoryProperty()
+
+    @get:OutputDirectory
+    val tempRepository: DirectoryProperty = objects.directoryProperty()
+
+    init {
+        inputs.files(skieSources.map { it.asFileTree.matching { this.include { it.file.extension == "kt" } }.also { println(it.files.joinToString("\n") { it.absolutePath }) } })
+    }
+
+    @TaskAction
+    fun publish() {
+        GradleConnector.newConnector()
+            .forProjectDirectory(skieSources.get().asFile)
+            .connect()
+            .use { projectConnection ->
+                projectConnection.newBuild()
+                    .forTasks("publishAllPublicationsToSmokeTestTmpRepository")
+                    .setStandardInput(System.`in`)
+                    .setStandardOutput(System.out)
+                    .setStandardError(System.err)
+                    .addArguments("-PsmokeTestTmpRepositoryPath=${tempRepository.get().asFile.absolutePath}")
+                    .run()
+            }
+    }
+}
diff --git a/test-runner/gradle b/test-runner/gradle
new file mode 120000
index 000000000..03dbf5ae1
--- /dev/null
+++ b/test-runner/gradle
@@ -0,0 +1 @@
+../common-gradle/gradle
\ No newline at end of file
diff --git a/test-runner/gradle.properties b/test-runner/gradle.properties
new file mode 120000
index 000000000..b55e5f454
--- /dev/null
+++ b/test-runner/gradle.properties
@@ -0,0 +1 @@
+../common-gradle/gradle.properties
\ No newline at end of file
diff --git a/test-runner/gradlew b/test-runner/gradlew
new file mode 120000
index 000000000..b168a8a9b
--- /dev/null
+++ b/test-runner/gradlew
@@ -0,0 +1 @@
+../common-gradle/gradlew
\ No newline at end of file
diff --git a/test-runner/gradlew.bat b/test-runner/gradlew.bat
new file mode 120000
index 000000000..671d12c58
--- /dev/null
+++ b/test-runner/gradlew.bat
@@ -0,0 +1 @@
+../common-gradle/gradlew.bat
\ No newline at end of file
diff --git a/test-runner/settings.gradle.kts b/test-runner/settings.gradle.kts
new file mode 100644
index 000000000..e90ffafe5
--- /dev/null
+++ b/test-runner/settings.gradle.kts
@@ -0,0 +1,14 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        google()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/MatrixTest.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/MatrixTest.kt
new file mode 100644
index 000000000..4281199c2
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/MatrixTest.kt
@@ -0,0 +1,13 @@
+package co.touchlab.skie.test.annotation
+
+import co.touchlab.skie.test.runner.SkieTestRunner
+import co.touchlab.skie.test.runner.condition.SmokeTestCondition
+import org.junit.jupiter.api.TestTemplate
+import org.junit.jupiter.api.extension.ExtendWith
+
+@TestTemplate
+@ExtendWith(SkieTestRunner::class)
+@ExtendWith(SmokeTestCondition::class)
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MatrixTest
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Exclude.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Exclude.kt
new file mode 100644
index 000000000..9cd34ab31
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Exclude.kt
@@ -0,0 +1,17 @@
+package co.touchlab.skie.test.annotation.filter
+
+import org.intellij.lang.annotations.Language
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Repeatable
+annotation class Exclude(
+    @Language("RegExp")
+    val targets: String = ".*",
+    @Language("RegExp")
+    val configurations: String = ".*",
+    @Language("RegExp")
+    val linkModes: String = ".*",
+    @Language("RegExp")
+    val kotlinVersions: String = ".*"
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Filter.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Filter.kt
new file mode 100644
index 000000000..ff6333036
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Filter.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.filter
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Filter(
+
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/FilterMatrixWith.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/FilterMatrixWith.kt
new file mode 100644
index 000000000..ab4bacd0d
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/FilterMatrixWith.kt
@@ -0,0 +1,10 @@
+package co.touchlab.skie.test.annotation.filter
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Repeatable
+annotation class FilterMatrixWith(
+    val value: KClass<out MatrixFilter>
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Include.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Include.kt
new file mode 100644
index 000000000..6e8cab959
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Include.kt
@@ -0,0 +1,17 @@
+package co.touchlab.skie.test.annotation.filter
+
+import org.intellij.lang.annotations.Language
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Repeatable
+annotation class Include(
+    @Language("RegExp")
+    val targets: String = ".*",
+    @Language("RegExp")
+    val configurations: String = ".*",
+    @Language("RegExp")
+    val linkModes: String = ".*",
+    @Language("RegExp")
+    val kotlinVersions: String = ".*"
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/MatrixFilter.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/MatrixFilter.kt
new file mode 100644
index 000000000..9436c0eed
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/MatrixFilter.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.runner.SkieTestMatrixSource
+import org.junit.jupiter.api.extension.ExtensionContext
+
+interface MatrixFilter {
+    fun apply(context: ExtensionContext, source: SkieTestMatrixSource)
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyConfigurationCache.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyConfigurationCache.kt
new file mode 100644
index 000000000..b99d9006c
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyConfigurationCache.kt
@@ -0,0 +1,9 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.filter.OnlyConfigurationCacheMatrixFilter
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Repeatable
+@FilterMatrixWith(OnlyConfigurationCacheMatrixFilter::class)
+annotation class OnlyConfigurationCache
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyDebug.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyDebug.kt
new file mode 100644
index 000000000..5a1956d14
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyDebug.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.runner.BuildConfiguration
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@OnlyFor(configurations = [BuildConfiguration.Debug])
+annotation class OnlyDebug
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyDynamic.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyDynamic.kt
new file mode 100644
index 000000000..4dff66757
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyDynamic.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.util.LinkMode
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@OnlyFor(linkModes = [LinkMode.Dynamic])
+annotation class OnlyDynamic
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyFor.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyFor.kt
new file mode 100644
index 000000000..1681d854c
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyFor.kt
@@ -0,0 +1,18 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.filter.OnlyForMatrixFilter
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.util.LinkMode
+import co.touchlab.skie.test.util.RawKotlinTarget
+import org.intellij.lang.annotations.Language
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Repeatable
+@FilterMatrixWith(OnlyForMatrixFilter::class)
+annotation class OnlyFor(
+    val targets: Array<RawKotlinTarget> = [],
+    val configurations: Array<BuildConfiguration> = [],
+    val linkModes: Array<LinkMode> = [],
+    val kotlinVersions: Array<String> = [],
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyIos.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyIos.kt
new file mode 100644
index 000000000..55491924e
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyIos.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.util.RawKotlinTarget
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@OnlyFor(targets = [RawKotlinTarget.iosSimulatorArm64, RawKotlinTarget.iosArm64, RawKotlinTarget.iosX64])
+annotation class OnlyIos
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyMacos.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyMacos.kt
new file mode 100644
index 000000000..6c1d265ec
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyMacos.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.util.RawKotlinTarget
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@OnlyFor(targets = [RawKotlinTarget.macosArm64, RawKotlinTarget.macosX64])
+annotation class OnlyMacos
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyRelease.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyRelease.kt
new file mode 100644
index 000000000..f97be9c4e
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyRelease.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.runner.BuildConfiguration
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@OnlyFor(configurations = [BuildConfiguration.Release])
+annotation class OnlyRelease
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyStatic.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyStatic.kt
new file mode 100644
index 000000000..e7d0a3a67
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/OnlyStatic.kt
@@ -0,0 +1,8 @@
+package co.touchlab.skie.test.annotation.filter
+
+import co.touchlab.skie.test.util.LinkMode
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@OnlyFor(linkModes = [LinkMode.Static])
+annotation class OnlyStatic
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Smoke.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Smoke.kt
new file mode 100644
index 000000000..63a06f206
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/Smoke.kt
@@ -0,0 +1,5 @@
+package co.touchlab.skie.test.annotation.filter
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Smoke
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/SmokeOnly.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/SmokeOnly.kt
new file mode 100644
index 000000000..31299dd53
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/filter/SmokeOnly.kt
@@ -0,0 +1,6 @@
+package co.touchlab.skie.test.annotation.filter
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Smoke
+annotation class SmokeOnly
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/AcceptanceTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/AcceptanceTests.kt
new file mode 100644
index 000000000..a04d72fd0
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/AcceptanceTests.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+
+@Target(AnnotationTarget.CLASS)
+@SkieTestType(TestType.Acceptance)
+annotation class AcceptanceTests
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/DemoTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/DemoTests.kt
new file mode 100644
index 000000000..28c10ed9f
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/DemoTests.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+
+@Target(AnnotationTarget.CLASS)
+@SkieTestType(TestType.Demo)
+annotation class DemoTests
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/ExternalLibrariesTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/ExternalLibrariesTests.kt
new file mode 100644
index 000000000..09ff5235b
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/ExternalLibrariesTests.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+
+@Target(AnnotationTarget.CLASS)
+@SkieTestType(TestType.ExternalLibraries)
+annotation class ExternalLibrariesTests
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/GradleTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/GradleTests.kt
new file mode 100644
index 000000000..8127cc1ef
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/GradleTests.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+
+@Target(AnnotationTarget.CLASS)
+@SkieTestType(TestType.Gradle)
+annotation class GradleTests
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/PerformanceTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/PerformanceTests.kt
new file mode 100644
index 000000000..749279f26
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/PerformanceTests.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+
+@Target(AnnotationTarget.CLASS)
+@SkieTestType(TestType.Performance)
+annotation class PerformanceTests
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/SkieTestType.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/SkieTestType.kt
new file mode 100644
index 000000000..801366b7c
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/SkieTestType.kt
@@ -0,0 +1,10 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+import co.touchlab.skie.test.runner.condition.TestTypeCondition
+import org.junit.jupiter.api.extension.ExtendWith
+
+@Target(AnnotationTarget.CLASS)
+@ExtendWith(TestTypeCondition::class)
+@Repeatable
+annotation class SkieTestType(val value: TestType)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/TypeMappingTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/TypeMappingTests.kt
new file mode 100644
index 000000000..36b004870
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/annotation/type/TypeMappingTests.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.annotation.type
+
+import co.touchlab.skie.test.runner.TestType
+
+@Target(AnnotationTarget.CLASS)
+@SkieTestType(TestType.TypeMapping)
+annotation class TypeMappingTests
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt
new file mode 100644
index 000000000..505fcc3cc
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt
@@ -0,0 +1,156 @@
+package co.touchlab.skie.test.base
+
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Template
+import co.touchlab.skie.test.template.TemplateFile
+import co.touchlab.skie.test.trait.gradle.BuildGradleFile
+import co.touchlab.skie.test.trait.TestUtilsTrait
+import co.touchlab.skie.test.trait.gradle.GradleBuildFileBuilderTrait
+import co.touchlab.skie.test.util.CommandResult
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.StringBuilderScope
+import co.touchlab.skie.test.util.execute
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.TestReporter
+import org.junit.jupiter.api.io.CleanupMode
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import javax.inject.Inject
+import kotlin.test.assertEquals
+
+abstract class BaseGradleTests: TestUtilsTrait, GradleBuildFileBuilderTrait {
+    @TempDir(cleanup = CleanupMode.ON_SUCCESS)
+    lateinit var testProjectDir: File
+
+    @Inject
+    lateinit var reporter: TestReporter
+
+    val settingsFile: File
+        get() = File(testProjectDir, "settings.gradle.kts")
+    val rootBuildFile: BuildGradleFile
+        get() = BuildGradleFile(File(testProjectDir, "build.gradle.kts"))
+    val gradlePropertiesFile: File
+        get() = File(testProjectDir, "gradle.properties")
+
+    @BeforeEach
+    fun createSettingsFile() {
+        settingsFile("""
+            pluginManagement {
+                repositories {
+                    maven("${tempRepository.absolutePath}")
+                    gradlePluginPortal()
+                }
+            }
+
+            rootProject.name = "gradle-test"
+
+            dependencyResolutionManagement {
+                repositories {
+                    maven("${tempRepository.absolutePath}")
+                    mavenCentral()
+                    google()
+                }
+            }
+        """.trimIndent())
+    }
+
+    @BeforeEach
+    fun createGradlePropertiesFile() {
+        gradlePropertiesFile {
+            +"org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=1g -XX:+UseParallelGC\n"
+            appendAdditionalGradleProperties()
+        }
+    }
+
+    fun runGradle(
+        gradleVersion: String = "8.4",
+        vararg arguments: String = arrayOf("build"),
+        assertResult: ((BuildResult) -> Unit)? = {
+            assertEquals(TaskOutcome.SUCCESS, it.task(":build")?.outcome)
+        },
+    ): BuildResult {
+        val result: BuildResult = GradleRunner.create()
+            .apply {
+                withProjectDir(testProjectDir)
+                withGradleVersion(gradleVersion)
+                withArguments(*arguments)
+                if (!isCI) {
+                    forwardOutput()
+                }
+            }
+            .build()
+
+        assertResult?.invoke(result)
+
+        return result
+    }
+
+    fun buildSwift(
+        target: KotlinTarget.Native.Darwin,
+        template: Template,
+        frameworkParentPath: String,
+        assertResult: ((CommandResult) -> Unit)? = {
+            assertEquals(0, it.exitCode)
+        },
+    ): CommandResult {
+        val command = buildList<String> {
+            this += "/usr/bin/xcrun"
+            this += listOf("-sdk", target.sdk)
+            this += "swiftc"
+            this += template.files.filter { it.kind == TemplateFile.Kind.Swift }.map { it.file.absolutePath }
+            this += listOf("-F", frameworkParentPath)
+            this += listOf("-o", "swift_executable")
+            this += listOf("-target", target.triple)
+            // Workaround for https://github.com/apple/swift/issues/55127
+            this += "-parse-as-library"
+            // Workaround for missing symbol when compiling with Coroutines for MacosArm64
+            this += listOf("-Xlinker", "-dead_strip")
+        }
+
+        val result = command.joinToString(" ").execute(testProjectDir)
+        if (!isCI) {
+            println(result.stdOut)
+        }
+
+        assertResult?.invoke(result)
+
+        return result
+    }
+
+    fun runSwift() {
+        // TODO: Implement running binaries
+    }
+
+    fun commonMain(fqdn: String): File {
+        return testProjectDir.resolve("src/commonMain/kotlin").resolve(fqdn.split(".").joinToString("/") + ".kt").also {
+            it.parentFile.mkdirs()
+        }
+    }
+
+    fun copyToCommonMain(template: Template) {
+        template.files.forEach { file ->
+            val targetFile = testProjectDir
+                .resolve("src/commonMain/kotlin")
+                .resolve(file.relativePath)
+            targetFile.parentFile.mkdirs()
+            file.file.copyTo(targetFile)
+        }
+    }
+
+    fun builtFrameworkParentDir(
+        target: KotlinTarget.Native.Darwin,
+        configuration: BuildConfiguration,
+        isArtifactDsl: Boolean,
+    ): String {
+        return if (isArtifactDsl) {
+            "build/out/framework/${target.frameworkTarget}/${configuration.name.lowercase()}"
+        } else {
+            "build/bin/${target.id}/${configuration.name.lowercase()}Framework"
+        }
+    }
+
+    protected open fun StringBuilderScope.appendAdditionalGradleProperties() { }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/filter/OnlyConfigurationCacheMatrixFilter.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/filter/OnlyConfigurationCacheMatrixFilter.kt
new file mode 100644
index 000000000..2bcd03349
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/filter/OnlyConfigurationCacheMatrixFilter.kt
@@ -0,0 +1,15 @@
+package co.touchlab.skie.test.filter
+
+import co.touchlab.skie.test.annotation.filter.MatrixFilter
+import co.touchlab.skie.test.runner.SkieTestMatrixSource
+import org.junit.jupiter.api.extension.ExtensionContext
+
+object OnlyConfigurationCacheMatrixFilter : MatrixFilter {
+    override fun apply(context: ExtensionContext, source: SkieTestMatrixSource) {
+        source.kotlinVersions.removeAll { kotlinVersion ->
+            kotlinVersion.value.startsWith("1.8.") ||
+                kotlinVersion.value.startsWith("1.9.0") ||
+                kotlinVersion.value.startsWith("1.9.1")
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/filter/OnlyForMatrixFilter.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/filter/OnlyForMatrixFilter.kt
new file mode 100644
index 000000000..9f9a3d231
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/filter/OnlyForMatrixFilter.kt
@@ -0,0 +1,38 @@
+package co.touchlab.skie.test.filter
+
+import co.touchlab.skie.test.annotation.filter.MatrixFilter
+import co.touchlab.skie.test.annotation.filter.OnlyFor
+import co.touchlab.skie.test.runner.SkieTestMatrixSource
+import co.touchlab.skie.test.util.KotlinVersion
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.platform.commons.util.AnnotationUtils
+
+object OnlyForMatrixFilter: MatrixFilter {
+
+    override fun apply(context: ExtensionContext, source: SkieTestMatrixSource) {
+        val parentClassFilterAnnotations = AnnotationUtils.findRepeatableAnnotations(
+            context.requiredTestClass,
+            OnlyFor::class.java,
+        )
+        val methodFilterAnnotations = AnnotationUtils.findRepeatableAnnotations(
+            context.requiredTestMethod,
+            OnlyFor::class.java,
+        )
+
+        (parentClassFilterAnnotations + methodFilterAnnotations).forEach { filter ->
+            filter.targets.map { it.target }.applyTo(source.targets)
+            filter.linkModes.toList().applyTo(source.linkModes)
+            filter.configurations.toList().applyTo(source.configurations)
+            filter.kotlinVersions.map(::KotlinVersion).applyTo(source.kotlinVersions)
+        }
+    }
+
+    private inline fun <reified T> Collection<T>.applyTo(source: MutableList<T>) {
+        if (this.isNotEmpty()) {
+            val thisSet = this.toSet()
+            source.removeAll {
+                it !in thisSet
+            }
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/BuildConfiguration.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/BuildConfiguration.kt
new file mode 100644
index 000000000..b0d830467
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/BuildConfiguration.kt
@@ -0,0 +1,6 @@
+package co.touchlab.skie.test.runner
+
+enum class BuildConfiguration {
+    Debug,
+    Release,
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/MatrixFilter.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/MatrixFilter.kt
new file mode 100644
index 000000000..9428ea03e
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/MatrixFilter.kt
@@ -0,0 +1,13 @@
+package co.touchlab.skie.test.runner
+
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+data class SkieTestMatrixSource(
+    val targets: MutableList<KotlinTarget>,
+    val presets: MutableList<KotlinTarget.Preset>,
+    val configurations: MutableList<BuildConfiguration>,
+    val linkModes: MutableList<LinkMode>,
+    val kotlinVersions: MutableList<KotlinVersion>,
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieMatrixExtension.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieMatrixExtension.kt
new file mode 100644
index 000000000..efc2892c2
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieMatrixExtension.kt
@@ -0,0 +1,19 @@
+package co.touchlab.skie.test.runner
+
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.jupiter.api.extension.ParameterContext
+import org.junit.jupiter.api.extension.ParameterResolver
+
+class SkieMatrixExtension(
+    private val runValues: Map<Class<*>, Any>,
+): ParameterResolver {
+    override fun supportsParameter(parameterContext: ParameterContext, extensionContext: ExtensionContext): Boolean {
+        return runValues.containsKey(parameterContext.parameter.type)
+    }
+
+    override fun resolveParameter(parameterContext: ParameterContext, extensionContext: ExtensionContext): Any {
+        return checkNotNull(runValues[parameterContext.parameter.type]) {
+            "Value for type ${parameterContext.parameter.type} not available! Check if `true` was returned for it in `supportsParameter`."
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestMatrix.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestMatrix.kt
new file mode 100644
index 000000000..3bb6f2cbb
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestMatrix.kt
@@ -0,0 +1,41 @@
+package co.touchlab.skie.test.runner
+
+data class SkieTestMatrix(
+    val axes: List<Axis<*>>,
+) {
+    val values = axes.associateBy { it.type }
+
+    fun <T> mapCells(transformCell: (List<AxisValue>) -> T): List<T> {
+        val cartesianProduct = axes.fold(listOf(emptyList<AxisValue>())) { acc, axis ->
+            acc.flatMap { list ->
+                axis.values.map { element ->
+                    list + AxisValue(axis.type, axis.name, element)
+                }
+            }
+        }
+
+        return cartesianProduct.map(transformCell)
+    }
+
+    data class Axis<T: Any>(
+        val type: Class<T>,
+        val name: String,
+        val values: List<T>,
+    ) {
+        companion object {
+            inline operator fun <reified T: Any> invoke(name: String, values: List<T>): Axis<T> {
+                return Axis(
+                    type = T::class.java,
+                    name = name,
+                    values = values,
+                )
+            }
+        }
+    }
+
+    data class AxisValue(
+        val type: Class<*>,
+        val name: String,
+        val value: Any,
+    )
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestMatrixContext.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestMatrixContext.kt
new file mode 100644
index 000000000..8cc531bfc
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestMatrixContext.kt
@@ -0,0 +1,25 @@
+package co.touchlab.skie.test.runner
+
+import org.junit.jupiter.api.extension.Extension
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext
+
+class SkieTestMatrixContext(
+    private val axisValues: List<SkieTestMatrix.AxisValue>,
+): TestTemplateInvocationContext {
+    private val runValues = axisValues.associate { it.type to it.value }
+
+    override fun getDisplayName(invocationIndex: Int): String {
+        val nameWithoutIndex = if (axisValues.isNotEmpty()) {
+            axisValues.joinToString(", ") { it.value.toString() }
+        } else {
+            "No arguments"
+        }
+        return "[$invocationIndex]: $nameWithoutIndex"
+    }
+
+    override fun getAdditionalExtensions(): List<Extension> {
+        return listOf(
+            SkieMatrixExtension(runValues),
+        )
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunner.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunner.kt
new file mode 100644
index 000000000..e059f5ec6
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunner.kt
@@ -0,0 +1,51 @@
+package co.touchlab.skie.test.runner
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.FilterMatrixWith
+import io.kotest.mpp.newInstanceNoArgConstructorOrObjectInstance
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext
+import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider
+import org.junit.platform.commons.util.AnnotationUtils
+import java.util.stream.Stream
+
+class SkieTestRunner: TestTemplateInvocationContextProvider {
+    override fun supportsTestTemplate(context: ExtensionContext): Boolean {
+        return AnnotationUtils.isAnnotated(context.testMethod, MatrixTest::class.java)
+    }
+
+    override fun provideTestTemplateInvocationContexts(context: ExtensionContext): Stream<TestTemplateInvocationContext> {
+        val testMethod = context.requiredTestMethod
+        val parentClassFilterAnnotations = AnnotationUtils.findRepeatableAnnotations(
+            context.requiredTestClass,
+            FilterMatrixWith::class.java
+        )
+        val methodFilterAnnotations = AnnotationUtils.findRepeatableAnnotations(
+            testMethod,
+            FilterMatrixWith::class.java
+        )
+        val uniqueMatrixFilterClasses = (parentClassFilterAnnotations + methodFilterAnnotations).map {
+            it.value
+        }.toSet()
+
+        val uniqueMatrixFilters = uniqueMatrixFilterClasses.map {
+            it.newInstanceNoArgConstructorOrObjectInstance()
+        }
+
+        val matrixSource = SkieTestRunnerConfiguration.buildMatrixSource()
+        uniqueMatrixFilters.forEach { filter ->
+            filter.apply(context, matrixSource)
+        }
+        val filteredAxes = SkieTestRunnerConfiguration.buildMatrixAxes(matrixSource)
+
+        val matrixAxes = testMethod.parameterTypes.mapNotNull { requestedAxisType ->
+            filteredAxes[requestedAxisType]
+        }
+
+        val matrix = SkieTestMatrix(axes = matrixAxes)
+
+        return matrix.mapCells {
+            SkieTestMatrixContext(it) as TestTemplateInvocationContext
+        }.stream()
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt
new file mode 100644
index 000000000..95c05b435
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt
@@ -0,0 +1,108 @@
+package co.touchlab.skie.test.runner
+
+import co.touchlab.skie.test.util.*
+import org.slf4j.LoggerFactory
+
+object SkieTestRunnerConfiguration {
+    private val logger = LoggerFactory.getLogger(SkieTestRunnerConfiguration::class.java)
+
+    val testLevel = value<TestLevel>("testLevel") ?: TestLevel.Thorough
+    val testTypes = set<TestType>("testTypes")
+
+    val targets = list("matrix.targets", ::KotlinTargetOrPreset) ?: listOf(KotlinTarget.Preset.Root)
+    val configurations = list<BuildConfiguration>("matrix.configurations")
+    val linkModes = list<LinkMode>("matrix.linkModes")
+    val kotlinVersions = list("matrix.kotlinVersions", ::KotlinVersion) ?: listOf("1.8.0", "1.8.20", "1.9.20").map(::KotlinVersion)
+    val gradleVersions = list("matrix.gradleVersions", ::GradleVersion) ?: listOf("8.6").map(::GradleVersion)
+
+    fun buildMatrixSource(): SkieTestMatrixSource {
+        val allTargets = targets.targets
+        return SkieTestMatrixSource(
+            targets = allTargets.toMutableList(),
+            presets = targets.presets.takeIf { it.isNotEmpty() }?.toMutableList()
+                ?: KotlinTarget.Preset.Root.children.presets.filter { preset ->
+                    allTargets.toSet().intersect(preset.targets.toSet()).isNotEmpty()
+                }.toMutableList(),
+            configurations = configurations.toMutableList(),
+            linkModes = linkModes.toMutableList(),
+            kotlinVersions = kotlinVersions.toMutableList(),
+        )
+    }
+
+    fun buildMatrixAxes(source: SkieTestMatrixSource) = buildList<SkieTestMatrix.Axis<*>> {
+        this += SkieTestMatrix.Axis<BuildConfiguration>("Configuration", source.configurations)
+        this += SkieTestMatrix.Axis<LinkMode>("Linkage", source.linkModes)
+        this += SkieTestMatrix.Axis<KotlinVersion>("Kotlin", source.kotlinVersions)
+
+        this += SkieTestMatrix.Axis("Target", source.targets)
+        this += SkieTestMatrix.Axis("Target", source.targets.filterIsInstance<KotlinTarget.Native>())
+        this += SkieTestMatrix.Axis("Target", source.targets.filterIsInstance<KotlinTarget.Native.Darwin>())
+        this += SkieTestMatrix.Axis("Target", source.targets.filterIsInstance<KotlinTarget.Native.Ios>())
+        this += SkieTestMatrix.Axis("Target", source.targets.filterIsInstance<KotlinTarget.Native.MacOS>())
+
+        this += SkieTestMatrix.Axis("Preset", source.presets)
+        this += SkieTestMatrix.Axis("Preset", source.presets.filterIsInstance<KotlinTarget.Preset.Native>())
+        this += SkieTestMatrix.Axis("Preset", source.presets.filterIsInstance<KotlinTarget.Preset.Native.Darwin>())
+    }.associateBy { it.type }
+
+    private fun <T: Any> value(property: String, deserialize: (String) -> T?): T? {
+        val properties = System.getProperties()
+        return if (properties.containsKey(property)) {
+            val rawValue = properties.getProperty(property).trim()
+            deserialize(rawValue)
+                .logErrorOnUnknownValue(property, rawValue)
+        } else {
+            null
+        }
+    }
+
+    private inline fun <reified E: Enum<E>> value(property: String): E? = value(property) { rawValue ->
+        enumValues<E>().singleOrNull { enumEntry ->
+            enumEntry.name.equals(rawValue, ignoreCase = true)
+        }
+    }
+
+    private fun <T: Any> list(property: String, deserialize: (String) -> T?): List<T>? {
+        val properties = System.getProperties()
+        return if (properties.containsKey(property)) {
+            val rawValue = properties.getProperty(property)
+            rawValue.split(',').mapNotNull { listItem ->
+                val trimmedListItem = listItem.trim()
+                deserialize(trimmedListItem)
+                    .logErrorOnUnknownValue(property, trimmedListItem)
+            }.takeIf { it.isNotEmpty() }
+        } else {
+            null
+        }
+    }
+
+    private inline fun <reified E: Enum<E>> list(property: String): List<E> = list(property) { rawValue ->
+        enumValues<E>().singleOrNull { enumEntry ->
+            enumEntry.name.equals(rawValue, ignoreCase = true)
+        }
+    } ?: enumValues<E>().toList()
+
+    private fun <T: Any> set(property: String, deserialize: (String) -> T?): Set<T>? = list(property, deserialize)?.toSet()
+
+    private inline fun <reified E: Enum<E>> set(property: String): Set<E> = set(property) { rawValue ->
+        enumValues<E>().singleOrNull { enumEntry ->
+            enumEntry.name.equals(rawValue, ignoreCase = true)
+        }
+    } ?: enumValues<E>().toSet()
+
+    private fun <T> List<T>.intersectOrKeepIfEmpty(other: List<T>): List<T> {
+        return if (other.isNotEmpty()) {
+            val otherAsSet = other.toSet()
+            filter(otherAsSet::contains)
+        } else {
+            this
+        }
+    }
+
+    private fun <T: Any> T?.logErrorOnUnknownValue(property: String, rawValue: String): T? {
+        if (this == null) {
+            logger.error("Couldn't deserialize value $rawValue for property $property")
+        }
+        return this
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/TestLevel.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/TestLevel.kt
new file mode 100644
index 000000000..3221b1bf7
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/TestLevel.kt
@@ -0,0 +1,6 @@
+package co.touchlab.skie.test.runner
+
+enum class TestLevel {
+    Smoke,
+    Thorough,
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/TestType.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/TestType.kt
new file mode 100644
index 000000000..1db012d58
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/TestType.kt
@@ -0,0 +1,10 @@
+package co.touchlab.skie.test.runner
+
+enum class TestType {
+    Demo,
+    Gradle,
+    Acceptance,
+    TypeMapping,
+    ExternalLibraries,
+    Performance,
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/condition/SmokeTestCondition.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/condition/SmokeTestCondition.kt
new file mode 100644
index 000000000..2c8104a7f
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/condition/SmokeTestCondition.kt
@@ -0,0 +1,27 @@
+package co.touchlab.skie.test.runner.condition
+
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.filter.SmokeOnly
+import co.touchlab.skie.test.runner.SkieTestRunnerConfiguration
+import co.touchlab.skie.test.runner.TestLevel
+import co.touchlab.skie.test.util.isTestMethodOrClassAnnotated
+import org.junit.jupiter.api.extension.ConditionEvaluationResult
+import org.junit.jupiter.api.extension.ExecutionCondition
+import org.junit.jupiter.api.extension.ExtensionContext
+
+class SmokeTestCondition: ExecutionCondition {
+    override fun evaluateExecutionCondition(context: ExtensionContext): ConditionEvaluationResult {
+        return when (SkieTestRunnerConfiguration.testLevel) {
+            TestLevel.Smoke -> if (isTestMethodOrClassAnnotated<Smoke>(context)) {
+                ConditionEvaluationResult.enabled("${context.element} is marked as @Smoke test")
+            } else {
+                ConditionEvaluationResult.disabled("${context.element} is not marked as @Smoke test")
+            }
+            TestLevel.Thorough -> if (isTestMethodOrClassAnnotated<SmokeOnly>(context)) {
+                ConditionEvaluationResult.disabled("${context.element} is marked as @SmokeOnly test")
+            } else {
+                ConditionEvaluationResult.enabled("${context.element} is not marked as @SmokeOnly test")
+            }
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/condition/TestTypeCondition.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/condition/TestTypeCondition.kt
new file mode 100644
index 000000000..bf9398bf4
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/condition/TestTypeCondition.kt
@@ -0,0 +1,20 @@
+package co.touchlab.skie.test.runner.condition
+
+import co.touchlab.skie.test.annotation.type.SkieTestType
+import co.touchlab.skie.test.runner.SkieTestRunnerConfiguration
+import org.junit.jupiter.api.extension.ConditionEvaluationResult
+import org.junit.jupiter.api.extension.ExecutionCondition
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.platform.commons.util.AnnotationUtils
+
+class TestTypeCondition: ExecutionCondition {
+    override fun evaluateExecutionCondition(context: ExtensionContext): ConditionEvaluationResult {
+        val testTypes = AnnotationUtils.findRepeatableAnnotations(context.testClass, SkieTestType::class.java).map { it.value }.toSet()
+        return if (SkieTestRunnerConfiguration.testTypes.containsAll(testTypes)) {
+            ConditionEvaluationResult.enabled("${context.element} ")
+        } else {
+            ConditionEvaluationResult.disabled("${context.element} is marked as @Smoke test")
+        }
+    }
+
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt
new file mode 100644
index 000000000..3fc0678fc
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt
@@ -0,0 +1,53 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests: BaseGradleTests() {
+    @MatrixTest
+    fun `all darwin targets and all framework artifacts`(
+        kotlinVersion: KotlinVersion,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                allDarwin()
+            }
+
+            kotlinArtifacts {
+                KotlinTarget.Native.Darwin.targets.forEach { target ->
+                    framework(
+                        kotlinVersion = kotlinVersion,
+                        target = target,
+                        linkMode = linkMode,
+                        buildConfiguration = configuration,
+                    )
+                }
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        KotlinTarget.Native.Darwin.targets.forEach { target ->
+            buildSwift(target, Templates.basic, builtFrameworkParentDir(target, configuration, isArtifactDsl = true))
+
+            if (target is KotlinTarget.Native.MacOS) {
+                runSwift()
+            }
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt
new file mode 100644
index 000000000..21739516c
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt
@@ -0,0 +1,53 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests: BaseGradleTests() {
+    @MatrixTest
+    fun `all darwin targets and single framework artifact`(
+        kotlinVersion: KotlinVersion,
+        target: KotlinTarget.Native.Darwin,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                allDarwin()
+            }
+
+            kotlinArtifacts {
+                framework(
+                    kotlinVersion = kotlinVersion,
+                    target = target,
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        buildSwift(
+            target = target,
+            template = Templates.basic,
+            frameworkParentPath = builtFrameworkParentDir(target, configuration, isArtifactDsl = true),
+        )
+
+        if (target is KotlinTarget.Native.MacOS) {
+            runSwift()
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt
new file mode 100644
index 000000000..143fbf6fc
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt
@@ -0,0 +1,49 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_Framework_SingleTargetTests: BaseGradleTests() {
+    @MatrixTest
+    fun `single target and single framework artifact`(
+        kotlinVersion: KotlinVersion,
+        target: KotlinTarget.Native.Darwin,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                target(target)
+            }
+
+            kotlinArtifacts {
+                framework(
+                    kotlinVersion = kotlinVersion,
+                    target = target,
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        buildSwift(target, Templates.basic, builtFrameworkParentDir(target, configuration, isArtifactDsl = true))
+
+        if (target is KotlinTarget.Native.MacOS) {
+            runSwift()
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt
new file mode 100644
index 000000000..b1cf6aa99
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt
@@ -0,0 +1,71 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+import co.touchlab.skie.test.util.presets
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests: BaseGradleTests() {
+    @MatrixTest
+    fun `single darwin preset and single universal framework artifact`(
+        kotlinVersion: KotlinVersion,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+        preset: KotlinTarget.Preset.Native.Darwin,
+    ) {
+        // Universal frameworks require unique architectures, so we need to ignore Arm64 simulators.
+        val targetsWithoutArmSimulators = preset.targets.filter { target ->
+            when (target) {
+                KotlinTarget.Native.Ios.SimulatorArm64 -> false
+                KotlinTarget.Native.Tvos.SimulatorArm64 -> false
+
+                KotlinTarget.Native.Ios.X64,
+                KotlinTarget.Native.Ios.Arm64,
+                KotlinTarget.Native.MacOS.X64,
+                KotlinTarget.Native.MacOS.Arm64,
+                KotlinTarget.Native.Tvos.X64,
+                KotlinTarget.Native.Tvos.Arm64 -> true
+            }
+        }
+
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                allDarwin()
+            }
+
+            kotlinArtifacts {
+                universalFramework(
+                    kotlinVersion = kotlinVersion,
+                    targets = targetsWithoutArmSimulators,
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        targetsWithoutArmSimulators.forEach { target ->
+            buildSwift(
+                target = target,
+                frameworkParentPath = "build/out/fatframework/${configuration.name.lowercase()}",
+                template = Templates.basic,
+            )
+
+            if (target is KotlinTarget.Native.MacOS) {
+                runSwift()
+            }
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt
new file mode 100644
index 000000000..59a2193f6
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt
@@ -0,0 +1,53 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_UniversalFramework_SingleTargetTests: BaseGradleTests() {
+    @MatrixTest
+    fun `single target`(
+        kotlinVersion: KotlinVersion,
+        target: KotlinTarget.Native.Darwin,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                target(target)
+            }
+
+            kotlinArtifacts {
+                universalFramework(
+                    kotlinVersion = kotlinVersion,
+                    targets = listOf(target),
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        buildSwift(
+            target,
+            Templates.basic,
+            frameworkParentPath = "build/out/fatframework/${configuration.name.lowercase()}",
+        )
+
+        if (target is KotlinTarget.Native.MacOS) {
+            runSwift()
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt
new file mode 100644
index 000000000..dd15bc384
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt
@@ -0,0 +1,62 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests: BaseGradleTests() {
+    @MatrixTest
+    fun `all darwin targets and single xcframework artifact`(
+        kotlinVersion: KotlinVersion,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                allDarwin()
+            }
+
+            kotlinArtifacts {
+                xcframework(
+                    kotlinVersion = kotlinVersion,
+                    targets = KotlinTarget.Native.Darwin.targets,
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        KotlinTarget.Native.Darwin.targets.forEach { target ->
+            val frameworkParentName = when (target) {
+                KotlinTarget.Native.Ios.SimulatorArm64, KotlinTarget.Native.Ios.X64 -> "ios-arm64_x86_64-simulator"
+                KotlinTarget.Native.Ios.Arm64 -> "ios-arm64"
+                KotlinTarget.Native.Tvos.SimulatorArm64, KotlinTarget.Native.Tvos.X64 -> "tvos-arm64_x86_64-simulator"
+                KotlinTarget.Native.Tvos.Arm64 -> "tvos-arm64"
+                KotlinTarget.Native.MacOS.Arm64, KotlinTarget.Native.MacOS.X64 -> "macos-arm64_x86_64"
+            }
+
+            buildSwift(
+                target = target,
+                frameworkParentPath = "build/out/xcframework/${configuration.name.lowercase()}/gradle_test.xcframework/$frameworkParentName",
+                template = Templates.basic,
+            )
+
+            if (target is KotlinTarget.Native.MacOS) {
+                runSwift()
+            }
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt
new file mode 100644
index 000000000..4476cc6ce
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt
@@ -0,0 +1,64 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinArtifactDsl_XCFramework_SingleTargetTests: BaseGradleTests() {
+    @MatrixTest
+    fun `single target`(
+        kotlinVersion: KotlinVersion,
+        target: KotlinTarget.Native.Darwin,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                target(target)
+            }
+
+            kotlinArtifacts {
+                xcframework(
+                    kotlinVersion = kotlinVersion,
+                    targets = listOf(target),
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        val frameworkParentName = when (target) {
+            KotlinTarget.Native.Ios.SimulatorArm64 -> "ios-arm64-simulator"
+            KotlinTarget.Native.Ios.X64 -> "ios-x86_64-simulator"
+            KotlinTarget.Native.Ios.Arm64 -> "ios-arm64"
+            KotlinTarget.Native.Tvos.SimulatorArm64 -> "tvos-arm64-simulator"
+            KotlinTarget.Native.Tvos.X64 -> "tvos-x86_64-simulator"
+            KotlinTarget.Native.Tvos.Arm64 -> "tvos-arm64"
+            KotlinTarget.Native.MacOS.Arm64 -> "macos-arm64"
+            KotlinTarget.Native.MacOS.X64 -> "macos-x86_64"
+        }
+
+        buildSwift(
+            target,
+            Templates.basic,
+            frameworkParentPath = "build/out/xcframework/${configuration.name.lowercase()}/gradle_test.xcframework/$frameworkParentName",
+        )
+
+        if (target is KotlinTarget.Native.MacOS) {
+            runSwift()
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt
new file mode 100644
index 000000000..21bbdfd0b
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt
@@ -0,0 +1,39 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinBinaryDsl_Framework_AllDarwinPresetsTests: BaseGradleTests() {
+    @MatrixTest
+    fun `basic project, all darwin presets`(
+        kotlinVersion: KotlinVersion,
+        buildConfiguration: BuildConfiguration,
+        linkMode: LinkMode,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                targets(KotlinTarget.Native.Darwin)
+
+                registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode)
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        KotlinTarget.Native.Darwin.targets.forEach { target ->
+            buildSwift(target, Templates.basic, builtFrameworkParentDir(target, buildConfiguration, isArtifactDsl = false))
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt
new file mode 100644
index 000000000..94d929a3d
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt
@@ -0,0 +1,40 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinBinaryDsl_Framework_SinglePresetTests: BaseGradleTests() {
+    @MatrixTest
+    fun `basic project, single preset`(
+        kotlinVersion: KotlinVersion,
+        preset: KotlinTarget.Preset.Native.Darwin,
+        buildConfiguration: BuildConfiguration,
+        linkMode: LinkMode,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                targets(preset)
+
+                registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode)
+            }
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        preset.targets.forEach { target ->
+            buildSwift(target, Templates.basic, builtFrameworkParentDir(target, buildConfiguration, isArtifactDsl = false))
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt
new file mode 100644
index 000000000..c23837cb5
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt
@@ -0,0 +1,40 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.template.Templates
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class KotlinBinaryDsl_Framework_SingleTargetTests: BaseGradleTests() {
+    @MatrixTest
+    fun `basic project, single target`(
+        kotlinVersion: KotlinVersion,
+        target: KotlinTarget.Native.Darwin,
+        buildConfiguration: BuildConfiguration,
+        linkMode: LinkMode,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                target(target)
+
+                registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode)
+            }
+
+            workaroundFatFrameworkConfigurationIfNeeded(kotlinVersion)
+        }
+
+        copyToCommonMain(Templates.basic)
+
+        runGradle()
+
+        buildSwift(target, Templates.basic, builtFrameworkParentDir(target, buildConfiguration, isArtifactDsl = false))
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt
new file mode 100644
index 000000000..364f7b327
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt
@@ -0,0 +1,23 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.util.KotlinVersion
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class NoArtifact_AllDarwinTargetsTests: BaseGradleTests() {
+    @MatrixTest
+    fun `no artifact`(kotlinVersion: KotlinVersion) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                allDarwin()
+            }
+        }
+
+        runGradle()
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt
new file mode 100644
index 000000000..0bbb6f849
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt
@@ -0,0 +1,27 @@
+package co.touchlab.skie.test.suite.gradle.basic
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+class NoArtifact_SingleTargetTests: BaseGradleTests() {
+    @MatrixTest
+    fun `no artifact`(
+        kotlinVersion: KotlinVersion,
+        kotlinTarget: KotlinTarget,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                target(kotlinTarget)
+            }
+        }
+
+        runGradle()
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt
new file mode 100644
index 000000000..777c2db0e
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt
@@ -0,0 +1,129 @@
+package co.touchlab.skie.test.suite.gradle.configurationcache
+
+import co.touchlab.skie.test.annotation.MatrixTest
+import co.touchlab.skie.test.annotation.filter.OnlyConfigurationCache
+import co.touchlab.skie.test.annotation.filter.Smoke
+import co.touchlab.skie.test.annotation.type.GradleTests
+import co.touchlab.skie.test.base.BaseGradleTests
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+import co.touchlab.skie.test.util.StringBuilderScope
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.TaskOutcome
+import kotlin.test.assertEquals
+
+@Suppress("ClassName")
+@Smoke
+@GradleTests
+@OnlyConfigurationCache
+class GradleConfigurationCacheTests: BaseGradleTests() {
+
+    // We don't need to run the whole build to check configuration cache
+    private val gradleArguments = arrayOf("dependencies")
+    private val assertGradleResult = { result: BuildResult ->
+        assertEquals(TaskOutcome.SUCCESS, result.task(":dependencies")?.outcome)
+    }
+
+    @MatrixTest
+    fun `no artifact`(
+        kotlinVersion: KotlinVersion,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                targets(KotlinTarget.Native)
+            }
+        }
+
+        runGradle(
+            arguments = gradleArguments,
+            assertResult = assertGradleResult,
+        )
+    }
+
+    @MatrixTest
+    fun `frameworks`(
+        kotlinVersion: KotlinVersion,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                targets(KotlinTarget.Native)
+
+                registerNativeFrameworks(
+                    kotlinVersion = kotlinVersion,
+                    buildConfiguration = configuration,
+                    linkMode = linkMode,
+                )
+            }
+        }
+
+        runGradle(
+            arguments = gradleArguments,
+            assertResult = assertGradleResult,
+        )
+    }
+
+    @MatrixTest
+    fun `framework artifacts`(
+        kotlinVersion: KotlinVersion,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                targets(KotlinTarget.Native)
+            }
+
+            kotlinArtifacts {
+                KotlinTarget.Native.Darwin.targets.forEach { target ->
+                    framework(
+                        kotlinVersion = kotlinVersion,
+                        target = target,
+                        linkMode = linkMode,
+                        buildConfiguration = configuration,
+                    )
+                }
+            }
+        }
+
+        runGradle(
+            arguments = gradleArguments,
+            assertResult = assertGradleResult,
+        )
+    }
+
+    @MatrixTest
+    fun `xcframework artifact`(
+        kotlinVersion: KotlinVersion,
+        linkMode: LinkMode,
+        configuration: BuildConfiguration,
+    ) {
+        rootBuildFile(kotlinVersion) {
+            kotlin {
+                targets(KotlinTarget.Native)
+            }
+
+            kotlinArtifacts {
+                xcframework(
+                    kotlinVersion = kotlinVersion,
+                    targets = KotlinTarget.Native.Darwin.targets,
+                    linkMode = linkMode,
+                    buildConfiguration = configuration,
+                )
+            }
+        }
+
+        runGradle(
+            arguments = gradleArguments,
+            assertResult = assertGradleResult,
+        )
+    }
+
+    override fun StringBuilderScope.appendAdditionalGradleProperties() {
+        +"org.gradle.configuration-cache=true\n"
+    }
+
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/template/Template.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/Template.kt
new file mode 100644
index 000000000..831104da2
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/Template.kt
@@ -0,0 +1,6 @@
+package co.touchlab.skie.test.template
+
+data class Template(
+    val name: String,
+    val files: List<TemplateFile>,
+)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/template/TemplateBuilderScope.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/TemplateBuilderScope.kt
new file mode 100644
index 000000000..4c04201bb
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/TemplateBuilderScope.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.template
+
+interface TemplateBuilderScope {
+    fun kotlin(name: String)
+
+    fun swift(name: String)
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/template/TemplateFile.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/TemplateFile.kt
new file mode 100644
index 000000000..9505872e2
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/TemplateFile.kt
@@ -0,0 +1,14 @@
+package co.touchlab.skie.test.template
+
+import java.io.File
+
+data class TemplateFile(
+    val relativePath: String,
+    val file: File,
+    val kind: Kind,
+) {
+    enum class Kind(val extension: String) {
+        Kotlin(".kt"),
+        Swift(".swift"),
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/template/Templates.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/Templates.kt
new file mode 100644
index 000000000..5a1e89210
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/Templates.kt
@@ -0,0 +1,10 @@
+package co.touchlab.skie.test.template
+
+import java.io.File
+
+object Templates {
+    val basic = buildTemplate("basic") {
+        kotlin("BasicSkieFeatures")
+        swift("main")
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/template/buildTemplate.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/buildTemplate.kt
new file mode 100644
index 000000000..ed867f3a9
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/template/buildTemplate.kt
@@ -0,0 +1,38 @@
+package co.touchlab.skie.test.template
+
+import java.io.File
+
+fun buildTemplate(name: String, builder: TemplateBuilderScope.() -> Unit): Template {
+    val files = mutableListOf<TemplateFile>()
+    val scope = object: TemplateBuilderScope {
+
+        private fun template(fileName: String, kind: TemplateFile.Kind) {
+            val sourceRelativePath = "templates/${name}/${fileName}${kind.extension}"
+            val url = checkNotNull(Templates::class.java.getResource("/$sourceRelativePath")) {
+                "Couldn't find template for $fileName (at /$sourceRelativePath)"
+            }
+            val targetRelativePath = when (kind) {
+                TemplateFile.Kind.Kotlin -> sourceRelativePath
+                TemplateFile.Kind.Swift -> "templates.$name.$fileName${kind.extension}"
+            }
+
+            files += TemplateFile(
+                relativePath = targetRelativePath,
+                file = File(url.toURI()),
+                kind = kind,
+            )
+        }
+
+        override fun kotlin(name: String) = template(name, TemplateFile.Kind.Kotlin)
+
+        override fun swift(name: String) = template(name, TemplateFile.Kind.Swift)
+
+    }
+
+    scope.builder()
+
+    return Template(
+        name = name,
+        files = files,
+    )
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/TestUtilsTrait.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/TestUtilsTrait.kt
new file mode 100644
index 000000000..2cacf475d
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/TestUtilsTrait.kt
@@ -0,0 +1,24 @@
+package co.touchlab.skie.test.trait
+
+import co.touchlab.skie.test.trait.gradle.BuildGradleBuilder
+import co.touchlab.skie.test.util.StringBuilderScope
+import co.touchlab.skie.test.util.buildString
+import java.io.File
+
+interface TestUtilsTrait {
+    val workingDirectory: File
+        get() = File(System.getProperty("user.dir"))
+    val tempRepository: File
+        get() = File(System.getProperty("smokeTestRepository"))
+    val isCI: Boolean
+        get() = System.getenv("CI") == "true"
+
+    operator fun File.invoke(content: String) = writeText(content)
+
+    operator fun File.invoke(content: BuildGradleBuilder) = writeText(content.toString())
+
+
+    operator fun File.invoke(contentBuilder: StringBuilderScope.() -> Unit) = writeText(buildString(contentBuilder))
+
+    operator fun File.invoke(): String = readText()
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt
new file mode 100644
index 000000000..f55412ecf
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt
@@ -0,0 +1,255 @@
+package co.touchlab.skie.test.trait.gradle
+
+import co.touchlab.skie.test.runner.BuildConfiguration
+import co.touchlab.skie.test.util.KotlinTarget
+import co.touchlab.skie.test.util.KotlinVersion
+import co.touchlab.skie.test.util.LinkMode
+import co.touchlab.skie.test.util.needsOldLinker
+import org.intellij.lang.annotations.Language
+
+class BuildGradleBuilder(
+    val kotlinVersion: KotlinVersion,
+    val plugins: List<Plugin> = listOf(
+        Plugin.kotlinMultiplatform(kotlinVersion),
+        Plugin.skie,
+    ),
+) {
+    private val imports = mutableSetOf<String>()
+    private val builder = StringBuilder()
+    private var builderIndentationLevel = 0
+
+    init {
+        if (plugins.isNotEmpty()) {
+            "plugins" {
+                plugins.forEach {
+                    +it.application
+                }
+            }
+        }
+    }
+
+    fun kotlin(block: KotlinExtensionScope.() -> Unit) {
+        "kotlin" {
+            KotlinExtensionScope().block()
+        }
+    }
+
+    fun kotlinArtifacts(block: KotlinArtifactsExtensionScope.() -> Unit) {
+        "kotlinArtifacts" {
+            KotlinArtifactsExtensionScope().block()
+        }
+    }
+
+    fun workaroundFatFrameworkConfigurationIfNeeded(
+        kotlinVersion: KotlinVersion,
+    ) {
+        if (kotlinVersion.value.startsWith("1.8.")) {
+            imports.add("org.jetbrains.kotlin.gradle.tasks.FatFrameworkTask")
+
+            appendLines("""
+                tasks.withType<FatFrameworkTask>().configureEach {
+                    configurations.getByName(
+                        name.substringAfter("link").replaceFirstChar { it.lowercase() }
+                    ).attributes {
+                        attribute(Attribute.of("fat-framework", String::class.java), "true")
+                    }
+                }
+            """.trimIndent())
+        }
+    }
+
+    fun appendLines(@Language("kotlin") code: String) {
+        code.lines().forEach {
+            +it
+        }
+    }
+
+    operator fun @receiver:Language("kotlin") String.unaryPlus() {
+        appendIndentation()
+        builder.appendLine(this)
+    }
+
+    operator fun @receiver:Language("kotlin") String.invoke(block: () -> Unit) {
+        appendIndentation()
+        builder.append(this)
+        builder.appendLine(" {")
+        builderIndentationLevel += 1
+        block()
+        builderIndentationLevel -= 1
+        builder.appendLine("}")
+    }
+
+    private fun appendIndentation() {
+        repeat(builderIndentationLevel) {
+            builder.append("    ")
+        }
+    }
+
+    override fun toString(): String {
+        return buildString {
+            imports.sorted().forEach {
+                this.appendLine("import $it")
+            }
+            if (imports.isNotEmpty()) {
+                this.appendLine()
+            }
+            this.append(builder)
+        }
+    }
+
+    inner class KotlinExtensionScope {
+        fun androidTarget() = target(KotlinTarget.AndroidTarget)
+
+        fun iosArm64() = target(KotlinTarget.Native.Ios.Arm64)
+
+        fun iosX64() = target(KotlinTarget.Native.Ios.X64)
+
+        fun iosSimulatorArm64() = target(KotlinTarget.Native.Ios.SimulatorArm64)
+
+        fun macosArm64() = target(KotlinTarget.Native.MacOS.Arm64)
+
+        fun macosX64() = target(KotlinTarget.Native.MacOS.X64)
+
+        fun allIos() = targets(KotlinTarget.Native.Ios)
+
+        fun allMacos() = targets(KotlinTarget.Native.MacOS)
+
+        fun allTvos() = targets(KotlinTarget.Native.Tvos)
+
+        fun allDarwin() {
+            allIos()
+            allMacos()
+            allTvos()
+            // TODO: allTvos()
+            // TODO: allWatchos()
+        }
+
+        fun all() {
+            androidTarget()
+            allDarwin()
+
+            // TODO: Add the rest
+        }
+
+        fun targets(preset: KotlinTarget.Preset) = preset.targets.forEach {
+            target(it)
+        }
+
+        fun target(target: KotlinTarget) = +"${target.id}()"
+
+        fun registerNativeFrameworks(
+            kotlinVersion: KotlinVersion,
+            buildConfiguration: BuildConfiguration,
+            linkMode: LinkMode,
+        ) {
+            imports.add("org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget")
+            imports.add("org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType")
+
+            "targets.withType<KotlinNativeTarget>" {
+                "binaries" {
+                    "framework(buildTypes = listOf(NativeBuildType.${buildConfiguration.name.uppercase()}))" {
+                        +"isStatic = ${linkMode.isStatic}"
+                        +"""freeCompilerArgs = freeCompilerArgs + listOf("-Xbinary=bundleId=gradle_test")"""
+                        if (kotlinVersion.needsOldLinker) {
+                            +"""linkerOpts += "-ld64""""
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    inner class KotlinArtifactsExtensionScope {
+
+        fun framework(
+            kotlinVersion: KotlinVersion,
+            target: KotlinTarget.Native,
+            linkMode: LinkMode,
+            buildConfiguration: BuildConfiguration,
+        ) {
+            imports.add("org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType")
+
+            "Native.Framework" {
+                +"target = ${target.id}"
+                +"isStatic = ${linkMode.isStatic}"
+                +"modes(NativeBuildType.${buildConfiguration.name.uppercase()})"
+                "toolOptions" {
+                    +"""freeCompilerArgs.add("-Xbinary=bundleId=gradle_test")"""
+                }
+                if (kotlinVersion.needsOldLinker) {
+                    +"""linkerOptions += "-ld64""""
+                }
+            }
+        }
+
+        fun xcframework(
+            kotlinVersion: KotlinVersion,
+            targets: List<KotlinTarget.Native>,
+            linkMode: LinkMode,
+            buildConfiguration: BuildConfiguration,
+        ) {
+            imports.add("org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType")
+
+            "Native.XCFramework" {
+                +"targets(${targets.joinToString { it.id }})"
+                +"modes(${buildConfiguration.toString().uppercase()})"
+                +"isStatic = ${linkMode.isStatic}"
+                "toolOptions" {
+                    +"""freeCompilerArgs.add("-Xbinary=bundleId=gradle_test")"""
+                }
+                if (kotlinVersion.needsOldLinker) {
+                    +"""linkerOptions += "-ld64""""
+                }
+            }
+        }
+
+        fun universalFramework(
+            kotlinVersion: KotlinVersion,
+            targets: List<KotlinTarget.Native>,
+            linkMode: LinkMode,
+            buildConfiguration: BuildConfiguration,
+        ) {
+            imports.add("org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType")
+
+            "Native.FatFramework" {
+                +"targets(${targets.joinToString { it.id }})"
+                +"modes(${buildConfiguration.toString().uppercase()})"
+                +"isStatic = ${linkMode.isStatic}"
+                "toolOptions" {
+                    +"""freeCompilerArgs.add("-Xbinary=bundleId=gradle_test")"""
+                }
+                if (kotlinVersion.needsOldLinker) {
+                    +"""linkerOptions += "-ld64""""
+                }
+            }
+        }
+    }
+
+    class Plugin private constructor(
+        val reference: String,
+        val version: String?,
+        val apply: Boolean = true,
+    ) {
+        val application: String = listOfNotNull(
+            reference,
+            version?.let { """version "$it"""" },
+            "apply false".takeUnless { apply },
+        ).joinToString(" ")
+
+        fun apply(apply: Boolean): Plugin = Plugin(reference, version, apply)
+
+        companion object {
+            operator fun invoke(id: String, version: String?, apply: Boolean = true) = Plugin(
+                reference = """id("$id")""",
+                version = version,
+                apply = apply,
+            )
+
+            val skie = Plugin(id = "co.touchlab.skie", version = "1.0.0-SNAPSHOT")
+
+            fun kotlinMultiplatform(kotlinVersion: KotlinVersion) = Plugin(reference = kotlin("multiplatform"), version = kotlinVersion.value)
+
+            private fun kotlin(component: String) = """kotlin("$component")"""
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleFile.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleFile.kt
new file mode 100644
index 000000000..a2cf220c7
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleFile.kt
@@ -0,0 +1,14 @@
+package co.touchlab.skie.test.trait.gradle
+
+import co.touchlab.skie.test.util.KotlinVersion
+import java.io.File
+
+class BuildGradleFile(
+    val file: File,
+) {
+    operator fun invoke(kotlinVersion: KotlinVersion, block: BuildGradleBuilder.() -> Unit) {
+        val builder = BuildGradleBuilder(kotlinVersion)
+        builder.block()
+        file.writeText(builder.toString())
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/GradleBuildFileBuilderTrait.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/GradleBuildFileBuilderTrait.kt
new file mode 100644
index 000000000..30dd9c773
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/GradleBuildFileBuilderTrait.kt
@@ -0,0 +1,11 @@
+package co.touchlab.skie.test.trait.gradle
+
+import co.touchlab.skie.test.util.KotlinVersion
+
+interface GradleBuildFileBuilderTrait {
+    fun buildGradle(kotlinVersion: KotlinVersion, block: BuildGradleBuilder.() -> Unit): String {
+        val builder = BuildGradleBuilder(kotlinVersion)
+        builder.block()
+        return builder.toString()
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/BuildResult.shouldBeSuccess.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/BuildResult.shouldBeSuccess.kt
new file mode 100644
index 000000000..a4233c48c
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/BuildResult.shouldBeSuccess.kt
@@ -0,0 +1,9 @@
+package co.touchlab.skie.test.util
+
+import io.kotest.matchers.collections.shouldBeEmpty
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.TaskOutcome
+
+fun BuildResult.shouldBeSuccess() {
+    this.tasks(TaskOutcome.FAILED).shouldBeEmpty()
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/BuildTask.shouldBeSuccess.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/BuildTask.shouldBeSuccess.kt
new file mode 100644
index 000000000..0eabf5267
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/BuildTask.shouldBeSuccess.kt
@@ -0,0 +1,11 @@
+package co.touchlab.skie.test.util
+
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import org.gradle.testkit.runner.BuildTask
+import org.gradle.testkit.runner.TaskOutcome
+
+fun BuildTask?.shouldBeSuccess() {
+    this.shouldNotBeNull()
+        .outcome shouldBe TaskOutcome.SUCCESS
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/CommandResult.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/CommandResult.kt
new file mode 100644
index 000000000..865fa2a9b
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/CommandResult.kt
@@ -0,0 +1,3 @@
+package co.touchlab.skie.test.util
+
+class CommandResult(val exitCode: Int, val stdOut: String)
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/GradleVersion.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/GradleVersion.kt
new file mode 100644
index 000000000..4aa178e0d
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/GradleVersion.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.util
+
+data class GradleVersion(
+    val value: String,
+) {
+    override fun toString(): String = value
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/IsTestMethodOrClassAnnotated.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/IsTestMethodOrClassAnnotated.kt
new file mode 100644
index 000000000..712f9a425
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/IsTestMethodOrClassAnnotated.kt
@@ -0,0 +1,9 @@
+package co.touchlab.skie.test.util
+
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.platform.commons.util.AnnotationUtils
+
+inline fun <reified A: Annotation> isTestMethodOrClassAnnotated(context: ExtensionContext): Boolean {
+    return AnnotationUtils.isAnnotated(context.requiredTestMethod, A::class.java) ||
+            AnnotationUtils.isAnnotated(context.requiredTestClass, A::class.java)
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinTarget.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinTarget.kt
new file mode 100644
index 000000000..d1fc7d174
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinTarget.kt
@@ -0,0 +1,123 @@
+package co.touchlab.skie.test.util
+
+sealed interface KotlinTarget: KotlinTargetOrPreset {
+    sealed interface Preset: KotlinTargetOrPreset {
+        val children: List<KotlinTargetOrPreset>
+        val targets: List<KotlinTarget>
+            get() = children.flatMap {
+                when (it) {
+                    is Preset -> it.targets
+                    is KotlinTarget -> listOf(it)
+                    else -> error("WTF?")
+                }
+            }
+
+        data object Root: Preset {
+            override val id: String = "all"
+            override val children = listOf(Native, Jvm, AndroidTarget)
+        }
+
+        sealed interface Native: Preset {
+            override val targets: List<KotlinTarget.Native>
+
+            sealed interface Darwin: Native {
+                override val targets: List<KotlinTarget.Native.Darwin>
+            }
+        }
+    }
+
+    sealed interface Native: KotlinTarget {
+        companion object: Preset {
+            override val id: String = "native"
+            override val children = listOf(Darwin) // + ...
+        }
+        sealed interface Darwin: Native {
+            val triple: String
+            val sdk: String
+            val frameworkTarget: String
+
+            companion object: Preset.Native {
+                override val id: String = "darwin"
+                override val children = listOf(
+                    Ios,
+                    Tvos,
+                    MacOS,
+                )
+                override val targets: List<Darwin>
+                    get() = children.flatMap {
+                        it.targets
+                    }
+            }
+        }
+
+        enum class Ios(
+            override val id: String,
+            override val triple: String,
+            override val sdk: String,
+            override val frameworkTarget: String,
+        ): Darwin {
+            X64("iosX64", "x86_64-apple-ios17.0-simulator", "iphonesimulator", "ios_x64"),
+            Arm64("iosArm64", "arm64-apple-ios17.0", "iphoneos", "ios_arm64"),
+            SimulatorArm64("iosSimulatorArm64", "arm64-apple-ios17.0-simulator", "iphonesimulator", "ios_simulator_arm64");
+
+            override fun toString(): String = id
+
+            companion object: Preset.Native.Darwin {
+                override val id: String = "ios"
+                override val children: List<Ios> = entries
+                override val targets: List<Ios> = entries
+
+                override fun toString(): String = "iOS"
+            }
+        }
+
+        enum class Tvos(
+            override val id: String,
+            override val triple: String,
+            override val sdk: String,
+            override val frameworkTarget: String,
+        ): Darwin {
+            X64("tvosX64", "x86_64-apple-tvos17.0-simulator", "appletvsimulator", "tvos_x64"),
+            Arm64("tvosArm64", "arm64-apple-tvos17.0", "appletvos", "tvos_arm64"),
+            SimulatorArm64("tvosSimulatorArm64", "arm64-apple-tvos17.0-simulator", "appletvsimulator", "tvos_simulator_arm64");
+
+            override fun toString(): String = id
+
+            companion object: Preset.Native.Darwin {
+                override val id: String = "tvos"
+                override val children: List<Tvos> = entries
+                override val targets: List<Tvos> = entries
+
+                override fun toString(): String = "tvOS"
+            }
+        }
+
+        enum class MacOS(
+            override val id: String,
+            override val triple: String,
+            override val sdk: String,
+            override val frameworkTarget: String,
+        ): Darwin {
+            X64("macosX64", "x86_64-apple-macos11.0", "macosx", "macos_x64"),
+            Arm64("macosArm64", "arm64-apple-macos11.0", "macosx", "macos_arm64");
+
+            override fun toString(): String = id
+
+            companion object: Preset.Native.Darwin {
+                override val id: String = "macos"
+                override val children: List<MacOS> = entries
+
+                override val targets: List<MacOS> = entries
+                override fun toString(): String = "macOS"
+            }
+        }
+    }
+
+    data object Jvm: KotlinTarget {
+        override val id: String = "jvm"
+    }
+
+    data object AndroidTarget: KotlinTarget {
+        override val id: String = "androidTarget"
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinTargetOrPreset.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinTargetOrPreset.kt
new file mode 100644
index 000000000..c2ad67293
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinTargetOrPreset.kt
@@ -0,0 +1,33 @@
+package co.touchlab.skie.test.util
+
+sealed interface KotlinTargetOrPreset {
+    val id: String
+}
+
+fun KotlinTargetOrPreset(id: String): KotlinTargetOrPreset? {
+    fun KotlinTargetOrPreset.findById(id: String): KotlinTargetOrPreset? {
+        return when {
+            this.id.equals(id, ignoreCase = true) -> this
+            this is KotlinTarget.Preset -> this.children.firstNotNullOfOrNull { it.findById(id) }
+            else -> null
+        }
+    }
+
+    return KotlinTarget.Preset.Root.findById(id)
+}
+
+val List<KotlinTargetOrPreset>.targets: List<KotlinTarget>
+    get() = flatMap {
+        when (it) {
+            is KotlinTarget.Preset -> it.targets
+            is KotlinTarget -> listOf(it)
+        }
+    }
+
+val List<KotlinTargetOrPreset>.presets: List<KotlinTarget.Preset>
+    get() = flatMap {
+        when (it) {
+            is KotlinTarget.Preset -> listOf(it) +it.children.presets
+            is KotlinTarget -> emptyList()
+        }
+    }
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.kt
new file mode 100644
index 000000000..efa1385b7
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.kt
@@ -0,0 +1,7 @@
+package co.touchlab.skie.test.util
+
+data class KotlinVersion(
+    val value: String,
+) {
+    override fun toString(): String = value
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.needsOldLinker.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.needsOldLinker.kt
new file mode 100644
index 000000000..4afaf78ea
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/KotlinVersion.needsOldLinker.kt
@@ -0,0 +1,4 @@
+package co.touchlab.skie.test.util
+
+val KotlinVersion.needsOldLinker: Boolean
+    get() = value.startsWith("1.8.") || value.startsWith("1.9.0")
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/LinkMode.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/LinkMode.kt
new file mode 100644
index 000000000..706242b2a
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/LinkMode.kt
@@ -0,0 +1,9 @@
+package co.touchlab.skie.test.util
+
+enum class LinkMode {
+    Dynamic,
+    Static;
+
+    val isStatic: Boolean
+        get() = this == Static
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/RawKotlinTarget.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/RawKotlinTarget.kt
new file mode 100644
index 000000000..f6fbf1a4d
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/RawKotlinTarget.kt
@@ -0,0 +1,11 @@
+package co.touchlab.skie.test.util
+
+@Suppress("EnumEntryName")
+enum class RawKotlinTarget(val target: KotlinTarget) {
+    androidTarget(KotlinTarget.AndroidTarget),
+    iosArm64(KotlinTarget.Native.Ios.Arm64),
+    iosX64(KotlinTarget.Native.Ios.X64),
+    iosSimulatorArm64(KotlinTarget.Native.Ios.SimulatorArm64),
+    macosArm64(KotlinTarget.Native.MacOS.Arm64),
+    macosX64(KotlinTarget.Native.MacOS.X64),
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/SkieBinaryTarget.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/SkieBinaryTarget.kt
new file mode 100644
index 000000000..0484f4f53
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/SkieBinaryTarget.kt
@@ -0,0 +1,11 @@
+@file:OptIn(ExperimentalStdlibApi::class)
+
+package co.touchlab.skie.test.util
+
+enum class SkieBinaryTarget {
+    iosArm64,
+    iosX64,
+    iosSimulatorArm64,
+    macosArm64,
+    macosX64,
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/String.execute.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/String.execute.kt
new file mode 100644
index 000000000..aba6a1b65
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/String.execute.kt
@@ -0,0 +1,43 @@
+package co.touchlab.skie.test.util
+
+import java.io.File
+import java.util.concurrent.TimeUnit
+import java.util.logging.Logger
+import kotlin.io.path.readText
+import kotlin.io.path.writeText
+
+fun String.execute(workDir: File, logger: Logger = Logger.getLogger("String.execute")): CommandResult {
+    val command = this.split("\\s".toRegex())
+
+    val tempOutputFile = kotlin.io.path.createTempFile(workDir.toPath(), "skie-test-runner", ".out")
+    tempOutputFile.writeText("Running command:\n$this\nin ${workDir.toPath()}\n")
+    val process = ProcessBuilder(*command.toTypedArray())
+        .redirectOutput(ProcessBuilder.Redirect.appendTo(tempOutputFile.toFile()))
+        .redirectErrorStream(true)
+        .directory(workDir)
+        .start()
+
+    val hasExited = process.waitFor(1, TimeUnit.MINUTES)
+    if (!hasExited) {
+        val commandLine = process.info().commandLine().orElse("N/A")
+        logger.warning("Process `${commandLine}` has not exited after 1 minute. Sending SIGTERM signal.")
+        process.destroy()
+        val hasBeenTerminated = process.waitFor(1, TimeUnit.MINUTES)
+        if (hasBeenTerminated) {
+            logger.warning("Process `${commandLine}` has been terminated after timing out!")
+        } else {
+            logger.warning("Process `${commandLine}` has not been terminated after 1 minute. Sending SIGKILL signal.")
+            val hasBeenKilled = process.destroyForcibly().waitFor(5, TimeUnit.MINUTES)
+            if (hasBeenKilled) {
+                logger.warning("Process `${commandLine}` has been killed after termination timed out!")
+            } else {
+                logger.severe("Unable to terminate process `${commandLine}`! Restart of the machine is advised!")
+            }
+        }
+    }
+
+    return CommandResult(
+        exitCode = process.exitValue(),
+        stdOut = tempOutputFile.readText(),
+    )
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/StringBuilderScope.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/StringBuilderScope.kt
new file mode 100644
index 000000000..27cb0b802
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/StringBuilderScope.kt
@@ -0,0 +1,13 @@
+package co.touchlab.skie.test.util
+
+interface StringBuilderScope {
+    operator fun String.unaryPlus()
+
+    operator fun StringBuilder.unaryPlus()
+
+    operator fun Iterable<String>.unaryPlus() {
+        this.forEach {
+            +it
+        }
+    }
+}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/util/buildString.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/buildString.kt
new file mode 100644
index 000000000..c80593961
--- /dev/null
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/util/buildString.kt
@@ -0,0 +1,17 @@
+package co.touchlab.skie.test.util
+
+
+fun buildString(content: StringBuilderScope.() -> Unit): String {
+    val builder = StringBuilder()
+    content(object: StringBuilderScope {
+        override fun String.unaryPlus() {
+            builder.append(this)
+        }
+
+        override fun StringBuilder.unaryPlus() {
+            builder.append(this)
+        }
+
+    })
+    return builder.toString()
+}
diff --git a/test-runner/src/test/resources/junit-platform.properties b/test-runner/src/test/resources/junit-platform.properties
new file mode 100644
index 000000000..f61dfae85
--- /dev/null
+++ b/test-runner/src/test/resources/junit-platform.properties
@@ -0,0 +1,7 @@
+#junit.jupiter.execution.parallel.enabled = true
+#junit.jupiter.execution.parallel.mode.default = concurrent
+#junit.jupiter.execution.parallel.mode.classes.default = concurrent
+#junit.jupiter.execution.parallel.config.strategy = dynamic
+#
+#junit.platform.output.capture.stdout=true
+#junit.platform.output.capture.stderr=true
diff --git a/test-runner/src/test/resources/templates/basic/BasicSkieFeatures.kt b/test-runner/src/test/resources/templates/basic/BasicSkieFeatures.kt
new file mode 100644
index 000000000..ce758909e
--- /dev/null
+++ b/test-runner/src/test/resources/templates/basic/BasicSkieFeatures.kt
@@ -0,0 +1,25 @@
+package templates.basic
+
+enum class BasicEnum {
+    A,
+    B,
+    C,
+}
+
+class ClassWithSuspend {
+    suspend fun noArgNoReturn() {}
+}
+
+interface InterfaceWithSuspend {
+    suspend fun noArgNoReturn()
+}
+
+sealed interface SealedInterface {
+    object A: SealedInterface
+    class B: SealedInterface
+}
+
+sealed class SealedClass {
+    object A: SealedClass()
+    class B: SealedClass()
+}
diff --git a/test-runner/src/test/resources/templates/basic/main.swift b/test-runner/src/test/resources/templates/basic/main.swift
new file mode 100644
index 000000000..cd35a66fd
--- /dev/null
+++ b/test-runner/src/test/resources/templates/basic/main.swift
@@ -0,0 +1,22 @@
+import Foundation
+import gradle_test
+
+@main
+struct Main {
+    static func main() async throws {
+        let enumValues: [BasicEnum] = [.a, .b, .c]
+        for (index, value) in enumValues.enumerated() {
+            switch value {
+            case .a:
+                assert(index == 0)
+            case .b:
+                assert(index == 1)
+            case .c:
+                assert(index == 2)
+            }
+        }
+
+        // TODO: Add the rest
+
+    }
+}