From e969d3a8a741cde13ac470ca6444168c584aebc9 Mon Sep 17 00:00:00 2001
From: Brian Norman <brian.norman@jetbrains.com>
Date: Wed, 24 Jun 2026 09:53:25 -0500
Subject: [PATCH 1/2] Update how annotation library is configured in Gradle

---
 .../kotlin/compiler/plugin/template/SimpleGradlePlugin.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt
index d5af458..a311f29 100644
--- a/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt
+++ b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt
@@ -29,9 +29,9 @@ class SimpleGradlePlugin : KotlinCompilerPluginSupportPlugin {
     ): Provider<List<SubpluginOption>> {
         val project = kotlinCompilation.target.project
 
-        kotlinCompilation.dependencies { implementation(ANNOTATIONS_LIBRARY_COORDINATES) }
-        if (kotlinCompilation.implementationConfigurationName == "metadataCompilationImplementation") {
-            project.dependencies.add("commonMainImplementation", ANNOTATIONS_LIBRARY_COORDINATES)
+        kotlinCompilation.defaultSourceSet.dependencies {
+            // Add annotations library to all compilations.
+            implementation(ANNOTATIONS_LIBRARY_COORDINATES)
         }
 
         return project.provider {

From 487539bc058b18a286f3fc2982c17c733c22c6ed Mon Sep 17 00:00:00 2001
From: Brian Norman <brian.norman@jetbrains.com>
Date: Wed, 24 Jun 2026 09:55:01 -0500
Subject: [PATCH 2/2] Add an exmaple of automatic compiler plugin ordering

---
 .../kotlin/compiler/plugin/template/SimpleGradlePlugin.kt    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt
index a311f29..9827fb0 100644
--- a/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt
+++ b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt
@@ -34,6 +34,11 @@ class SimpleGradlePlugin : KotlinCompilerPluginSupportPlugin {
             implementation(ANNOTATIONS_LIBRARY_COORDINATES)
         }
 
+        kotlinCompilation.compileTaskProvider.configure {
+            // Run this compiler plugin before Compose plugin.
+            it.compilerOptions.freeCompilerArgs.add("-Xcompiler-plugin-order=${BuildConfig.KOTLIN_PLUGIN_ID}>androidx.compose.compiler.plugins.kotlin")
+        }
+
         return project.provider {
             val extension = project.extensions.getByType(SimpleGradleExtension::class.java)