Skip to content

Commit 50f608f

Browse files
rbro112rbro112
authored
Merge 9bdb011 into 2630a4e 
2 parents 2630a4e + 9bdb011 commit 50f608f

File tree

9 files changed

+38
-40
lines changed

9 files changed

+38
-40
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,6 @@ object Config {
129129
val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
130130
val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib"
131131

132-
private val navigationVersion = "2.4.2"
133-
val navigationRuntime = "androidx.navigation:navigation-runtime:$navigationVersion"
134-
135-
// compose deps
136-
val composeNavigation = "androidx.navigation:navigation-compose:$navigationVersion"
137-
val composeActivity = "androidx.activity:activity-compose:1.8.2"
138-
val composeFoundation = "androidx.compose.foundation:foundation:1.6.3"
139-
val composeUi = "androidx.compose.ui:ui:1.6.3"
140-
val composeFoundationLayout = "androidx.compose.foundation:foundation-layout:1.6.3"
141-
val composeMaterial = "androidx.compose.material3:material3:1.2.1"
142-
143-
val composeUiReplay = "androidx.compose.ui:ui:1.5.0" // Note: don't change without testing forwards compatibility
144-
val composeCoil = "io.coil-kt:coil-compose:2.6.0"
145-
146132
val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
147133
val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
148134

‎gradle/libs.versions.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[versions]
2+
androidxNavigation = "2.4.2"
23
androidxTestCore = "1.6.1"
3-
composeVersion = "1.6.11"
4+
androidxComposeVersion = "1.6.3"
5+
jetbrainsComposeVersion = "1.6.11"
46
espresso = "3.5.0"
57
kotlin = "1.9.24"
68
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
@@ -16,7 +18,7 @@ buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
1618
dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
1719
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
1820
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
19-
compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" }
21+
compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsComposeVersion" }
2022
errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
2123
gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
2224
spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
@@ -29,8 +31,18 @@ spring-boot-three = { id = "org.springframework.boot", version.ref = "springThre
2931
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
3032

3133
[libraries]
34+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxComposeVersion" }
35+
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxComposeVersion" }
36+
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxComposeVersion" }
37+
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
38+
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxComposeVersion" }
39+
# Note: don't change without testing forwards compatibility
40+
androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }
3241
androidx-core = { module = "androidx.core:core", version = "1.3.2"}
3342
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
43+
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
44+
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
45+
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
3446
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
3547

3648
# test libraries

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ dependencies {
110110
testImplementation(projects.sentryAndroidReplay)
111111
testImplementation(projects.sentryCompose)
112112
testImplementation(projects.sentryAndroidNdk)
113-
testRuntimeOnly(Config.Libs.composeUi)
113+
testRuntimeOnly(libs.androidx.compose.ui)
114114
testRuntimeOnly(Config.Libs.timber)
115115
testRuntimeOnly(Config.Libs.fragment)
116116
}

‎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
@@ -50,9 +50,9 @@ android {
5050
dependencies {
5151
implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
5252
implementation(libs.androidx.core)
53-
implementation(Config.Libs.composeActivity)
54-
implementation(Config.Libs.composeFoundation)
55-
implementation(Config.Libs.composeMaterial)
53+
implementation(libs.androidx.activity.compose)
54+
implementation(libs.androidx.compose.foundation)
55+
implementation(libs.androidx.compose.material3)
5656
implementation(Config.Libs.constraintLayout)
5757
implementation(projects.sentryAndroidCore)
5858
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ dependencies {
102102
}
103103
implementation(Config.Libs.appCompat)
104104
implementation(libs.androidx.core)
105-
implementation(Config.Libs.composeActivity)
106-
implementation(Config.Libs.composeFoundation)
107-
implementation(Config.Libs.composeMaterial)
105+
implementation(libs.androidx.activity.compose)
106+
implementation(libs.androidx.compose.foundation)
107+
implementation(libs.androidx.compose.material3)
108108
implementation(Config.Libs.androidxRecylerView)
109109
implementation(Config.Libs.constraintLayout)
110110
implementation(libs.androidx.test.espresso.idling.resource)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ kotlin {
6666
dependencies {
6767
api(projects.sentry)
6868

69-
compileOnly(Config.Libs.navigationRuntime)
69+
compileOnly(libs.androidx.navigation.runtime)
7070

7171
// tests
72-
testImplementation(Config.Libs.navigationRuntime)
72+
testImplementation(libs.androidx.navigation.runtime)
7373

7474
testImplementation(libs.kotlin.test.junit)
7575
testImplementation(libs.mockito.kotlin)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,25 @@ kotlin {
8080
dependencies {
8181
api(projects.sentry)
8282

83-
compileOnly(Config.Libs.composeUiReplay)
83+
compileOnly(libs.androidx.compose.ui.replay)
8484
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
8585

8686
// tests
8787
testImplementation(projects.sentryTestSupport)
8888
testImplementation(projects.sentryAndroidCore)
8989
testImplementation(libs.roboelectric)
9090
testImplementation(libs.kotlin.test.junit)
91+
testImplementation(libs.androidx.activity.compose)
9192
testImplementation(libs.androidx.test.ext.junit)
9293
testImplementation(libs.androidx.test.runner)
9394
testImplementation(libs.mockito.kotlin)
9495
testImplementation(libs.mockito.inline)
9596
testImplementation(Config.TestLibs.awaitility)
96-
testImplementation(Config.Libs.composeActivity)
97-
testImplementation(Config.Libs.composeUi)
98-
testImplementation(Config.Libs.composeCoil)
99-
testImplementation(Config.Libs.composeFoundation)
100-
testImplementation(Config.Libs.composeFoundationLayout)
101-
testImplementation(Config.Libs.composeMaterial)
97+
testImplementation(libs.androidx.compose.ui)
98+
testImplementation(libs.androidx.compose.foundation)
99+
testImplementation(libs.androidx.compose.foundation.layout)
100+
testImplementation(libs.androidx.compose.material3)
101+
testImplementation(libs.coil.compose)
102102
}
103103

104104
tasks.withType<Detekt>().configureEach {

‎sentry-compose/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ kotlin {
4949
api(projects.sentry)
5050
api(projects.sentryAndroidNavigation)
5151

52-
compileOnly(Config.Libs.composeNavigation)
52+
compileOnly(libs.androidx.navigation.compose)
5353
implementation(Config.Libs.lifecycleCommonJava8)
5454
}
5555
}
@@ -58,7 +58,7 @@ kotlin {
5858
implementation(libs.kotlin.test.junit)
5959
implementation(libs.mockito.kotlin)
6060
implementation(libs.mockito.inline)
61-
implementation(Config.Libs.composeNavigation)
61+
implementation(libs.androidx.navigation.compose)
6262
implementation(libs.roboelectric)
6363
implementation(libs.androidx.test.rules)
6464
implementation(libs.androidx.test.runner)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ dependencies {
161161
implementation(Config.Libs.retrofit2)
162162
implementation(Config.Libs.retrofit2Gson)
163163

164-
implementation(Config.Libs.composeActivity)
165-
implementation(Config.Libs.composeFoundation)
166-
implementation(Config.Libs.composeFoundationLayout)
167-
implementation(Config.Libs.composeNavigation)
168-
implementation(Config.Libs.composeMaterial)
169-
implementation(Config.Libs.composeCoil)
164+
implementation(libs.androidx.activity.compose)
165+
implementation(libs.androidx.compose.foundation)
166+
implementation(libs.androidx.compose.foundation.layout)
167+
implementation(libs.androidx.navigation.compose)
168+
implementation(libs.androidx.compose.material3)
169+
implementation(libs.coil.compose)
170170
implementation(Config.Libs.sentryNativeNdk)
171171

172172
implementation(projects.sentryKotlinExtensions)

0 commit comments

Comments
 (0)