Upgrade gradle to v8.14.2 #8950
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| apply from: "$rootDir/gradle/java.gradle" | ||
|
|
||
| // JUnit5 5.3.0+ version is needed because of the fix in the TestInheritance test suite names. | ||
|
There was a problem hiding this comment. The updates to the latest version of JUnit Jupiter and Platform address the error: I'm honestly not quite sure why the gradle upgrade initiated this. Others have faced the same problem (unplanned junit issue) and also resolved it by switching the versions. |
||
|
|
@@ -33,9 +32,9 @@ dependencies { | |
|
|
||
| // versions used below are not the minimum ones that we support, | ||
| // but the tests need to use them in order to be compliant with Spock 2.x | ||
| testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1' | ||
| testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.13.1' | ||
| testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.13.1' | ||
|
|
||
| latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+' | ||
| latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+' | ||
|
|
@@ -44,8 +43,8 @@ dependencies { | |
|
|
||
| configurations.matching({ it.name.startsWith('test') }).each({ | ||
| it.resolutionStrategy { | ||
| force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1' | ||
| force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.13.1' | ||
| force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.13.1' | ||
| } | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import datadog.trace.agent.test.base.AbstractPromiseTest | ||
| import io.netty.util.concurrent.DefaultEventExecutorGroup | ||
| import io.netty.util.concurrent.GenericProgressiveFutureListener | ||
| import io.netty.util.concurrent.ProgressiveFuture | ||
| import io.netty.util.concurrent.ProgressivePromise | ||
| import spock.lang.Shared | ||
|
|
||
|
|
@@ -61,15 +61,12 @@ class NettyProgressivePromiseTest extends AbstractPromiseTest<ProgressivePromise | |
| when: | ||
| runUnderTrace("parent") { | ||
| def listeners = iterations.collect { int i -> | ||
| return new GenericProgressiveFutureListener<ProgressiveFuture<?>>() { | ||
| void operationComplete(ProgressiveFuture<?> future) throws Exception { | ||
| runUnderTrace("listen$i") {} | ||
| } | ||
|
|
||
| void operationProgressed(ProgressiveFuture<?> future, long progress, long total) throws Exception { | ||
| runUnderTrace("progress$i") {} | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. GenericProgressiveFutureListener argument extends ProgressiveFuture (ref), and for some reason with the Gradle upgrade, I get the error: |
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,7 @@ final testTasks = scalaVersions.collect { scalaLibrary -> | |
| def (major, minor) = version.split('_').collect(Integer.&valueOf) | ||
|
There was a problem hiding this comment. Changes in this file address aesthetic comments in the previous Gradle upgrade #8886 |
||
| final javaConcatenation = major > 2 || minor > 11 // after 2.11 scala uses java.lang.StringBuilder to perform concatenation | ||
|
|
||
| final implementationConfiguration = configurations.create("${version}Implementation") { | ||
| canBeConsumed = false | ||
| canBeResolved = false | ||
| canBeDeclared = true | ||
|
|
@@ -36,14 +36,14 @@ final testTasks = scalaVersions.collect { scalaLibrary -> | |
| canBeConsumed = false | ||
| canBeResolved = true | ||
| canBeDeclared = false | ||
| extendsFrom(implementationConfiguration) | ||
| } | ||
|
|
||
| dependencies { handler -> | ||
| handler.add(implementationConfiguration.name, scalaLibrary) | ||
| handler.add(implementationConfiguration.name, libs.slf4j) | ||
| if (javaConcatenation) { | ||
| handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:java-lang')) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -59,7 +59,7 @@ final testTasks = scalaVersions.collect { scalaLibrary -> | |
| .filter { !it.toString().contains('scala-library') } // exclude default scala-library | ||
| .minus(files(sourceSets.test.scala.classesDirectory)) // exclude default /build/classes/scala/test folder | ||
| .plus(customSourceSet.output.classesDirs) // add /build/classes/scala/${version} folder | ||
| .plus(classPathConfiguration) // add new scala-library configuration | ||
| systemProperty('uses.java.concat', javaConcatenation) | ||
| dependsOn(tasks.named("compile${version.capitalize()}Scala")) | ||
| group = 'verification' | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,7 +60,7 @@ class GradleLauncherSmokeTest extends AbstractGradleTest { | |
| ]) | ||
| String[] command = ["./gradlew", "--no-daemon", "--info"] | ||
| if (gradleDaemonCmdLineParams) { | ||
| command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams".toString() | ||
| } | ||
|
There was a problem hiding this comment. This resolves errors I was getting with assigning GStringImpl to String[] (others' experiences: apache issue, stackoverflow issue). Seems like this should be resolved with groovy 3.0.7+, but I guess not… |
||
| return shellCommandExecutor.executeCommand(IOUtils::readFully, command) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ okhttp-legacy = "[3.0,3.12.12]" # 3.12.x is last version to support Java7 | |
| okio = "1.17.6" # Datadog fork | ||
|
|
||
| spock = "2.3-groovy-3.0" | ||
| groovy = "3.0.24" | ||
| junit5 = "5.9.2" | ||
|
There was a problem hiding this comment. When upgrading from Gradle <= 8.13, Groovy needs to be upgraded to 3.0.24: https://docs.gradle.org/current/userguide/upgrading_version_8.html#upgrade_to_groovy_3_0_24 |
||
| logback = "1.2.3" | ||
| bytebuddy = "1.17.5" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import org.gradle.api.plugins.jvm.JvmTestSuite | ||
|
|
||
| ext.addTestSuiteExtendingForDir = { testSuiteName, parentSuiteName, dirName -> | ||
| testing { | ||
| suites { | ||
| create(testSuiteName, JvmTestSuite, { | ||
|
|
@@ -27,16 +27,12 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName, | |
| } | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| configurations { | ||
| def extendConf = { suffix -> | ||
| def config = named("${testSuiteName}${suffix}") | ||
| def parentConfig = named("${parentSuiteName}${suffix}") | ||
| if (parentConfig.present) { | ||
|
|
@@ -65,12 +61,16 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName, | |
| from(sourceSets.named(testSuiteName).get().output) | ||
| archiveClassifier = testSuiteName | ||
| } | ||
|
|
||
| project.dependencies { | ||
| "${testSuiteName}Implementation"(project(project.path)) | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Project dependencies was separated out due to the error |
||
|
|
||
| ext.addTestSuiteForDir = { testSuiteName, dirName -> | ||
| ext.addTestSuiteExtendingForDir(testSuiteName, 'test', dirName) | ||
| } | ||
|
|
||
| ext.addTestSuite = { testSuiteName -> | ||
| ext.addTestSuiteForDir(testSuiteName, testSuiteName) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When trying to
./gradlew clean assemble, I ran across the errorincompatible types: org.gradle.internal.service.scopes.BuildScopeServices cannot be converted to org.gradle.internal.service.DefaultServiceRegistry. Explicitly setting thebuildScopeServicestype toDefaultServiceRegistry(which is what injectCiVisibilityGradleListener takes) resolves this.I'm thinking that the Gradle upgrade has led to stricter type resolution as seen from errors->updates made below 🤔