gradle: 8.10.2 -> 8.12 #356109

liff · 2024-11-15T08:58:16Z

Turns out the update script couldn’t deal with an update to .0. Even though the tag is v8.11.0 the actual version number is 8.11.

Fixes #355951.

Incorporates changes from #364871.

Things done

Add a 👍 reaction to pull requests you find important.

liff · 2024-11-15T09:09:38Z

pkgs/development/tools/build-managers/gradle/default.nix

+            # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
+            # release version omits the `.0`, so we’ll wanto to only capture
+            # the version up but not including the the trailing `.0`.
+            "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"


Right now this’ll cause nix-update to crash, but I’ll open an issue.

Mic92/nix-update#297

I'm not sure how to feel about including this flag while it's broken in upstream nix-update. Maybe we should comment it out and/or add it once it's fixed upstream?

Sure, commented out.

The nix-update issue got fixed in the meantime, so restored the flag.

FliegendeWurst · 2024-11-17T13:06:58Z

jadx fails to build (succeeds on master)

FAILURE: Build failed with an exception.

* Where:
Build file '/build/source/buildSrc/build.gradle.kts' line: 1

* What went wrong:
Plugin [id: 'org.gradle.kotlin.kotlin-dsl', version: '5.1.1'] was not found in any of the following sources:

liff · 2024-11-17T15:12:57Z

@FliegendeWurst thanks. It looks like since the MITM cache in #272380 we (may) have to run dependency update for Gradle-built packages.

I’ll run the updates and add refreshed deps.json for packages that need it.

chayleaf · 2024-11-18T00:01:09Z

Each version of Gradle bundles different versions of various embedded stuff. There's not too much documentation on this, but from what I can tell the Kotlin DSL version is set here. It's further used here in code generation. Then, at build time, if the version doesn't match the hardcoded version, it may issue a warning here, but I don't see why it can't be overridden in theory.

Since this hardcoded version is likely possible to override, it's also possible to extend the Gradle build scripts to look for whatever Kotlin DSL plugin is in the cache and use that. Howver, Gradle docs say:

Each Gradle release is meant to be used with a specific version of the kotlin-dsl plugin and compatibility between arbitrary Gradle releases and kotlin-dsl plugin versions is not guaranteed. Using an unexpected version of the kotlin-dsl plugin in a build will emit a warning and can cause hard to diagnose problems.

I don't actually think the old FOD-style derivations would've avoided this issue, it seems unrelated to mitm-cache, but maybe Gradle has some weird logic where if a repo is local it uses whatever version is available instead of whatever version is set.

tomodachi94 · 2024-11-26T03:16:59Z

Result of nixpkgs-review pr 356109 run on aarch64-linux 1

1 package marked as broken and skipped:

jextract

5 packages failed to build:

atlauncher
gscan2pdf
gscan2pdf.man
mindustry
mindustry-wayland

49 packages built:

apkeditor
apkleaks
apkleaks.dist
apksigcopier
apksigcopier.dist
apksigner
armitage
cie-middleware-linux
diffoscope
diffoscope.dist
diffoscope.man
experienced-pixel-dungeon
fdroidserver
fdroidserver.dist
garble
ghidra
ghidra-extensions.findcrypt
ghidra-extensions.ghidra-delinker-extension
ghidra-extensions.ghidra-golanganalyzerextension
ghidra-extensions.gnudisassembler
ghidra-extensions.lightkeeper
ghidra-extensions.machinelearning
ghidra-extensions.ret-sync
ghidra-extensions.sleighdevtools
gotenberg
gradle (gradle_8)
gradle-unwrapped (gradle_8-unwrapped)
jabref
jadx
openjfx23 (javaPackages.openjfx23)
jextract-21
key
kotlin-language-server
libeufin
mindustry-server
moneydance
mucommander
nextflow
nf-test
pdfchain
pdftk
pidginPackages.purple-signald
rat-king-adventure
rkpd2
shattered-pixel-dungeon
shorter-pixel-dungeon
signald
signaturepdf
summoning-pixel-dungeon

tomodachi94 · 2024-11-26T04:03:17Z

All of those build failures are already known:

britter · 2025-01-15T15:32:01Z

I've build and linked the gradle package from this PR locally and verified I can build projects, so from that PoV this change is good. I've also noticed that this upgrade fixes gradle/gradle#32006, so we should merge it rather sooner than later. In order to fix the console issue above I had to remove $GRADLE_HOME/native so that is was rebuild. I'm not sure if that will be required for everybody once this PR is merged. if so, it should be documented somewhere.

katexochen · 2025-01-16T09:20:07Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 356109

`x86_64-linux`

⏩ 1 package marked as broken and skipped:

jextract

