Skip to content

More version catalog adoption #4428

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
runningcode merged 3 commits into from
May 22, 2025
Merged

More version catalog adoption #4428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
884523e
More version catalog adoption
runningcode May 21, 2025
fb65146
Add to root build.gradle
runningcode May 22, 2025
da59b85
Remove gretty from root
runningcode May 22, 2025
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: 0 additions & 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 @@ -13,18 +13,10 @@ object Config {

object BuildPlugins {
val androidGradle = "com.android.tools.build:gradle:$AGP"
val gretty = "org.gretty"
val grettyVersion = "4.0.0"
val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
}

object Android {
private val sdkVersion = 34

val minSdkVersion = 21
val targetSdkVersion = sdkVersion
val compileSdkVersion = sdkVersion

val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")

fun shouldSkipDebugVariant(name: String?): Boolean {
Expand Down Expand Up @@ -172,8 +164,6 @@ object Config {

object QualityPlugins {
object Jacoco {
val version = "0.8.7"

// TODO [POTEL] add tests and restore
val minimumCoverage = BigDecimal.valueOf(0.1)
}
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 @@ -10,6 +10,10 @@ kotlin = "1.9.24"
okhttp = "4.9.2"
springTwo = "2.7.18"
springThree = "3.4.2"
targetSdk = "34"
Copy link
Contributor Author

@runningcode runningcode May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There’s no way to have aliases or have targetSdk and compileSdk values reference each other.

compileSdk = "34"
minSdk = "21"
jacoco = "0.8.7"

[plugins]
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
Expand All @@ -29,6 +33,7 @@ vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.3
spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
gretty = { id = "org.gretty", version = "4.0.0" }

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.core"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

testInstrumentationRunner = Config.TestLibs.androidJUnitRunner

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 @@ -10,11 +10,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.fragment"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

// for AGP 4.1
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -10,13 +10,13 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.uitest.android.benchmark"

defaultConfig {
applicationId = "io.sentry.uitest.android.benchmark"
minSdk = Config.Android.minSdkVersion
targetSdk = Config.Android.targetSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 1
versionName = "1.0.0"

Expand Down
6 changes: 3 additions & 3 deletions sentry-android-integration-tests/sentry-uitest-android-critical/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 {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.uitest.android.critical"

signingConfigs {
Expand All @@ -17,8 +17,8 @@ android {

defaultConfig {
applicationId = "io.sentry.uitest.android.critical"
minSdk = Config.Android.minSdkVersion
targetSdk = Config.Android.targetSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 1
versionName = "1.0"
}
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -10,12 +10,12 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.uitest.android"

defaultConfig {
minSdk = Config.Android.minSdkVersion
targetSdk = Config.Android.targetSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.compileSdk.get().toInt()
versionCode = 1
versionName = "1.0.0"

Expand Down
6 changes: 3 additions & 3 deletions sentry-android-integration-tests/test-app-plain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.java.tests.perf.appplain"

defaultConfig {
applicationId = "io.sentry.java.tests.perf.appplain"
minSdk = Config.Android.minSdkVersion
targetSdk = Config.Android.targetSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 1
versionName = "1.0"
}
Expand Down
6 changes: 3 additions & 3 deletions sentry-android-integration-tests/test-app-sentry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.java.tests.perf.appsentry"

defaultConfig {
applicationId = "io.sentry.java.tests.perf.appsentry"
minSdk = Config.Android.minSdkVersion
targetSdk = Config.Android.targetSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 1
versionName = "1.0"
}
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 @@ -10,11 +10,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.navigation"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

// for AGP 4.1
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-ndk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.ndk"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

testInstrumentationRunner = Config.TestLibs.androidJUnitRunner

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 @@ -13,11 +13,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.replay"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

testInstrumentationRunner = Config.TestLibs.androidJUnitRunner

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 @@ -11,11 +11,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.sqlite"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

// for AGP 4.1
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
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 @@ -11,11 +11,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android.timber"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

testInstrumentationRunner = Config.TestLibs.androidJUnitRunner

Expand Down
4 changes: 2 additions & 2 deletions sentry-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ plugins {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.android"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
}

buildFeatures {
Expand Down
2 changes: 1 addition & 1 deletion sentry-apache-http-client-5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-apollo-3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-apollo-4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-apollo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
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 @@ -70,11 +70,11 @@ kotlin {
}

android {
compileSdk = Config.Android.compileSdkVersion
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "io.sentry.compose"

defaultConfig {
minSdk = Config.Android.minSdkVersion
minSdk = libs.versions.minSdk.get().toInt()

// for AGP 4.1
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
Expand Down
2 changes: 1 addition & 1 deletion sentry-graphql-22/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-graphql-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-graphql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-jdbc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-jul/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
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 @@ -40,7 +40,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-log4j2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-logback/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-okhttp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-openfeign/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ configure<SourceSetContainer> {
}

jacoco {
toolVersion = Config.QualityPlugins.Jacoco.version
toolVersion = libs.versions.jacoco.get()
}

tasks.jacocoTestReport {
Expand Down
Loading
Loading