From f4d42303b13b82650af78f760f40d43122ef9aee Mon Sep 17 00:00:00 2001 From: Roman Zavarnitsyn Date: Fri, 13 Nov 2026 09:30:34 +0100 Subject: [PATCH] chore(deps): Scan one Gradle directory with Dependabot The separate sample and test builds read the SDK build's version catalog, so listing them as Dependabot directories opened one PR per directory for the same catalog bump. The root directory covers the catalog; the three versions only the samples declared move into it. Co-Authored-By: Claude Fable 5.1 --- .github/dependabot.yml | 11 +++++------ gradle/libs.versions.toml | 4 ++++ .../sentry-samples-netflix-dgs/build.gradle.kts | 4 ++-- .../sentry-samples-servlet/build.gradle.kts | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7cee6759bd..93fc79f4a2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,12 +7,9 @@ registries: password: dummy # Required by dependabot updates: - package-ecosystem: "gradle" - # The root build doesn't include the separate sample and test builds. - directories: - - "/" - - "/sentry-samples/sentry-samples-android" - - "/sentry-android-integration-tests" - - "/sentry-samples" + # The separate sample and test builds read this build's version catalog, so one directory + # covers them. Listing them too opens one PR per directory for the same bump. + directory: "/" registries: - gradle-plugin-portal schedule: @@ -20,6 +17,8 @@ updates: ignore: - dependency-name: "org.springframework.boot*" - dependency-name: "io.opentelemetry*" + # DGS 5+ needs Spring Boot 3; the sample is on Spring Boot 2. + - dependency-name: "com.netflix.graphql.dgs*" commit-message: prefix: "chore(deps)" - package-ecosystem: "github-actions" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d6a55ba3d5..deb030f285 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,6 +10,7 @@ asyncProfiler = "4.4" camerax = "1.4.0" composeCompiler = "1.5.14" coroutines = "1.6.1" +dgs = "4.9.2" detekt = "1.23.8" dokka = "2.0.0" espresso = "3.7.0" @@ -146,6 +147,8 @@ feign-gson = { module = "io.github.openfeign:feign-gson", version.ref = "feign" graphql-java17 = { module = "com.graphql-java:graphql-java", version = "17.3" } graphql-java22 = { module = "com.graphql-java:graphql-java", version = "22.1" } graphql-java24 = { module = "com.graphql-java:graphql-java", version = "24.0" } +netflix-dgs-platform = { module = "com.netflix.graphql.dgs:graphql-dgs-platform-dependencies", version.ref = "dgs" } +netflix-dgs-subscriptions-websockets-autoconfigure = { module = "com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure", version.ref = "dgs" } jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" } @@ -196,6 +199,7 @@ retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.17.6" } sentry-native-ndk-outproc = { module = "io.sentry:sentry-native-ndk-outproc", version = "1.0.0-beta.1" } servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } +servlet4-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" } diff --git a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts index 7bbc377a28..968feb5a1b 100644 --- a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts +++ b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts @@ -31,8 +31,8 @@ dependencies { implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion())) implementation("io.sentry:sentry-spring-boot-starter:$sentryVersion") implementation("io.sentry:sentry-graphql:$sentryVersion") - implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.9.2")) - implementation("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:4.9.2") + implementation(platform(libs.netflix.dgs.platform)) + implementation(libs.netflix.dgs.subscriptions.websockets.autoconfigure) implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter") testImplementation(libs.springboot.starter.test) { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") diff --git a/sentry-samples/sentry-samples-servlet/build.gradle.kts b/sentry-samples/sentry-samples-servlet/build.gradle.kts index 5cc8a7e0a4..e223e8786e 100644 --- a/sentry-samples/sentry-samples-servlet/build.gradle.kts +++ b/sentry-samples/sentry-samples-servlet/build.gradle.kts @@ -16,7 +16,7 @@ java.targetCompatibility = JavaVersion.VERSION_1_8 dependencies { implementation("io.sentry:sentry-servlet:$sentryVersion") - implementation("javax.servlet:javax.servlet-api:4.0.1") + implementation(libs.servlet4.api) } tasks.withType().configureEach { useJUnitPlatform() }