diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe28a8e8..83d61c06 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 4a885230..7fa0e63a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,8 +39,7 @@ allprojects { tasks.withType().configureEach { delete(rootProject.buildDir) - dependsOn(gradle.includedBuild("plugin-build").task(":clean")) - dependsOn(gradle.includedBuild("sentry-kotlin-compiler-plugin").task(":clean")) + gradle.includedBuilds.forEach { dependsOn(it.task(":clean")) } } tasks.register("integrationTest") { @@ -75,11 +74,11 @@ 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 2f661e97..ee5d77e0 100644 --- a/sentry-kotlin-compiler-plugin/build.gradle.kts +++ b/sentry-kotlin-compiler-plugin/build.gradle.kts @@ -41,6 +41,8 @@ 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 bfe8705a..cf64205e 100644 --- a/sentry-snapshots-runtime/build.gradle.kts +++ b/sentry-snapshots-runtime/build.gradle.kts @@ -32,6 +32,8 @@ 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") {