Skip to content

Commit 01fa070

Browse files
rbro112rbro112
authored
Move compileOnly dependencies to use version catalog (#4463)
* Move compileOnly dependencies to use version catalog * Remove old deps * Fix
1 parent 096c5c0 commit 01fa070

File tree

36 files changed

+180
-186
lines changed

36 files changed

+180
-186
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ object Config {
55
val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
66
val kotlinStdLib = "stdlib-jdk8"
77

8-
val springBootVersion = "2.7.18"
9-
val springBoot3Version = "3.5.0"
108
val kotlinCompatibleLanguageVersion = "1.6"
119

1210
val androidComposeCompilerVersion = "1.5.14"
@@ -157,16 +155,6 @@ object Config {
157155
val versionNameProp = "versionName"
158156
}
159157

160-
object CompileOnly {
161-
private val nopenVersion = "1.0.1"
162-
163-
val jetbrainsAnnotations = "org.jetbrains:annotations:23.0.0"
164-
val nopen = "com.jakewharton.nopen:nopen-annotations:$nopenVersion"
165-
val nopenChecker = "com.jakewharton.nopen:nopen-checker:$nopenVersion"
166-
val errorprone = "com.google.errorprone:error_prone_core:2.11.0"
167-
val errorProneNullAway = "com.uber.nullaway:nullaway:0.9.5"
168-
}
169-
170158
object BuildScript {
171159
val androidLibs = setOf(
172160
"sentry-android-core",

‎gradle/libs.versions.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[versions]
22
androidxNavigation = "2.4.2"
33
androidxTestCore = "1.6.1"
4-
androidxComposeVersion = "1.6.3"
5-
jetbrainsComposeVersion = "1.6.11"
4+
androidxCompose = "1.6.3"
5+
jetbrainsCompose = "1.6.11"
66
espresso = "3.5.0"
77
kotlin = "1.9.24"
8+
nopen = "1.0.1"
89
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
910
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
1011
okhttp = "4.9.2"
@@ -27,7 +28,7 @@ buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
2728
dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
2829
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
2930
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
30-
compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsComposeVersion" }
31+
compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" }
3132
errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
3233
gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
3334
spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
@@ -42,18 +43,23 @@ gretty = { id = "org.gretty", version = "4.0.0" }
4243

4344
[libraries]
4445
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
45-
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxComposeVersion" }
46-
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxComposeVersion" }
46+
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" }
47+
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" }
4748
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
48-
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxComposeVersion" }
49+
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxCompose" }
4950
# Note: don't change without testing forwards compatibility
5051
androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }
5152
androidx-core = { module = "androidx.core:core", version = "1.3.2" }
5253
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
5354
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
5455
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
5556
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
57+
errorprone-core = { module = "com.google.errorprone:error_prone_core", version = "2.11.0" }
58+
jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0"}
5659
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
60+
nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen"}
61+
nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen"}
62+
nullaway = { module = "com.uber.nullaway:nullaway", version = "0.9.5" }
5763
otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" }
5864
otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" }
5965
otel-extension-autoconfigure-spi = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", version.ref = "otel" }

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ android {
6060

6161
// needed because of Kotlin 1.4.x
6262
configurations.all {
63-
resolutionStrategy.force(Config.CompileOnly.jetbrainsAnnotations)
63+
resolutionStrategy.force(libs.jetbrains.annotations.get())
6464
}
6565

6666
androidComponents.beforeVariants {
@@ -77,6 +77,8 @@ tasks.withType<JavaCompile>().configureEach {
7777

7878
dependencies {
7979
api(projects.sentry)
80+
compileOnly(libs.jetbrains.annotations)
81+
compileOnly(libs.nopen.annotations)
8082
compileOnly(projects.sentryAndroidFragment)
8183
compileOnly(projects.sentryAndroidTimber)
8284
compileOnly(projects.sentryAndroidReplay)
@@ -87,11 +89,9 @@ dependencies {
8789
implementation(Config.Libs.lifecycleCommonJava8)
8890
implementation(libs.androidx.core)
8991

90-
compileOnly(Config.CompileOnly.nopen)
91-
errorprone(Config.CompileOnly.nopenChecker)
92-
errorprone(Config.CompileOnly.errorprone)
93-
errorprone(Config.CompileOnly.errorProneNullAway)
94-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
92+
errorprone(libs.errorprone.core)
93+
errorprone(libs.nopen.checker)
94+
errorprone(libs.nullaway)
9595

9696
// tests
9797
testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,19 @@ android {
8484
}
8585

8686
dependencies {
87-
8887
implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
89-
9088
implementation(projects.sentryAndroid)
9189
implementation(Config.Libs.appCompat)
9290
implementation(libs.androidx.core)
9391
implementation(Config.Libs.androidxRecylerView)
9492
implementation(Config.Libs.constraintLayout)
9593
implementation(libs.androidx.test.espresso.idling.resource)
9694

97-
compileOnly(Config.CompileOnly.nopen)
98-
errorprone(Config.CompileOnly.nopenChecker)
99-
errorprone(Config.CompileOnly.errorprone)
100-
errorprone(Config.CompileOnly.errorProneNullAway)
95+
compileOnly(libs.nopen.annotations)
96+
97+
errorprone(libs.errorprone.core)
98+
errorprone(libs.nopen.checker)
99+
errorprone(libs.nullaway)
101100

102101
androidTestUtil(libs.androidx.test.orchestrator)
103102
androidTestImplementation(projects.sentryTestSupport)

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,11 @@ dependencies {
110110
implementation(libs.androidx.test.espresso.idling.resource)
111111
implementation(Config.Libs.leakCanary)
112112

113-
compileOnly(Config.CompileOnly.nopen)
114-
errorprone(Config.CompileOnly.nopenChecker)
115-
errorprone(Config.CompileOnly.errorprone)
116-
errorprone(Config.CompileOnly.errorProneNullAway)
113+
compileOnly(libs.nopen.annotations)
114+
115+
errorprone(libs.errorprone.core)
116+
errorprone(libs.nopen.checker)
117+
errorprone(libs.nullaway)
117118

118119
androidTestUtil(libs.androidx.test.orchestrator)
119120
androidTestImplementation(projects.sentryTestSupport)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ android {
5656

5757
// needed because of Kotlin 1.4.x
5858
configurations.all {
59-
resolutionStrategy.force(Config.CompileOnly.jetbrainsAnnotations)
59+
resolutionStrategy.force(libs.jetbrains.annotations.get())
6060
}
6161

6262
buildFeatures {
@@ -85,7 +85,7 @@ dependencies {
8585

8686
implementation(Config.Libs.sentryNativeNdk)
8787

88-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
88+
compileOnly(libs.jetbrains.annotations)
8989

9090
testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
9191
testImplementation(libs.kotlin.test.junit)

‎sentry-apache-http-client-5/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ dependencies {
1919
api(projects.sentry)
2020
api(Config.Libs.apacheHttpClient)
2121

22-
compileOnly(Config.CompileOnly.nopen)
23-
errorprone(Config.CompileOnly.nopenChecker)
24-
errorprone(Config.CompileOnly.errorprone)
25-
errorprone(Config.CompileOnly.errorProneNullAway)
26-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
22+
compileOnly(libs.jetbrains.annotations)
23+
compileOnly(libs.nopen.annotations)
24+
errorprone(libs.errorprone.core)
25+
errorprone(libs.nopen.checker)
26+
errorprone(libs.nullaway)
2727

2828
// tests
2929
testImplementation(Config.Libs.apacheHttpClient)

‎sentry-apollo-3/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ dependencies {
2121

2222
compileOnly(Config.Libs.apolloKotlin)
2323

24-
compileOnly(Config.CompileOnly.nopen)
25-
errorprone(Config.CompileOnly.nopenChecker)
26-
errorprone(Config.CompileOnly.errorprone)
27-
errorprone(Config.CompileOnly.errorProneNullAway)
28-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
24+
compileOnly(libs.jetbrains.annotations)
25+
compileOnly(libs.nopen.annotations)
26+
errorprone(libs.errorprone.core)
27+
errorprone(libs.nopen.checker)
28+
errorprone(libs.nullaway)
2929

3030
// tests
3131
testImplementation(projects.sentryTestSupport)

‎sentry-apollo-4/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ dependencies {
2626

2727
compileOnly(Config.Libs.apolloKotlin4)
2828

29-
compileOnly(Config.CompileOnly.nopen)
30-
errorprone(Config.CompileOnly.nopenChecker)
31-
errorprone(Config.CompileOnly.errorprone)
32-
errorprone(Config.CompileOnly.errorProneNullAway)
33-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
29+
compileOnly(libs.jetbrains.annotations)
30+
compileOnly(libs.nopen.annotations)
31+
errorprone(libs.errorprone.core)
32+
errorprone(libs.nopen.checker)
33+
errorprone(libs.nullaway)
3434

3535
// tests
3636
testImplementation(projects.sentryTestSupport)

‎sentry-apollo/build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ dependencies {
2020
api(projects.sentryKotlinExtensions)
2121

2222
compileOnly(Config.Libs.apolloAndroid)
23-
24-
compileOnly(Config.CompileOnly.nopen)
25-
errorprone(Config.CompileOnly.nopenChecker)
26-
errorprone(Config.CompileOnly.errorprone)
27-
errorprone(Config.CompileOnly.errorProneNullAway)
28-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
23+
compileOnly(libs.jetbrains.annotations)
24+
compileOnly(libs.nopen.annotations)
25+
errorprone(libs.errorprone.core)
26+
errorprone(libs.nopen.checker)
27+
errorprone(libs.nullaway)
2928

3029
// tests
3130
testImplementation(projects.sentryTestSupport)

‎sentry-graphql-22/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ dependencies {
2020
api(projects.sentryGraphqlCore)
2121
compileOnly(Config.Libs.graphQlJava22)
2222

23-
compileOnly(Config.CompileOnly.nopen)
24-
errorprone(Config.CompileOnly.nopenChecker)
25-
errorprone(Config.CompileOnly.errorprone)
26-
errorprone(Config.CompileOnly.errorProneNullAway)
27-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
23+
compileOnly(libs.jetbrains.annotations)
24+
compileOnly(libs.nopen.annotations)
25+
errorprone(libs.errorprone.core)
26+
errorprone(libs.nopen.checker)
27+
errorprone(libs.nullaway)
2828

2929
// tests
3030
testImplementation(projects.sentry)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ dependencies {
1919
api(projects.sentry)
2020
compileOnly(Config.Libs.graphQlJava)
2121

22-
compileOnly(Config.CompileOnly.nopen)
23-
errorprone(Config.CompileOnly.nopenChecker)
24-
errorprone(Config.CompileOnly.errorprone)
25-
errorprone(Config.CompileOnly.errorProneNullAway)
26-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
22+
compileOnly(libs.jetbrains.annotations)
23+
compileOnly(libs.nopen.annotations)
24+
errorprone(libs.errorprone.core)
25+
errorprone(libs.nopen.checker)
26+
errorprone(libs.nullaway)
2727

2828
// tests
2929
testImplementation(projects.sentry)

‎sentry-graphql/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ dependencies {
2020
api(projects.sentryGraphqlCore)
2121
compileOnly(Config.Libs.graphQlJava)
2222

23-
compileOnly(Config.CompileOnly.nopen)
24-
errorprone(Config.CompileOnly.nopenChecker)
25-
errorprone(Config.CompileOnly.errorprone)
26-
errorprone(Config.CompileOnly.errorProneNullAway)
27-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
23+
compileOnly(libs.jetbrains.annotations)
24+
compileOnly(libs.nopen.annotations)
25+
errorprone(libs.errorprone.core)
26+
errorprone(libs.nopen.checker)
27+
errorprone(libs.nullaway)
2828

2929
// tests
3030
testImplementation(projects.sentry)

‎sentry-jdbc/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ dependencies {
1818
api(projects.sentry)
1919
api(Config.Libs.p6spy)
2020

21-
compileOnly(Config.CompileOnly.nopen)
22-
errorprone(Config.CompileOnly.nopenChecker)
23-
errorprone(Config.CompileOnly.errorprone)
24-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
25-
errorprone(Config.CompileOnly.errorProneNullAway)
21+
compileOnly(libs.jetbrains.annotations)
22+
compileOnly(libs.nopen.annotations)
23+
errorprone(libs.errorprone.core)
24+
errorprone(libs.nopen.checker)
25+
errorprone(libs.nullaway)
2626

2727
// tests
2828
testImplementation(projects.sentryTestSupport)

‎sentry-jul/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ dependencies {
1818
api(projects.sentry)
1919
compileOnly(Config.Libs.slf4jApi)
2020

21-
compileOnly(Config.CompileOnly.nopen)
22-
errorprone(Config.CompileOnly.nopenChecker)
23-
errorprone(Config.CompileOnly.errorprone)
24-
errorprone(Config.CompileOnly.errorProneNullAway)
25-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
21+
compileOnly(libs.jetbrains.annotations)
22+
compileOnly(libs.nopen.annotations)
23+
errorprone(libs.errorprone.core)
24+
errorprone(libs.nopen.checker)
25+
errorprone(libs.nullaway)
2626

2727
// tests
2828
testImplementation(projects.sentryTestSupport)

‎sentry-kotlin-extensions/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ dependencies {
1919
api(projects.sentry)
2020
compileOnly(Config.Libs.coroutinesCore)
2121

22-
compileOnly(Config.CompileOnly.nopen)
23-
errorprone(Config.CompileOnly.nopenChecker)
24-
errorprone(Config.CompileOnly.errorprone)
25-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
22+
compileOnly(libs.jetbrains.annotations)
23+
compileOnly(libs.nopen.annotations)
24+
errorprone(libs.errorprone.core)
25+
errorprone(libs.nopen.checker)
2626

2727
// tests
2828
testImplementation(projects.sentryTestSupport)

‎sentry-log4j2/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ dependencies {
2020
compileOnly(Config.Libs.log4j2Core)
2121
annotationProcessor(Config.Libs.log4j2Core)
2222

23-
compileOnly(Config.CompileOnly.nopen)
24-
errorprone(Config.CompileOnly.nopenChecker)
25-
errorprone(Config.CompileOnly.errorprone)
26-
errorprone(Config.CompileOnly.errorProneNullAway)
27-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
23+
compileOnly(libs.jetbrains.annotations)
24+
compileOnly(libs.nopen.annotations)
25+
errorprone(libs.errorprone.core)
26+
errorprone(libs.nopen.checker)
27+
errorprone(libs.nullaway)
2828

2929
// tests
3030
testImplementation(projects.sentryTestSupport)

‎sentry-logback/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ dependencies {
1818
api(projects.sentry)
1919
compileOnly(Config.Libs.logbackClassic)
2020

21-
compileOnly(Config.CompileOnly.nopen)
22-
errorprone(Config.CompileOnly.nopenChecker)
23-
errorprone(Config.CompileOnly.errorprone)
24-
errorprone(Config.CompileOnly.errorProneNullAway)
25-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
21+
compileOnly(libs.jetbrains.annotations)
22+
compileOnly(libs.nopen.annotations)
23+
errorprone(libs.errorprone.core)
24+
errorprone(libs.nopen.checker)
25+
errorprone(libs.nullaway)
2626

2727
// tests
2828
testImplementation(projects.sentryTestSupport)

‎sentry-okhttp/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ dependencies {
2626

2727
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
2828

29-
compileOnly(Config.CompileOnly.nopen)
30-
errorprone(Config.CompileOnly.nopenChecker)
31-
errorprone(Config.CompileOnly.errorprone)
32-
errorprone(Config.CompileOnly.errorProneNullAway)
33-
compileOnly(Config.CompileOnly.jetbrainsAnnotations)
29+
compileOnly(libs.jetbrains.annotations)
30+
compileOnly(libs.nopen.annotations)
31+
errorprone(libs.errorprone.core)
32+
errorprone(libs.nopen.checker)
33+
errorprone(libs.nullaway)
3434

3535
// tests
3636
testImplementation(projects.sentryTestSupport)

0 commit comments

Comments
 (0)