From e3c55caab9de630c931cd505080f19d3e3e720d1 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Fri, 24 Apr 2026 18:03:57 +0200
Subject: [PATCH 1/2] chore(ci): Unify release build command and artifact
 upload

---
 .github/workflows/build.yml                    |  6 ++----
 build.gradle.kts                               | 16 ++++++++++------
 sentry-kotlin-compiler-plugin/build.gradle.kts |  4 ++++
 sentry-snapshots-runtime/build.gradle.kts      |  4 ++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fe28a8e89..83d61c06e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,16 +29,14 @@ jobs:
           java-version: '17'
 
       - name: Build Gradle Plugin, Kotlin Compiler Plugin, and Snapshots Runtime distribution artifacts
-        run: ./gradlew :plugin-build:assemble :sentry-kotlin-compiler-plugin:assemble :sentry-snapshots-runtime:assemble
+        run: ./gradlew assemble
 
       - name: Archive artifacts
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         with:
           name: ${{ github.sha }}
           path: |
-            ${{ github.workspace }}/plugin-build/build/distributions/*.zip
-            ${{ github.workspace }}/sentry-kotlin-compiler-plugin/build/distributions/*.zip
-            ${{ github.workspace }}/sentry-snapshots-runtime/build/distributions/*.zip
+            ./*/build/distributions/*.zip
 
       - name: Verify artifact contents
         shell: bash
diff --git a/build.gradle.kts b/build.gradle.kts
index 4a885230e..417d8f6de 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,8 +39,10 @@ allprojects {
 
 tasks.withType<Delete>().configureEach {
   delete(rootProject.buildDir)
-  dependsOn(gradle.includedBuild("plugin-build").task(":clean"))
-  dependsOn(gradle.includedBuild("sentry-kotlin-compiler-plugin").task(":clean"))
+  gradle.includedBuilds.forEach {
+    println(it.name)
+    dependsOn(it.task(":clean"))
+  }
 }
 
 tasks.register("integrationTest") {
@@ -75,11 +77,13 @@ tasks.register("preMerge") {
 }
 
 tasks.named("spotlessCheck") {
-  dependsOn(gradle.includedBuild("sentry-kotlin-compiler-plugin").task(":spotlessCheck"))
-  dependsOn(gradle.includedBuild("plugin-build").task(":spotlessCheck"))
+  gradle.includedBuilds.forEach { dependsOn(it.task(":spotlessCheck")) }
 }
 
 tasks.named("spotlessApply") {
-  dependsOn(gradle.includedBuild("sentry-kotlin-compiler-plugin").task(":spotlessApply"))
-  dependsOn(gradle.includedBuild("plugin-build").task(":spotlessApply"))
+  gradle.includedBuilds.forEach { dependsOn(it.task(":spotlessApply")) }
+}
+
+tasks.named("assemble") {
+  gradle.includedBuilds.forEach { dependsOn(it.task(":assemble")) }
 }
diff --git a/sentry-kotlin-compiler-plugin/build.gradle.kts b/sentry-kotlin-compiler-plugin/build.gradle.kts
index 2f661e97e..5b8c2a304 100644
--- a/sentry-kotlin-compiler-plugin/build.gradle.kts
+++ b/sentry-kotlin-compiler-plugin/build.gradle.kts
@@ -41,6 +41,10 @@ tasks.named("distZip") {
   onlyIf { inputs.sourceFiles.isEmpty.not().also { require(it) { "No distribution to zip." } } }
 }
 
+tasks.named("distTar") {
+  enabled = false
+}
+
 dependencies {
   compileOnly(libs.kotlinCompilerEmbeddable)
 
diff --git a/sentry-snapshots-runtime/build.gradle.kts b/sentry-snapshots-runtime/build.gradle.kts
index bfe8705ac..3c56e2441 100644
--- a/sentry-snapshots-runtime/build.gradle.kts
+++ b/sentry-snapshots-runtime/build.gradle.kts
@@ -32,6 +32,10 @@ tasks.named("distZip") {
   onlyIf { inputs.sourceFiles.isEmpty.not().also { require(it) { "No distribution to zip." } } }
 }
 
+tasks.named("distTar") {
+  enabled = false
+}
+
 dependencies { compileOnly(libs.androidxAnnotation) }
 
 plugins.withId("com.vanniktech.maven.publish.base") {

From 9261512d80ce681ad277a26d5e11da756b12ed41 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Fri, 24 Apr 2026 18:04:56 +0200
Subject: [PATCH 2/2] spotless

---
 build.gradle.kts                               | 9 ++-------
 sentry-kotlin-compiler-plugin/build.gradle.kts | 4 +---
 sentry-snapshots-runtime/build.gradle.kts      | 4 +---
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 417d8f6de..7fa0e63a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,10 +39,7 @@ allprojects {
 
 tasks.withType<Delete>().configureEach {
   delete(rootProject.buildDir)
-  gradle.includedBuilds.forEach {
-    println(it.name)
-    dependsOn(it.task(":clean"))
-  }
+  gradle.includedBuilds.forEach { dependsOn(it.task(":clean")) }
 }
 
 tasks.register("integrationTest") {
@@ -84,6 +81,4 @@ tasks.named("spotlessApply") {
   gradle.includedBuilds.forEach { dependsOn(it.task(":spotlessApply")) }
 }
 
-tasks.named("assemble") {
-  gradle.includedBuilds.forEach { dependsOn(it.task(":assemble")) }
-}
+tasks.named("assemble") { gradle.includedBuilds.forEach { dependsOn(it.task(":assemble")) } }
diff --git a/sentry-kotlin-compiler-plugin/build.gradle.kts b/sentry-kotlin-compiler-plugin/build.gradle.kts
index 5b8c2a304..ee5d77e01 100644
--- a/sentry-kotlin-compiler-plugin/build.gradle.kts
+++ b/sentry-kotlin-compiler-plugin/build.gradle.kts
@@ -41,9 +41,7 @@ tasks.named("distZip") {
   onlyIf { inputs.sourceFiles.isEmpty.not().also { require(it) { "No distribution to zip." } } }
 }
 
-tasks.named("distTar") {
-  enabled = false
-}
+tasks.named("distTar") { enabled = false }
 
 dependencies {
   compileOnly(libs.kotlinCompilerEmbeddable)
diff --git a/sentry-snapshots-runtime/build.gradle.kts b/sentry-snapshots-runtime/build.gradle.kts
index 3c56e2441..cf64205e0 100644
--- a/sentry-snapshots-runtime/build.gradle.kts
+++ b/sentry-snapshots-runtime/build.gradle.kts
@@ -32,9 +32,7 @@ tasks.named("distZip") {
   onlyIf { inputs.sourceFiles.isEmpty.not().also { require(it) { "No distribution to zip." } } }
 }
 
-tasks.named("distTar") {
-  enabled = false
-}
+tasks.named("distTar") { enabled = false }
 
 dependencies { compileOnly(libs.androidxAnnotation) }