diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bd3b127948..04b98e606fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,12 @@ - Android: Attachments on the scope will now be synced to native ([#5211](https://github.com/getsentry/sentry-java/pull/5211)) - Add THIRD_PARTY_NOTICES.md for vendored third-party code, bundled as SENTRY_THIRD_PARTY_NOTICES.md in the sentry JAR under META-INF ([#5186](https://github.com/getsentry/sentry-java/pull/5186)) +### Dependencies + +- Bump Gradle from v8.14.3 to v9.4.1 ([#5063](https://github.com/getsentry/sentry-java/pull/5063)) + - [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v941) + - [diff](https://github.com/gradle/gradle/compare/v8.14.3...v9.4.1) + ## 8.37.1 ### Fixes diff --git a/build.gradle.kts b/build.gradle.kts index 376d0652832..bfa4aef86f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -249,9 +249,13 @@ tasks.register("buildForCodeQL") { } .forEach { proj -> if (proj.plugins.hasPlugin("com.android.library")) { - this.dependsOn(proj.tasks.findByName("compileReleaseUnitTestSources")) + proj.tasks.findByName("compileReleaseUnitTestSources")?.let { testTask -> + this.dependsOn(testTask) + } } else { - this.dependsOn(proj.tasks.findByName("testClasses")) + proj.tasks.findByName("testClasses")?.let { testTask -> + this.dependsOn(testTask) + } } } } diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index b5d1dafeb74..3285db23a98 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -2,7 +2,7 @@ import java.math.BigDecimal object Config { - val AGP = System.getenv("VERSION_AGP") ?: "8.6.0" + val AGP = System.getenv("VERSION_AGP") ?: "8.13.1" val kotlinStdLib = "stdlib-jdk8" val kotlinStdLibVersionAndroid = "1.9.24" val kotlinTestJunit = "test-junit" diff --git a/gradle.properties b/gradle.properties index 3ce5df53b45..74e535312be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled # AndroidX required by AGP >= 3.6.x android.useAndroidX=true -android.experimental.lint.version=8.9.0 +android.experimental.lint.version=8.13.1 # Release information versionName=8.37.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eb7ab86e4bd..9eb39e5066e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -64,10 +64,11 @@ vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.3 springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" } springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" } springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" } -spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" } +spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" } gretty = { id = "org.gretty", version = "4.0.0" } animalsniffer = { id = "ru.vyarus.animalsniffer", version = "2.0.1" } sentry = { id = "io.sentry.android.gradle", version = "6.0.0-alpha.6"} +shadow = { id = "com.gradleup.shadow", version = "8.3.6" } [libraries] apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da476b..c61a118f7dd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts index 7ee17c09385..1a57766cc96 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts @@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { `java-library` id("io.sentry.javadoc") - id("com.gradleup.shadow") version "8.3.6" + alias(libs.plugins.shadow) } fun relocatePackages(shadowJar: ShadowJar) { @@ -133,7 +133,7 @@ tasks { // each CopySpec has // its own duplicatesStrategy register("isolateJavaagentLibs", Copy::class.java) { - dependsOn(findByName("relocateJavaagentLibs")) + findByName("relocateJavaagentLibs")?.let { task -> dependsOn(task) } with(isolateClasses(findByName("relocateJavaagentLibs")!!.outputs.files)) into(project.layout.buildDirectory.file("isolated/javaagentLibs").get().asFile) @@ -145,7 +145,7 @@ tasks { named("shadowJar", ShadowJar::class) { configurations = listOf(bootstrapLibs) + listOf(upstreamAgent) - dependsOn(findByName("isolateJavaagentLibs")) + findByName("isolateJavaagentLibs")?.let { task -> dependsOn(task) } from(findByName("isolateJavaagentLibs")!!.outputs) archiveClassifier.set("") diff --git a/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts index 338241078ae..dfab063591b 100644 --- a/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts @@ -5,7 +5,7 @@ plugins { application alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.versions) - id("com.github.johnrengelman.shadow") version "8.1.1" + alias(libs.plugins.shadow) } application { mainClass.set("io.sentry.samples.console.Main") } diff --git a/sentry-samples/sentry-samples-console-otlp/build.gradle.kts b/sentry-samples/sentry-samples-console-otlp/build.gradle.kts index 18836c89555..08b9315f785 100644 --- a/sentry-samples/sentry-samples-console-otlp/build.gradle.kts +++ b/sentry-samples/sentry-samples-console-otlp/build.gradle.kts @@ -5,7 +5,7 @@ plugins { application alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.versions) - id("com.github.johnrengelman.shadow") version "8.1.1" + alias(libs.plugins.shadow) } application { mainClass.set("io.sentry.samples.console.Main") } diff --git a/sentry-samples/sentry-samples-console/build.gradle.kts b/sentry-samples/sentry-samples-console/build.gradle.kts index 0dc6183b4fc..6d0a4fc736b 100644 --- a/sentry-samples/sentry-samples-console/build.gradle.kts +++ b/sentry-samples/sentry-samples-console/build.gradle.kts @@ -5,7 +5,7 @@ plugins { application alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.versions) - id("com.github.johnrengelman.shadow") version "8.1.1" + alias(libs.plugins.shadow) } application { mainClass.set("io.sentry.samples.console.Main") } diff --git a/sentry-samples/sentry-samples-jul/build.gradle.kts b/sentry-samples/sentry-samples-jul/build.gradle.kts index 8b5f5057054..ac1afa03d37 100644 --- a/sentry-samples/sentry-samples-jul/build.gradle.kts +++ b/sentry-samples/sentry-samples-jul/build.gradle.kts @@ -5,7 +5,7 @@ plugins { application alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.versions) - id("com.github.johnrengelman.shadow") version "8.1.1" + alias(libs.plugins.shadow) } application { mainClass.set("io.sentry.samples.jul.Main") } diff --git a/sentry-samples/sentry-samples-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-log4j2/build.gradle.kts index dede2d9cb29..84e6bb6a0ab 100644 --- a/sentry-samples/sentry-samples-log4j2/build.gradle.kts +++ b/sentry-samples/sentry-samples-log4j2/build.gradle.kts @@ -5,7 +5,7 @@ plugins { application alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.versions) - id("com.github.johnrengelman.shadow") version "8.1.1" + alias(libs.plugins.shadow) } application { mainClass.set("io.sentry.samples.log4j2.Main") } diff --git a/sentry-samples/sentry-samples-logback/build.gradle.kts b/sentry-samples/sentry-samples-logback/build.gradle.kts index ee6949c6c6b..5cd5a2eb85b 100644 --- a/sentry-samples/sentry-samples-logback/build.gradle.kts +++ b/sentry-samples/sentry-samples-logback/build.gradle.kts @@ -5,7 +5,7 @@ plugins { application alias(libs.plugins.kotlin.jvm) alias(libs.plugins.gradle.versions) - id("com.github.johnrengelman.shadow") version "8.1.1" + alias(libs.plugins.shadow) } application { mainClass.set("io.sentry.samples.logback.Main") } diff --git a/sentry-system-test-support/build.gradle.kts b/sentry-system-test-support/build.gradle.kts index dea680b4db1..b8e4a283c87 100644 --- a/sentry-system-test-support/build.gradle.kts +++ b/sentry-system-test-support/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - id("com.apollographql.apollo3") version "3.8.2" + id("com.apollographql.apollo") version "4.1.1" } configure { @@ -22,7 +22,7 @@ tasks.withType().configureEach dependencies { api(projects.sentry) api(projects.sentryTestSupport) - api(libs.apollo3.kotlin) + api(libs.apollo4.kotlin) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) diff --git a/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/graphql/GraphqlTestClient.kt b/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/graphql/GraphqlTestClient.kt index 5127f06b8f7..c1b0a409bda 100644 --- a/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/graphql/GraphqlTestClient.kt +++ b/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/graphql/GraphqlTestClient.kt @@ -1,9 +1,9 @@ package io.sentry.systemtest.graphql -import com.apollographql.apollo3.ApolloClient -import com.apollographql.apollo3.api.ApolloResponse -import com.apollographql.apollo3.api.Mutation -import com.apollographql.apollo3.api.Query +import com.apollographql.apollo.ApolloClient +import com.apollographql.apollo.api.ApolloResponse +import com.apollographql.apollo.api.Mutation +import com.apollographql.apollo.api.Query import io.sentry.samples.graphql.AddProjectMutation import io.sentry.samples.graphql.GreetingQuery import io.sentry.samples.graphql.ProjectQuery diff --git a/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/util/TestHelper.kt b/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/util/TestHelper.kt index 19817c34ac8..7f0dfc8c955 100644 --- a/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/util/TestHelper.kt +++ b/sentry-system-test-support/src/main/kotlin/io/sentry/systemtest/util/TestHelper.kt @@ -1,7 +1,7 @@ package io.sentry.systemtest.util -import com.apollographql.apollo3.api.ApolloResponse -import com.apollographql.apollo3.api.Operation +import com.apollographql.apollo.api.ApolloResponse +import com.apollographql.apollo.api.Operation import io.sentry.JsonSerializer import io.sentry.ProfileChunk import io.sentry.SentryEnvelopeHeader