Skip to content

Commit 11b9191

Browse files
runningcoderunningcode
committed
More version catalog adoption
1 parent f5b4aee commit 11b9191

47 files changed

Lines changed: 71 additions & 77 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,10 @@ object Config {
1313

1414
object BuildPlugins {
1515
val androidGradle = "com.android.tools.build:gradle:$AGP"
16-
val gretty = "org.gretty"
17-
val grettyVersion = "4.0.0"
1816
val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
1917
}
2018

2119
object Android {
22-
private val sdkVersion = 34
23-
24-
val minSdkVersion = 21
25-
val targetSdkVersion = sdkVersion
26-
val compileSdkVersion = sdkVersion
27-
2820
val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")
2921

3022
fun shouldSkipDebugVariant(name: String?): Boolean {
@@ -199,8 +191,6 @@ object Config {
199191

200192
object QualityPlugins {
201193
object Jacoco {
202-
val version = "0.8.7"
203-
204194
// TODO [POTEL] add tests and restore
205195
val minimumCoverage = BigDecimal.valueOf(0.1)
206196
}

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ composeVersion = "1.6.11"
66
okhttp = "4.9.2"
77
springTwo = "2.7.18"
88
springThree = "3.4.2"
9+
targetSdk = "34"
10+
compileSdk = "34"
11+
minSdk = "21"
12+
jacoco = "0.8.7"
913

1014
[plugins]
1115
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -25,6 +29,7 @@ vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.3
2529
spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
2630
spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
2731
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
32+
gretty = { id = "org.gretty", version = "4.0.0" }
2833

2934
[libraries]
3035
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }

‎sentry-android-core/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ plugins {
1111
}
1212

1313
android {
14-
compileSdk = Config.Android.compileSdkVersion
14+
compileSdk = libs.versions.compileSdk.get().toInt()
1515
namespace = "io.sentry.android.core"
1616

1717
defaultConfig {
18-
minSdk = Config.Android.minSdkVersion
18+
minSdk = libs.versions.minSdk.get().toInt()
1919

2020
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
2121

‎sentry-android-fragment/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
}
1111

1212
android {
13-
compileSdk = Config.Android.compileSdkVersion
13+
compileSdk = libs.versions.compileSdk.get().toInt()
1414
namespace = "io.sentry.android.fragment"
1515

1616
defaultConfig {
17-
minSdk = Config.Android.minSdkVersion
17+
minSdk = libs.versions.minSdk.get().toInt()
1818

1919
// for AGP 4.1
2020
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")

‎sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ plugins {
1010
}
1111

1212
android {
13-
compileSdk = Config.Android.compileSdkVersion
13+
compileSdk = libs.versions.compileSdk.get().toInt()
1414
namespace = "io.sentry.uitest.android.benchmark"
1515

1616
defaultConfig {
1717
applicationId = "io.sentry.uitest.android.benchmark"
18-
minSdk = Config.Android.minSdkVersion
19-
targetSdk = Config.Android.targetSdkVersion
18+
minSdk = libs.versions.minSdk.get().toInt()
19+
targetSdk = libs.versions.targetSdk.get().toInt()
2020
versionCode = 1
2121
versionName = "1.0.0"
2222

‎sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
android {
9-
compileSdk = Config.Android.compileSdkVersion
9+
compileSdk = libs.versions.compileSdk.get().toInt()
1010
namespace = "io.sentry.uitest.android.critical"
1111

1212
signingConfigs {
@@ -17,8 +17,8 @@ android {
1717

1818
defaultConfig {
1919
applicationId = "io.sentry.uitest.android.critical"
20-
minSdk = Config.Android.minSdkVersion
21-
targetSdk = Config.Android.targetSdkVersion
20+
minSdk = libs.versions.minSdk.get().toInt()
21+
targetSdk = libs.versions.targetSdk.get().toInt()
2222
versionCode = 1
2323
versionName = "1.0"
2424
}

‎sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ plugins {
1010
}
1111

1212
android {
13-
compileSdk = Config.Android.compileSdkVersion
13+
compileSdk = libs.versions.compileSdk.get().toInt()
1414
namespace = "io.sentry.uitest.android"
1515

1616
defaultConfig {
17-
minSdk = Config.Android.minSdkVersion
18-
targetSdk = Config.Android.targetSdkVersion
17+
minSdk = libs.versions.minSdk.get().toInt()
18+
targetSdk = libs.versions.compileSdk.get().toInt()
1919
versionCode = 1
2020
versionName = "1.0.0"
2121

‎sentry-android-integration-tests/test-app-plain/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ plugins {
33
}
44

55
android {
6-
compileSdk = Config.Android.compileSdkVersion
6+
compileSdk = libs.versions.compileSdk.get().toInt()
77
namespace = "io.sentry.java.tests.perf.appplain"
88

99
defaultConfig {
1010
applicationId = "io.sentry.java.tests.perf.appplain"
11-
minSdk = Config.Android.minSdkVersion
12-
targetSdk = Config.Android.targetSdkVersion
11+
minSdk = libs.versions.minSdk.get().toInt()
12+
targetSdk = libs.versions.targetSdk.get().toInt()
1313
versionCode = 1
1414
versionName = "1.0"
1515
}

‎sentry-android-integration-tests/test-app-sentry/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ plugins {
33
}
44

55
android {
6-
compileSdk = Config.Android.compileSdkVersion
6+
compileSdk = libs.versions.compileSdk.get().toInt()
77
namespace = "io.sentry.java.tests.perf.appsentry"
88

99
defaultConfig {
1010
applicationId = "io.sentry.java.tests.perf.appsentry"
11-
minSdk = Config.Android.minSdkVersion
12-
targetSdk = Config.Android.targetSdkVersion
11+
minSdk = libs.versions.minSdk.get().toInt()
12+
targetSdk = libs.versions.targetSdk.get().toInt()
1313
versionCode = 1
1414
versionName = "1.0"
1515
}

‎sentry-android-navigation/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
}
1111

1212
android {
13-
compileSdk = Config.Android.compileSdkVersion
13+
compileSdk = libs.versions.compileSdk.get().toInt()
1414
namespace = "io.sentry.android.navigation"
1515

1616
defaultConfig {
17-
minSdk = Config.Android.minSdkVersion
17+
minSdk = libs.versions.minSdk.get().toInt()
1818

1919
// for AGP 4.1
2020
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")

0 commit comments

Comments
 (0)