Skip to content

Continue adding version catalog #4418

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
May 20, 2025
Merged

Continue adding version catalog #4418

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
10 changes: 5 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent

plugins {
`java-library`
id(Config.QualityPlugins.spotless) version Config.QualityPlugins.spotlessVersion apply true
alias(libs.plugins.spotless)
jacoco
id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion
alias(libs.plugins.detekt)
`maven-publish`
alias(libs.plugins.binary.compatibility.validator)
id(Config.QualityPlugins.jacocoAndroid) version Config.QualityPlugins.jacocoAndroidVersion apply false
id(Config.QualityPlugins.kover) version Config.QualityPlugins.koverVersion apply false
id(Config.BuildPlugins.gradleMavenPublishPlugin) version Config.BuildPlugins.gradleMavenPublishPluginVersion apply false
alias(libs.plugins.jacoco.android) apply false
alias(libs.plugins.kover) apply false
alias(libs.plugins.vanniktech.maven.publish) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.buildconfig) apply false
// dokka is required by gradle-maven-publish-plugin.
Expand Down
11 changes: 1 addition & 10 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ object Config {
val springDependencyManagementVersion = "1.0.11.RELEASE"
val gretty = "org.gretty"
val grettyVersion = "4.0.0"
val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
val gradleMavenPublishPluginVersion = "0.30.0"
val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
}

Expand Down Expand Up @@ -214,16 +212,9 @@ object Config {
// TODO [POTEL] add tests and restore
val minimumCoverage = BigDecimal.valueOf(0.1)
}
val spotless = "com.diffplug.spotless"
val spotlessVersion = "6.11.0"

val detekt = "io.gitlab.arturbosch.detekt"
val detektVersion = "1.23.8"
// this can be removed when we upgrade to Gradle 8, which allows us to use a getter for the plugin ID
val detektPlugin = "io.gitlab.arturbosch.detekt"
val jacocoAndroid = "com.mxalbert.gradle.jacoco-android"
val jacocoAndroidVersion = "0.2.0"
val kover = "org.jetbrains.kotlinx.kover"
val koverVersion = "0.7.3"
}

object Sentry {
Expand Down
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibil
compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" }
errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
gradle-versions = {id = "com.github.ben-manes.versions", version = "0.42.0" }
spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8"}
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }

[libraries]
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
2 changes: 1 addition & 1 deletion sentry-android-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.errorprone)
alias(libs.plugins.gradle.versions)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-fragment/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

android {
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
kotlin("android")
alias(libs.plugins.errorprone)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

android {
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
kotlin("android")
alias(libs.plugins.errorprone)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

android {
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-navigation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

android {
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-ndk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.gradle.versions)
}

Expand Down
4 changes: 2 additions & 2 deletions sentry-android-replay/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.gradle.versions)
// TODO: enable it later
// id(Config.QualityPlugins.detektPlugin)
// alias(libs.plugins.detekt)
}

android {
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-sqlite/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

android {
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-timber/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ plugins {
id("com.android.library")
kotlin("android")
jacoco
id(Config.QualityPlugins.jacocoAndroid)
alias(libs.plugins.jacoco.android)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

android {
Expand Down
4 changes: 2 additions & 2 deletions sentry-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ plugins {
kotlin("multiplatform")
id("com.android.library")
id("org.jetbrains.compose")
id(Config.QualityPlugins.kover)
alias(libs.plugins.kover)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
alias(libs.plugins.dokka)
alias(libs.plugins.dokka.javadoc)
`maven-publish` // necessary for publishMavenLocal task to publish correct artifacts
Expand Down
2 changes: 1 addition & 1 deletion sentry-kotlin-extensions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
jacoco
alias(libs.plugins.errorprone)
alias(libs.plugins.gradle.versions)
id(Config.QualityPlugins.detektPlugin)
alias(libs.plugins.detekt)
}

tasks.withType<KotlinCompile>().configureEach {
Expand Down
Loading