❌ 12 packages failed to build:

ghidra
ghidra-extensions.findcrypt
ghidra-extensions.ghidra-delinker-extension
ghidra-extensions.ghidra-golanganalyzerextension
ghidra-extensions.gnudisassembler
ghidra-extensions.lightkeeper
ghidra-extensions.machinelearning
ghidra-extensions.ret-sync
ghidra-extensions.sleighdevtools
ghidra-extensions.wasm
gotenberg
pidginPackages.purple-signald

✅ 89 packages built:

anyk
apkeditor
apkleaks
apkleaks.dist
apksigcopier
apksigcopier.dist
apksigner
armitage
atlauncher
autopsy
bisq2
bluej
cie-middleware-linux
corretto11
corretto11.debug
corretto17
corretto17.debug
corretto21
corretto21.debug
cryptomator
diffoscope
diffoscope.dist
diffoscope.man
experienced-pixel-dungeon
fastddsgen
fdroidserver
fdroidserver.dist
freenet
freeplane
ganttproject-bin
garble
gradle (gradle_8)
gradle-unwrapped (gradle_8-unwrapped)
gradle_7
gradle_7-unwrapped
greenfoot
gscan2pdf
gscan2pdf.man
jabref
jadx
java-hamcrest
openjfx (javaPackages.openjfx17 ,openjfx17)
openjfx21 (javaPackages.openjfx21)
openjfx23 (javaPackages.openjfx23)
jextract-21
json2cdn
key
keyboard-layout-editor
keyguard
keyspersecond
kotlin-language-server
libeufin
maptool
marytts
mcaselector
microsoft-identity-broker
mindustry
mindustry-server
mindustry-wayland
minion
moneydance
mucommander
nextflow
nf-test
ns-usbloader
olvid
pattypan
pdfchain
pdfsam-basic
pdftk
quake-injector
quark-goldleaf
rat-king-adventure
rkpd2
scenebuilder
scenic-view
shattered-pixel-dungeon
shorter-pixel-dungeon
signald
signaturepdf
slimevr
slimevr-server
sparrow
sparrow-unwrapped
sportstracker
stirling-pdf
summoning-pixel-dungeon
tests.pkgs-lib
tower-pixel-dungeon

katexochen · 2025-01-16T09:28:13Z

pidginPackages.purple-signald is broken on main, gotenberg builds fine (multiple times), looks like a flaky test.

britter · 2025-01-16T12:00:13Z

gotenberg does not depend on gradle. It's Go application:

nixpkgs/pkgs/by-name/go/gotenberg/package.nix

Line 1 in eb62e6a

