Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0ca0884

Browse filesBrowse files
rbro112rbro112
authored
Remaining simple migrations to version catalogs (#4466)
1 parent ebe1ab8 commit 0ca0884
Copy full SHA for 0ca0884

43 files changed

+124-138Lines changed: 124 additions & 138 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎build.gradle.kts‎

Copy file name to clipboardExpand all lines: build.gradle.kts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ buildscript {
3939
// add classpath of sentry android gradle plugin
4040
// classpath("io.sentry:sentry-android-gradle-plugin:{version}")
4141

42-
classpath(Config.BuildPlugins.commonsCompressOverride)
42+
classpath(libs.commons.compress)
4343
}
4444
}
4545

Collapse file

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

Copy file name to clipboardExpand all lines: buildSrc/src/main/java/Config.kt
-33Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ object Config {
55
val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
66
val kotlinStdLib = "stdlib-jdk8"
77

8-
val kotlinCompatibleLanguageVersion = "1.6"
9-
10-
val androidComposeCompilerVersion = "1.5.14"
11-
128
object BuildPlugins {
139
val androidGradle = "com.android.tools.build:gradle:$AGP"
14-
val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
1510
}
1611

1712
object Android {
@@ -29,37 +24,9 @@ object Config {
2924
val springSecurityConfig = "org.springframework.security:spring-security-config"
3025
val springAop = "org.springframework:spring-aop"
3126
val aspectj = "org.aspectj:aspectjweaver"
32-
val servletApi = "javax.servlet:javax.servlet-api:3.1.0"
33-
val servletApiJakarta = "jakarta.servlet:jakarta.servlet-api:5.0.0"
34-
35-
val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4"
36-
37-
val reactorCore = "io.projectreactor:reactor-core:3.5.3"
38-
val contextPropagation = "io.micrometer:context-propagation:1.1.0"
39-
40-
private val feignVersion = "11.6"
41-
val feignCore = "io.github.openfeign:feign-core:$feignVersion"
42-
val feignGson = "io.github.openfeign:feign-gson:$feignVersion"
43-
44-
private val apolloVersion = "2.5.9"
45-
val apolloAndroid = "com.apollographql.apollo:apollo-runtime:$apolloVersion"
46-
val apolloCoroutines = "com.apollographql.apollo:apollo-coroutines-support:$apolloVersion"
47-
48-
val p6spy = "p6spy:p6spy:3.9.1"
49-
50-
val graphQlJava = "com.graphql-java:graphql-java:17.3"
51-
val graphQlJava22 = "com.graphql-java:graphql-java:22.1"
52-
val graphQlJavaNew = "com.graphql-java:graphql-java:24.0"
53-
54-
val quartz = "org.quartz-scheduler:quartz:2.3.0"
5527

5628
val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
5729
val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib"
58-
59-
val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
60-
val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
61-
62-
val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.8.4"
6330
}
6431

6532
object AnnotationProcessors {
Collapse file

‎gradle/libs.versions.toml‎

Copy file name to clipboardExpand all lines: gradle/libs.versions.toml
+24-1Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
[versions]
2+
apollo = "2.5.9"
23
androidxLifecycle = "2.2.0"
34
androidxNavigation = "2.4.2"
45
androidxTestCore = "1.6.1"
56
androidxCompose = "1.6.3"
7+
composeCompiler = "1.5.14"
68
coroutines = "1.6.1"
79
espresso = "3.5.0"
10+
feign = "11.6"
11+
jacoco = "0.8.7"
812
jackson = "2.18.3"
913
jetbrainsCompose = "1.6.11"
1014
kotlin = "1.9.24"
15+
kotlin-compatible-version = "1.6"
1116
logback = "1.2.9"
1217
log4j2 = "2.20.0"
1318
nopen = "1.0.1"
@@ -23,10 +28,10 @@ retrofit = "2.9.0"
2328
slf4j = "1.7.30"
2429
springboot2 = "2.7.18"
2530
springboot3 = "3.5.0"
31+
# Android
2632
targetSdk = "34"
2733
compileSdk = "34"
2834
minSdk = "21"
29-
jacoco = "0.8.7"
3035

3136
[plugins]
3237
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -49,6 +54,11 @@ spring-dependency-management = { id = "io.spring.dependency-management", version
4954
gretty = { id = "org.gretty", version = "4.0.0" }
5055

5156
[libraries]
57+
apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
58+
apollo2-coroutines = { module = "com.apollographql.apollo:apollo-coroutines-support", version.ref = "apollo" }
59+
apollo2-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" }
60+
apollo3-kotlin = { module = "com.apollographql.apollo3:apollo-runtime", version = "3.8.2" }
61+
apollo4-kotlin = { module = "com.apollographql.apollo:apollo-runtime", version = "4.1.1" }
5262
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.3.0" }
5363
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
5464
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
@@ -69,7 +79,14 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
6979
androidx-sqlite = { module = "androidx.sqlite:sqlite", version = "2.3.1" }
7080
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.2.1" }
7181
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
82+
commons-compress = {module = "org.apache.commons:commons-compress", version = "1.25.0"}
83+
context-propagation = { module = "io.micrometer:context-propagation", version = "1.1.0" }
7284
errorprone-core = { module = "com.google.errorprone:error_prone_core", version = "2.11.0" }
85+
feign-core = { module = "io.github.openfeign:feign-core", version.ref = "feign" }
86+
feign-gson = { module = "io.github.openfeign:feign-gson", version.ref = "feign" }
87+
graphql-java17 = { module = "com.graphql-java:graphql-java", version = "17.3" }
88+
graphql-java22 = { module = "com.graphql-java:graphql-java", version = "22.1" }
89+
graphql-java24 = { module = "com.graphql-java:graphql-java", version = "24.0" }
7390
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
7491
jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
7592
jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" }
@@ -93,8 +110,14 @@ otel-javaagent-tooling = { module = "io.opentelemetry.javaagent:opentelemetry-ja
93110
otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api", version.ref = "otelInstrumentationAlpha" }
94111
otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConventions" }
95112
otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConventions" }
113+
p6spy = { module = "p6spy:p6spy", version = "3.9.1" }
114+
quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
115+
reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
96116
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
97117
retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
118+
sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.8.4" }
119+
servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
120+
servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "5.0.0" }
98121
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
99122
slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
100123
slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
compose = true
4141
}
4242
composeOptions {
43-
kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
43+
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
4444
}
4545
androidComponents.beforeVariants {
4646
it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ android {
4242
}
4343

4444
composeOptions {
45-
kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
45+
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
4646
}
4747

4848
signingConfigs {
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-navigation/build.gradle.kts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ android {
3131

3232
kotlinOptions {
3333
jvmTarget = JavaVersion.VERSION_1_8.toString()
34-
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
34+
kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
3535
}
3636

3737
testOptions {
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-ndk/build.gradle.kts
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ dependencies {
8383
api(projects.sentry)
8484
api(projects.sentryAndroidCore)
8585

86-
implementation(Config.Libs.sentryNativeNdk)
87-
8886
compileOnly(libs.jetbrains.annotations)
8987

88+
implementation(libs.sentry.native.ndk)
89+
9090
testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
9191
testImplementation(libs.kotlin.test.junit)
9292
testImplementation(libs.mockito.kotlin)
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-replay/build.gradle.kts
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
}
3131

3232
composeOptions {
33-
kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
33+
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
3434
useLiveLiterals = false
3535
}
3636

@@ -45,7 +45,7 @@ android {
4545

4646
kotlinOptions {
4747
jvmTarget = JavaVersion.VERSION_1_8.toString()
48-
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
48+
kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
4949
}
5050

5151
testOptions {
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-sqlite/build.gradle.kts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232

3333
kotlinOptions {
3434
jvmTarget = JavaVersion.VERSION_1_8.toString()
35-
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
35+
kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
3636
}
3737

3838
testOptions {
Collapse file

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

Copy file name to clipboardExpand all lines: sentry-android-timber/build.gradle.kts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535

3636
kotlinOptions {
3737
jvmTarget = JavaVersion.VERSION_1_8.toString()
38-
kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
38+
kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
3939
}
4040

4141
testOptions {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.