Skip to content

Remove BOM dependency on Compose & use explicit versions #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2025
+20 −13
Merged

Remove BOM dependency on Compose & use explicit versions #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions build-logic/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object libs {
const val junitVintage = "5.14.0"
const val junitPlatform = "1.14.0"

const val composeBom = "2025.03.00"
const val compose = "1.7.8"
const val androidXMultidex = "2.0.1"
const val androidXTestAnnotation = "1.0.1"
const val androidXTestCore = "1.6.1"
Expand Down Expand Up @@ -60,11 +60,10 @@ object libs {
const val junitPlatformRunner = "org.junit.platform:junit-platform-runner:${versions.junitPlatform}"
const val apiguardianApi = "org.apiguardian:apiguardian-api:${versions.apiGuardian}"

const val composeBom = "androidx.compose:compose-bom:${versions.composeBom}"
const val composeUi = "androidx.compose.ui:ui"
const val composeUiTooling = "androidx.compose.ui:ui-tooling"
const val composeFoundation = "androidx.compose.foundation:foundation"
const val composeMaterial = "androidx.compose.material:material"
const val composeUi = "androidx.compose.ui:ui:${versions.compose}"
const val composeUiTooling = "androidx.compose.ui:ui-tooling:${versions.compose}"
const val composeFoundation = "androidx.compose.foundation:foundation:${versions.compose}"
const val composeMaterial = "androidx.compose.material:material:${versions.compose}"
const val composeActivity = "androidx.activity:activity-compose:${versions.activityCompose}"

// Testing
Expand All @@ -84,9 +83,9 @@ object libs {
const val androidXTestRunner = "androidx.test:runner:${versions.androidXTestRunner}"
const val espressoCore = "androidx.test.espresso:espresso-core:${versions.espresso}"

const val composeUiTest = "androidx.compose.ui:ui-test"
const val composeUiTestJUnit4 = "androidx.compose.ui:ui-test-junit4"
const val composeUiTestManifest = "androidx.compose.ui:ui-test-manifest"
const val composeUiTest = "androidx.compose.ui:ui-test:${versions.compose}"
const val composeUiTestJUnit4 = "androidx.compose.ui:ui-test-junit4:${versions.compose}"
const val composeUiTestManifest = "androidx.compose.ui:ui-test-manifest:${versions.compose}"

// Documentation
// For the latest version refer to GitHub repo neboskreb/instant-task-executor-extension
Expand Down
15 changes: 12 additions & 3 deletions build-logic/src/main/kotlin/Deployment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,25 @@ private fun MavenPublication.applyPublicationDetails(
.mapValues { entry -> entry.value.filter { it.name != "unspecified" } }
.forEach { (scope, dependencies) ->
dependencies.forEach { dep ->
// Do not allow BOM dependencies for our own packaged libraries,
// instead its artifact versions should be unrolled explicitly
if ("-bom" in dep.name) {
throw IllegalArgumentException(
"Found a BOM declaration in the dependencies of project" +
"${project.path}: $dep. Prefer declaring its " +
"transitive artifacts explicitly by " +
"adding a version contraint to them."
)
}

with(dependenciesNode.appendNode("dependency")) {
if (dep is ProjectDependency) {
appendProjectDependencyCoordinates(dep)
} else {
appendExternalDependencyCoordinates(dep)
}

// Rewrite scope definition for BOM dependencies
val isBom = "-bom" in dep.name
appendNode("scope", if (isBom) "import" else scope)
appendNode("scope", scope)
}
}
}
Expand Down
1 change: 0 additions & 1 deletion instrumentation/compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ dependencies {
implementation(libs.junit4)
implementation(libs.espressoCore)

implementation(platform(libs.composeBom))
implementation(libs.composeActivity)
implementation(libs.composeUi)
implementation(libs.composeUiTooling)
Expand Down