From 8bd3b72ea706ac9855ca967c7ffacb2fe51ff701 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 15 Dec 2022 15:44:43 +0100 Subject: [PATCH 1/6] Fix compose-helper module is exposed and gets published --- build.gradle.kts | 2 +- sentry-compose/build.gradle.kts | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a5d08899c4d..1a49ffe9411 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -104,7 +104,7 @@ subprojects { } } - if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-test-support") { + if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-test-support" && this.name != "sentry-compose-helper") { apply() val sep = File.separator diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 8b9abab586b..b4d808460fb 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -1,4 +1,6 @@ import com.android.build.gradle.internal.tasks.LibraryAarJarsTask +import groovy.util.Node +import groovy.util.NodeList import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.dokka.gradle.DokkaTask @@ -159,3 +161,26 @@ dependencies { tasks.withType { mainScopeClassFiles.setFrom(embedComposeHelperConfig) } + +configure { + publications.withType(MavenPublication::class.java).all { + this.pom { + this.withXml { + (asNode().get("dependencies") as NodeList) + .flatMap { + if (it is Node) it.children() else NodeList() + } + .filterIsInstance() + .filter { dependency -> + val artifactIdNodes = dependency.get("artifactId") as NodeList + artifactIdNodes.any { + (it is Node && it.value().toString().contains("sentry-compose-helper")) + } + } + .forEach { dependency -> + dependency.parent().remove(dependency) + } + } + } + } +} From d465e6a643709ef7a32a1bf93da5238bae0d9e45 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 15 Dec 2022 16:25:17 +0100 Subject: [PATCH 2/6] Skip gradle .module generation for now, as it's not published anyway --- sentry-compose/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index b4d808460fb..c6aa383b873 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -184,3 +184,7 @@ configure { } } } + +tasks.withType { + enabled = false +} From 5d2f3b0bac5300c77327ed1e2ef8c3011144c722 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 15 Dec 2022 16:33:36 +0100 Subject: [PATCH 3/6] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e77af31731..a71d005121a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Fixes + +- Fix compose-helper module is exposed and gets published ([#2430](https://github.com/getsentry/sentry-java/pull/2430)) + ### Features - Add time-to-initial-display span to Activity transactions ([#2369](https://github.com/getsentry/sentry-java/pull/2369)) From 009e667e84dbccf650d38f44e1a899436d2120fe Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 15 Dec 2022 17:15:00 +0100 Subject: [PATCH 4/6] Update sentry-compose/build.gradle.kts Co-authored-by: Roman Zavarnitsyn --- sentry-compose/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index c6aa383b873..385a0daed59 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -162,6 +162,9 @@ tasks.withType { mainScopeClassFiles.setFrom(embedComposeHelperConfig) } + +// we embed the sentry-compose-helper classes to the same .jar above +// so we need to exclude the dependency from the .pom publication and .module metadata configure { publications.withType(MavenPublication::class.java).all { this.pom { From e3125e2766bc1b7973529c6cfa41dbe0c8cd97ad Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 15 Dec 2022 17:16:27 +0100 Subject: [PATCH 5/6] Revert "Update Changelog" This reverts commit 5d2f3b0bac5300c77327ed1e2ef8c3011144c722. --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a71d005121a..5e77af31731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,6 @@ ## Unreleased -### Fixes - -- Fix compose-helper module is exposed and gets published ([#2430](https://github.com/getsentry/sentry-java/pull/2430)) - ### Features - Add time-to-initial-display span to Activity transactions ([#2369](https://github.com/getsentry/sentry-java/pull/2369)) From 8ce70580758021570b964ffde53683c0675bfe92 Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Thu, 15 Dec 2022 16:18:44 +0000 Subject: [PATCH 6/6] Format code --- sentry-compose/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 385a0daed59..d347191c27d 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -162,7 +162,6 @@ tasks.withType { mainScopeClassFiles.setFrom(embedComposeHelperConfig) } - // we embed the sentry-compose-helper classes to the same .jar above // so we need to exclude the dependency from the .pom publication and .module metadata configure {