{

So I think we're fine to merge this.

britter · 2025-01-16T12:09:35Z

Forget what I said, gotenberg depends on gradle transitively via pdftk.

britter · 2025-01-16T12:44:47Z

I built pdftk and gotenberg both on my machine without problems.

nixpkgs-ci · 2025-01-16T12:57:59Z

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-356109-to-release-24.11 origin/release-24.11
cd .worktree/backport-356109-to-release-24.11
git switch --create backport-356109-to-release-24.11
git cherry-pick -x 9ca9394a64f76ec0eedb37ba20407a6e78afe23d 6082098609b0c9ef65939c5e64523043a69a7947 29503f955b8e94ce97824a20192484eb10e6f1ff 779b6255fd6e477290b9bd3e3956bfe79d60d7a9 cd6a44e1b73455c5abe91482e57e10609853c904 a3b161e1f6aef25df3ae51a5f9eee8fc338fd011 eb43df3e281f05d50107e5771a3b1ddc47bb62e6 f26a825e8bba322f0862e2cd4c6f86d548637e97 abf3eaf9337a04b5cadd960fa9f9936b43123b76

britter · 2025-01-16T12:59:41Z

@FliegendeWurst I suspect the backport failed because this PR included a reformat commit.

liff commented Nov 15, 2024

View reviewed changes

liff mentioned this pull request Nov 15, 2024

Failure to run the update when using --version-regex and a package without rev in the source Mic92/nix-update#297

Closed

ofborg bot requested review from Infinidoge, lorenzleutgeb, chayleaf, tomodachi94 and FliegendeWurst November 15, 2024 18:56

ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Nov 15, 2024

liff force-pushed the gradle/v8.11 branch from f40fecc to dac91d2 Compare November 17, 2024 21:00

liff force-pushed the gradle/v8.11 branch from dac91d2 to cdde5cf Compare November 20, 2024 18:51

liff changed the title ~~gradle: 8.10.2 -> 8.11~~ gradle: 8.10.2 -> 8.11.1 Nov 20, 2024

FliegendeWurst approved these changes Nov 24, 2024

View reviewed changes

wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 25, 2024

liff force-pushed the gradle/v8.11 branch from cdde5cf to ef09fba Compare December 10, 2024 11:10

github-actions bot added the 6.topic: java Including JDK, tooling, other languages, other VMs label Dec 10, 2024

wegank removed 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Dec 10, 2024

liff force-pushed the gradle/v8.11 branch from ef09fba to b9720d7 Compare December 10, 2024 20:11

ofborg bot requested a review from FliegendeWurst December 11, 2024 16:09

msfjarvis mentioned this pull request Dec 13, 2024

gradle: add support for the new file events library #364871

Closed

13 tasks

liff force-pushed the gradle/v8.11 branch from b9720d7 to e75b1fe Compare December 23, 2024 09:33

liff changed the title ~~gradle: 8.10.2 -> 8.11.1~~ gradle: 8.10.2 -> 8.12 Dec 23, 2024

britter mentioned this pull request Jan 15, 2025

Console output defaults to plain on Linux starting with Gradle 8.12 gradle/gradle#32006

Closed

liff and others added 9 commits January 16, 2025 12:33

gradle: reformat default.nix

9ca9394

gradle: remove old update script

6082098

gradle: handle updates to .0 versions

29503f9

gradle: remove unused jdk11 argument

779b625

gradle: add support for the new file-events library format

cd6a44e

gradle: 8.10.2 -> 8.12

a3b161e

jadx: update gradle plugin dependencies

eb43df3

keyguard: update gradle plugin dependencies

f26a825

slimevr-server: update gradle plugin dependencies

abf3eaf

liff force-pushed the gradle/v8.11 branch from c47c317 to abf3eaf Compare January 16, 2025 10:34

github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 11-100 labels Jan 16, 2025

nix-owners bot requested a review from britter January 16, 2025 10:44

britter approved these changes Jan 16, 2025

View reviewed changes

katexochen merged commit 44c6d23 into NixOS:master Jan 16, 2025
24 of 27 checks passed

britter added the backport release-24.11 Backport PR automatically label Jan 16, 2025

FliegendeWurst added backport release-24.11 Backport PR automatically and removed backport release-24.11 Backport PR automatically labels Jan 16, 2025

This comment was marked as off-topic.

Sign in to view

jchv mentioned this pull request Jan 18, 2025

Build failure: ghidra #374703

Closed

3 tasks

liff deleted the gradle/v8.11 branch January 22, 2025 08:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gradle: 8.10.2 -> 8.12 #356109

gradle: 8.10.2 -> 8.12 #356109

liff commented Nov 15, 2024 •

edited

Loading

liff Nov 15, 2024

liff Nov 15, 2024

tomodachi94 Nov 26, 2024

liff Dec 10, 2024

liff Jan 5, 2025

FliegendeWurst commented Nov 17, 2024

liff commented Nov 17, 2024

chayleaf commented Nov 18, 2024 •

edited

Loading

tomodachi94 commented Nov 26, 2024

tomodachi94 commented Nov 26, 2024 •

edited

Loading

britter commented Jan 15, 2025

katexochen commented Jan 16, 2025

katexochen commented Jan 16, 2025

britter commented Jan 16, 2025

britter commented Jan 16, 2025

britter commented Jan 16, 2025

nixpkgs-ci bot commented Jan 16, 2025

britter commented Jan 16, 2025

This comment was marked as off-topic.

gradle: 8.10.2 -> 8.12 #356109

gradle: 8.10.2 -> 8.12 #356109

Conversation

liff commented Nov 15, 2024 • edited Loading

Things done

liff Nov 15, 2024

Choose a reason for hiding this comment

liff Nov 15, 2024

Choose a reason for hiding this comment

tomodachi94 Nov 26, 2024

Choose a reason for hiding this comment

liff Dec 10, 2024

Choose a reason for hiding this comment

liff Jan 5, 2025

Choose a reason for hiding this comment

FliegendeWurst commented Nov 17, 2024

liff commented Nov 17, 2024

chayleaf commented Nov 18, 2024 • edited Loading

tomodachi94 commented Nov 26, 2024

tomodachi94 commented Nov 26, 2024 • edited Loading

britter commented Jan 15, 2025

katexochen commented Jan 16, 2025

nixpkgs-review result

x86_64-linux

katexochen commented Jan 16, 2025

britter commented Jan 16, 2025

britter commented Jan 16, 2025

britter commented Jan 16, 2025

nixpkgs-ci bot commented Jan 16, 2025

britter commented Jan 16, 2025

This comment was marked as off-topic.

liff commented Nov 15, 2024 •

edited

Loading

chayleaf commented Nov 18, 2024 •

edited

Loading

tomodachi94 commented Nov 26, 2024 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`