Upgrade to gradle v8.5 #8886
Merged
Upgrade to gradle v8.5 #8886
Conversation
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
smola
added
tag: no release notes
smola
force-pushed
the
smola/gradle-4-gradle85-upgrade
branch
from
0dc90ef to
b9bc0ef
Compare
smola
commented
May 26, 2025
| final javaConcatenation = major > 2 || minor > 11 // after 2.11 scala uses java.lang.StringBuilder to perform concatenation | ||
|
|
||
| final configuration = configurations.create("${version}Implementation") | ||
| final configuration = configurations.create("${version}Implementation") { |
There was a problem hiding this comment.
This change was required for the upgrade, since we couldn't use the same configuration here both to declare dependencies and to retrieve the class path.
There was a problem hiding this comment.
Maybe rename this for consistency with the new variable.
Suggested change
| final configuration = configurations.create("${version}Implementation") { | |
| final implementationConfiguration = configurations.create("${version}Implementation") { |
BenchmarksStartupParameters
See matching parameters
SummaryFound 1 performance improvements and 2 performance regressions! Performance is the same for 56 metrics, 12 unstable metrics.
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.02 s) : 0, 1019796
Total [baseline] (8.645 s) : 0, 8644573
Agent [candidate] (1.027 s) : 0, 1027362
Total [candidate] (8.694 s) : 0, 8694133
section iast
Agent [baseline] (1.146 s) : 0, 1145627
Total [baseline] (9.237 s) : 0, 9236656
Agent [candidate] (1.148 s) : 0, 1148107
Total [candidate] (9.243 s) : 0, 9242956
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.157 s) : 0, 1156622
Total [baseline] (9.207 s) : 0, 9207475
Agent [candidate] (1.151 s) : 0, 1151323
Total [candidate] (9.206 s) : 0, 9206481
section iast_TELEMETRY_OFF
Agent [baseline] (1.152 s) : 0, 1151603
Total [baseline] (9.254 s) : 0, 9253874
Agent [candidate] (1.153 s) : 0, 1152538
Total [candidate] (9.263 s) : 0, 9263223
gantt
title insecure-bank - break down per module: candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (682.071 ms) : 0, 682071
BytebuddyAgent [candidate] (687.823 ms) : 0, 687823
GlobalTracer [baseline] (239.705 ms) : 0, 239705
GlobalTracer [candidate] (241.594 ms) : 0, 241594
AppSec [baseline] (54.394 ms) : 0, 54394
AppSec [candidate] (55.397 ms) : 0, 55397
Debugger [baseline] (10.431 ms) : 0, 10431
Debugger [candidate] (9.0 ms) : 0, 9000
Remote Config [baseline] (680.436 µs) : 0, 680
Remote Config [candidate] (705.741 µs) : 0, 706
Telemetry [baseline] (8.964 ms) : 0, 8964
Telemetry [candidate] (9.148 ms) : 0, 9148
section iast
BytebuddyAgent [baseline] (800.382 ms) : 0, 800382
BytebuddyAgent [candidate] (801.164 ms) : 0, 801164
GlobalTracer [baseline] (229.234 ms) : 0, 229234
GlobalTracer [candidate] (230.682 ms) : 0, 230682
IAST [baseline] (28.106 ms) : 0, 28106
IAST [candidate] (27.552 ms) : 0, 27552
AppSec [baseline] (50.113 ms) : 0, 50113
AppSec [candidate] (50.204 ms) : 0, 50204
Debugger [baseline] (5.942 ms) : 0, 5942
Debugger [candidate] (5.92 ms) : 0, 5920
Remote Config [baseline] (607.866 µs) : 0, 608
Remote Config [candidate] (591.29 µs) : 0, 591
Telemetry [baseline] (7.884 ms) : 0, 7884
Telemetry [candidate] (7.791 ms) : 0, 7791
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (807.615 ms) : 0, 807615
BytebuddyAgent [candidate] (803.259 ms) : 0, 803259
GlobalTracer [baseline] (231.794 ms) : 0, 231794
GlobalTracer [candidate] (231.29 ms) : 0, 231290
IAST [baseline] (27.844 ms) : 0, 27844
IAST [candidate] (29.164 ms) : 0, 29164
AppSec [baseline] (51.118 ms) : 0, 51118
AppSec [candidate] (49.601 ms) : 0, 49601
Debugger [baseline] (5.986 ms) : 0, 5986
Debugger [candidate] (5.931 ms) : 0, 5931
Remote Config [baseline] (594.767 µs) : 0, 595
Remote Config [candidate] (584.63 µs) : 0, 585
Telemetry [baseline] (7.979 ms) : 0, 7979
Telemetry [candidate] (7.936 ms) : 0, 7936
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (803.449 ms) : 0, 803449
BytebuddyAgent [candidate] (804.328 ms) : 0, 804328
GlobalTracer [baseline] (231.394 ms) : 0, 231394
GlobalTracer [candidate] (231.774 ms) : 0, 231774
IAST [baseline] (22.678 ms) : 0, 22678
IAST [candidate] (24.044 ms) : 0, 24044
AppSec [baseline] (56.063 ms) : 0, 56063
AppSec [candidate] (54.361 ms) : 0, 54361
Debugger [baseline] (6.003 ms) : 0, 6003
Debugger [candidate] (5.968 ms) : 0, 5968
Remote Config [baseline] (612.587 µs) : 0, 613
Remote Config [candidate] (604.46 µs) : 0, 604
Telemetry [baseline] (7.811 ms) : 0, 7811
Telemetry [candidate] (7.876 ms) : 0, 7876
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.031 s) : 0, 1031485
Total [baseline] (10.523 s) : 0, 10523130
Agent [candidate] (1.022 s) : 0, 1022296
Total [candidate] (10.556 s) : 0, 10555612
section appsec
Agent [baseline] (1.16 s) : 0, 1160361
Total [baseline] (10.692 s) : 0, 10691613
Agent [candidate] (1.168 s) : 0, 1168125
Total [candidate] (10.747 s) : 0, 10746752
section iast
Agent [baseline] (1.15 s) : 0, 1149944
Total [baseline] (10.932 s) : 0, 10931546
Agent [candidate] (1.149 s) : 0, 1149195
Total [candidate] (10.895 s) : 0, 10894525
section profiling
Agent [baseline] (1.28 s) : 0, 1279989
Total [baseline] (10.939 s) : 0, 10938712
Agent [candidate] (1.273 s) : 0, 1272845
Total [candidate] (11.017 s) : 0, 11016508
gantt
title petclinic - break down per module: candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (691.362 ms) : 0, 691362
BytebuddyAgent [candidate] (683.091 ms) : 0, 683091
GlobalTracer [baseline] (242.187 ms) : 0, 242187
GlobalTracer [candidate] (240.605 ms) : 0, 240605
AppSec [baseline] (55.863 ms) : 0, 55863
AppSec [candidate] (54.76 ms) : 0, 54760
Debugger [baseline] (8.408 ms) : 0, 8408
Debugger [candidate] (9.758 ms) : 0, 9758
Remote Config [baseline] (704.053 µs) : 0, 704
Remote Config [candidate] (704.648 µs) : 0, 705
Telemetry [baseline] (9.097 ms) : 0, 9097
Telemetry [candidate] (9.899 ms) : 0, 9899
section appsec
BytebuddyAgent [baseline] (699.376 ms) : 0, 699376
BytebuddyAgent [candidate] (704.563 ms) : 0, 704563
GlobalTracer [baseline] (236.446 ms) : 0, 236446
GlobalTracer [candidate] (238.309 ms) : 0, 238309
AppSec [baseline] (176.243 ms) : 0, 176243
AppSec [candidate] (176.599 ms) : 0, 176599
Debugger [baseline] (5.949 ms) : 0, 5949
Debugger [candidate] (5.977 ms) : 0, 5977
Remote Config [baseline] (619.671 µs) : 0, 620
Remote Config [candidate] (622.787 µs) : 0, 623
Telemetry [baseline] (7.388 ms) : 0, 7388
Telemetry [candidate] (7.398 ms) : 0, 7398
IAST [baseline] (21.672 ms) : 0, 21672
IAST [candidate] (21.989 ms) : 0, 21989
section iast
BytebuddyAgent [baseline] (802.524 ms) : 0, 802524
BytebuddyAgent [candidate] (802.027 ms) : 0, 802027
GlobalTracer [baseline] (230.684 ms) : 0, 230684
GlobalTracer [candidate] (230.741 ms) : 0, 230741
AppSec [baseline] (52.025 ms) : 0, 52025
AppSec [candidate] (50.294 ms) : 0, 50294
Debugger [baseline] (5.921 ms) : 0, 5921
Debugger [candidate] (5.909 ms) : 0, 5909
Remote Config [baseline] (578.541 µs) : 0, 579
Remote Config [candidate] (590.604 µs) : 0, 591
Telemetry [baseline] (7.898 ms) : 0, 7898
Telemetry [candidate] (7.921 ms) : 0, 7921
IAST [baseline] (25.332 ms) : 0, 25332
IAST [candidate] (28.281 ms) : 0, 28281
section profiling
ProfilingAgent [baseline] (109.312 ms) : 0, 109312
ProfilingAgent [candidate] (104.42 ms) : 0, 104420
BytebuddyAgent [baseline] (673.096 ms) : 0, 673096
BytebuddyAgent [candidate] (678.153 ms) : 0, 678153
GlobalTracer [baseline] (377.782 ms) : 0, 377782
GlobalTracer [candidate] (361.502 ms) : 0, 361502
AppSec [baseline] (54.488 ms) : 0, 54488
AppSec [candidate] (62.427 ms) : 0, 62427
Debugger [baseline] (6.07 ms) : 0, 6070
Debugger [candidate] (6.336 ms) : 0, 6336
Remote Config [baseline] (657.496 µs) : 0, 657
Remote Config [candidate] (665.192 µs) : 0, 665
Telemetry [baseline] (8.092 ms) : 0, 8092
Telemetry [candidate] (8.161 ms) : 0, 8161
Profiling [baseline] (109.338 ms) : 0, 109338
Profiling [candidate] (104.444 ms) : 0, 104444
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 18 unstable metrics. Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section baseline
no_agent (1.364 ms) : 1345, 1383
. : milestone, 1364,
appsec (1.735 ms) : 1712, 1758
. : milestone, 1735,
appsec_no_iast (1.736 ms) : 1713, 1759
. : milestone, 1736,
code_origins (1.688 ms) : 1660, 1716
. : milestone, 1688,
iast (1.509 ms) : 1484, 1534
. : milestone, 1509,
profiling (1.515 ms) : 1492, 1538
. : milestone, 1515,
tracing (1.499 ms) : 1474, 1524
. : milestone, 1499,
section candidate
no_agent (1.366 ms) : 1345, 1387
. : milestone, 1366,
appsec (1.746 ms) : 1722, 1770
. : milestone, 1746,
appsec_no_iast (1.749 ms) : 1725, 1773
. : milestone, 1749,
code_origins (1.682 ms) : 1655, 1710
. : milestone, 1682,
iast (1.524 ms) : 1501, 1548
. : milestone, 1524,
profiling (1.527 ms) : 1503, 1551
. : milestone, 1527,
tracing (1.503 ms) : 1478, 1527
. : milestone, 1503,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section baseline
no_agent (387.482 µs) : 366, 409
. : milestone, 387,
iast (511.135 µs) : 490, 533
. : milestone, 511,
iast_FULL (735.18 µs) : 713, 757
. : milestone, 735,
iast_GLOBAL (575.735 µs) : 553, 598
. : milestone, 576,
iast_HARDCODED_SECRET_DISABLED (520.696 µs) : 497, 544
. : milestone, 521,
iast_INACTIVE (468.291 µs) : 445, 491
. : milestone, 468,
iast_TELEMETRY_OFF (509.639 µs) : 486, 533
. : milestone, 510,
tracing (459.806 µs) : 438, 482
. : milestone, 460,
section candidate
no_agent (380.089 µs) : 360, 400
. : milestone, 380,
iast (520.919 µs) : 499, 543
. : milestone, 521,
iast_FULL (735.729 µs) : 714, 758
. : milestone, 736,
iast_GLOBAL (566.253 µs) : 544, 588
. : milestone, 566,
iast_HARDCODED_SECRET_DISABLED (517.9 µs) : 495, 541
. : milestone, 518,
iast_INACTIVE (465.626 µs) : 444, 488
. : milestone, 466,
iast_TELEMETRY_OFF (523.053 µs) : 500, 547
. : milestone, 523,
tracing (457.671 µs) : 435, 480
. : milestone, 458,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 0 unstable metrics. Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section baseline
no_agent (15.473 s) : 15473000, 15473000
. : milestone, 15473000,
appsec (14.996 s) : 14996000, 14996000
. : milestone, 14996000,
iast (18.962 s) : 18962000, 18962000
. : milestone, 18962000,
iast_GLOBAL (17.808 s) : 17808000, 17808000
. : milestone, 17808000,
profiling (15.284 s) : 15284000, 15284000
. : milestone, 15284000,
tracing (15.053 s) : 15053000, 15053000
. : milestone, 15053000,
section candidate
no_agent (15.467 s) : 15467000, 15467000
. : milestone, 15467000,
appsec (14.711 s) : 14711000, 14711000
. : milestone, 14711000,
iast (19.132 s) : 19132000, 19132000
. : milestone, 19132000,
iast_GLOBAL (18.113 s) : 18113000, 18113000
. : milestone, 18113000,
profiling (14.991 s) : 14991000, 14991000
. : milestone, 14991000,
tracing (14.986 s) : 14986000, 14986000
. : milestone, 14986000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.50.0-SNAPSHOT~0dc90efdf1, baseline=1.50.0-SNAPSHOT~ad6d5fef42
dateFormat X
axisFormat %s
section baseline
no_agent (1.474 ms) : 1463, 1486
. : milestone, 1474,
appsec (2.392 ms) : 2344, 2440
. : milestone, 2392,
iast (2.165 ms) : 2105, 2225
. : milestone, 2165,
iast_GLOBAL (2.213 ms) : 2152, 2275
. : milestone, 2213,
profiling (2.045 ms) : 1995, 2096
. : milestone, 2045,
tracing (1.992 ms) : 1945, 2039
. : milestone, 1992,
section candidate
no_agent (1.474 ms) : 1463, 1486
. : milestone, 1474,
appsec (2.386 ms) : 2338, 2434
. : milestone, 2386,
iast (2.173 ms) : 2113, 2234
. : milestone, 2173,
iast_GLOBAL (2.21 ms) : 2149, 2271
. : milestone, 2210,
profiling (2.023 ms) : 1974, 2071
. : milestone, 2023,
tracing (2.003 ms) : 1956, 2050
. : milestone, 2003,
|
smola
requested review from
colin-higgins and
dougqh
and removed request for
a team
bric3
approved these changes
May 27, 2025
| .minus(files(sourceSets.test.scala.classesDirectory)) // exclude default /build/classes/scala/test folder | ||
| .plus(customSourceSet.output.classesDirs) // add /build/classes/scala/${version} folder | ||
| .plus(configuration) // add new scala-library configuration | ||
| .plus(classPathConfiguration) // add new scala-library configuration |
There was a problem hiding this comment.
nitpick: alignment
Suggested change
| .plus(classPathConfiguration) // add new scala-library configuration | |
| .plus(classPathConfiguration) // add new scala-library configuration |
| final javaConcatenation = major > 2 || minor > 11 // after 2.11 scala uses java.lang.StringBuilder to perform concatenation | ||
|
|
||
| final configuration = configurations.create("${version}Implementation") | ||
| final configuration = configurations.create("${version}Implementation") { |
There was a problem hiding this comment.
Maybe rename this for consistency with the new variable.
Suggested change
| final configuration = configurations.create("${version}Implementation") { | |
| final implementationConfiguration = configurations.create("${version}Implementation") { |
| distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419 | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip | ||
| distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip |
There was a problem hiding this comment.
question: Is there a reason to use the -all (which include sources), nowadays IDE can download the sources with the -bin distribution.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What Does This Do
Motivation
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any usefull labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]