3 files changed, 83 insertions(+), 43 deletions(-)
gnu/packages/sparrow.scm | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
guix/import/gradle.scm   |   5 ++++-
tests/import/gradle.scm  |   7 +++----

modified   gnu/packages/sparrow.scm
@@ -9,7 +9,7 @@ (define gradle-blob-annotations-13-0-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar")
+     "https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13.0.jar")
     (sha256 (base32 "0y0l26ys36zlrsw98335a7wc1cl894zc1jjyj8sgvmg2r06s3qmc"))
     (file-name "gradle-blob-annotations-13-0-jar")))
 
@@ -17,7 +17,7 @@ (define gradle-blob-annotations-13-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom")
+     "https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13.0.pom")
     (sha256 (base32 "15y3p0xicxjx6y38pj39vm3q56xqnfhgf6yyplcrhdpzxlmynnln"))
     (file-name "gradle-blob-annotations-13-0-pom")))
 
@@ -120,16 +120,14 @@ (define gradle-blob-argon2-jvm-nolibs-2-11-pom
 (define gradle-blob-asm-9-8-jar
   (origin
     (method url-fetch)
-    (uri
-     "https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.8/asm-9.8.jar")
+    (uri "https://plugins.gradle.org/m2/org/ow2/asm/asm/9.8/asm-9.8.jar")
     (sha256 (base32 "0l90a8bxxv49m6kzrwccxdd7pjb3n2mzrfbylrfavv6shdmanvl7"))
     (file-name "gradle-blob-asm-9-8-jar")))
 
 (define gradle-blob-asm-9-8-pom
   (origin
     (method url-fetch)
-    (uri
-     "https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.8/asm-9.8.pom")
+    (uri "https://plugins.gradle.org/m2/org/ow2/asm/asm/9.8/asm-9.8.pom")
     (sha256 (base32 "1ajvgdjj50pn11cppbh4xwp5z20kfpgkhzkrgyg63mw3ncxpqdn1"))
     (file-name "gradle-blob-asm-9-8-pom")))
 
@@ -433,7 +431,7 @@ (define gradle-blob-collections-0-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/immutable/collections/0.2.0/collections-0.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections/0.2.0/collections-0.2.0.module")
     (sha256 (base32 "0jlgbzllkz74swav0v3sxw095ispixikiz7rk0x8n6bh77plizhz"))
     (file-name "gradle-blob-collections-0-2-0-module")))
 
@@ -441,7 +439,7 @@ (define gradle-blob-collections-0-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/immutable/collections/0.2.0/collections-0.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections/0.2.0/collections-0.2.0.pom")
     (sha256 (base32 "1fln5f91gn8lq4vz2c9v8c1z4drkx9aqdbsysvacm8kzky8wz3yx"))
     (file-name "gradle-blob-collections-0-2-0-pom")))
 
@@ -449,7 +447,7 @@ (define gradle-blob-collections-jvm-0-2-0-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.jar")
+     "https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.jar")
     (sha256 (base32 "11rl2mljpz7gfbl0d1qyb3hcwb61bqvv0zb9kbyq8ziikixm63sd"))
     (file-name "gradle-blob-collections-jvm-0-2-0-jar")))
 
@@ -457,7 +455,7 @@ (define gradle-blob-collections-jvm-0-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.module")
     (sha256 (base32 "1xx97m8adjvrllwph8r5770wd7wywz8pmzqp007v2cfk1w5jgwra"))
     (file-name "gradle-blob-collections-jvm-0-2-0-module")))
 
@@ -465,7 +463,7 @@ (define gradle-blob-collections-jvm-0-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.pom")
     (sha256 (base32 "1nf73dy7z1qmdqq13hkn87p0xd1lzqlys7nyxv9zqszxmmhr3c5v"))
     (file-name "gradle-blob-collections-jvm-0-2-0-pom")))
 
@@ -473,7 +471,7 @@ (define gradle-blob-common-api-2-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-api/2.2.0/common-api-2.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api/2.2.0/common-api-2.2.0.module")
     (sha256 (base32 "1ksjy731943sk0glm86kjvn1zvyb33scir6894019zhp1q6ggb7m"))
     (file-name "gradle-blob-common-api-2-2-0-module")))
 
@@ -481,7 +479,7 @@ (define gradle-blob-common-api-2-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-api/2.2.0/common-api-2.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api/2.2.0/common-api-2.2.0.pom")
     (sha256 (base32 "0wb1hlw97msw4y8b0yb17m6nqwlig7j5salyamf34smmw6j8myb5"))
     (file-name "gradle-blob-common-api-2-2-0-pom")))
 
@@ -489,7 +487,7 @@ (define gradle-blob-common-api-jvm-2-2-0-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.jar")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.jar")
     (sha256 (base32 "0srl0n16am8m8pvnz5izn6rv2ymzln2s7bd616759l00r3vzg70x"))
     (file-name "gradle-blob-common-api-jvm-2-2-0-jar")))
 
@@ -497,7 +495,7 @@ (define gradle-blob-common-api-jvm-2-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.module")
     (sha256 (base32 "0bzazxqm14yyyhnic7p8args2nal5dvbyr0sa1qxf8rzkysf60si"))
     (file-name "gradle-blob-common-api-jvm-2-2-0-module")))
 
@@ -505,7 +503,7 @@ (define gradle-blob-common-api-jvm-2-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.pom")
     (sha256 (base32 "1izn2y6g0ps0w8ylk47vkx3r35wg1s055dbbgl17lc5cxqjfd4gm"))
     (file-name "gradle-blob-common-api-jvm-2-2-0-pom")))
 
@@ -513,7 +511,7 @@ (define gradle-blob-common-core-2-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-core/2.2.0/common-core-2.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core/2.2.0/common-core-2.2.0.module")
     (sha256 (base32 "11j3h6wxj58ncxnj3nifcbl059vdl3p8c2jmagslbimf1k3inmah"))
     (file-name "gradle-blob-common-core-2-2-0-module")))
 
@@ -521,7 +519,7 @@ (define gradle-blob-common-core-2-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-core/2.2.0/common-core-2.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core/2.2.0/common-core-2.2.0.pom")
     (sha256 (base32 "04lf66kv2nr1b6didfyrjbnwnd78zma862mrabq35laasi4db4rr"))
     (file-name "gradle-blob-common-core-2-2-0-pom")))
 
@@ -529,7 +527,7 @@ (define gradle-blob-common-core-jvm-2-2-0-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.jar")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.jar")
     (sha256 (base32 "1mwbqq5bbpqw92kxp7x1l37c2688yjy3mwsw6k8714i18da0pvk6"))
     (file-name "gradle-blob-common-core-jvm-2-2-0-jar")))
 
@@ -537,7 +535,7 @@ (define gradle-blob-common-core-jvm-2-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.module")
     (sha256 (base32 "1v500mlwrm6df0ykn8wpm577dalzyk8grqh8pk2kwp2qsfcz43ab"))
     (file-name "gradle-blob-common-core-jvm-2-2-0-module")))
 
@@ -545,7 +543,7 @@ (define gradle-blob-common-core-jvm-2-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.pom")
     (sha256 (base32 "17xw54hi0lq196s7ji0vln5xx2hnx2hay7kx0gj2bp2vzhl5wb2r"))
     (file-name "gradle-blob-common-core-jvm-2-2-0-pom")))
 
@@ -985,7 +983,7 @@ (define gradle-blob-file-0-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-file/file/0.2.0/file-0.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file/0.2.0/file-0.2.0.module")
     (sha256 (base32 "1rsgpv4lrgpbvz5v0msqa0y0x8zvrwf49h0fxd1905mvy4wfgh33"))
     (file-name "gradle-blob-file-0-2-0-module")))
 
@@ -993,7 +991,7 @@ (define gradle-blob-file-0-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-file/file/0.2.0/file-0.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file/0.2.0/file-0.2.0.pom")
     (sha256 (base32 "1z3gpxsr096vsla85d71wqvpqbymjypcnfn7777104s2snkci0zi"))
     (file-name "gradle-blob-file-0-2-0-pom")))
 
@@ -1001,7 +999,7 @@ (define gradle-blob-file-jvm-0-2-0-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.jar")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.jar")
     (sha256 (base32 "014w62j6m9ls58xzhdny73xgckqci93imidnggrbwccx0cyb8v6r"))
     (file-name "gradle-blob-file-jvm-0-2-0-jar")))
 
@@ -1009,7 +1007,7 @@ (define gradle-blob-file-jvm-0-2-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.module")
     (sha256 (base32 "0v7cicwc6hzawxkl5rydbv7wh5h07f86lwr44f5y9a88kaf4ljl5"))
     (file-name "gradle-blob-file-jvm-0-2-0-module")))
 
@@ -1017,7 +1015,7 @@ (define gradle-blob-file-jvm-0-2-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.pom")
     (sha256 (base32 "1m7hxq3bz8svlg4v8h854qfg4mhb0wkwg6f02wa976zspa0wqp02"))
     (file-name "gradle-blob-file-jvm-0-2-0-pom")))
 
@@ -1105,7 +1103,7 @@ (define gradle-blob-gradle-filterjar-plugin-0-1-0-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.jar")
+     "https://plugins.gradle.org/m2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.jar")
     (sha256 (base32 "0smhh2qvrqs177p805qz756pv1723wha26cpr8ysrq0vyrn2dlc5"))
     (file-name "gradle-blob-gradle-filterjar-plugin-0-1-0-jar")))
 
@@ -1113,7 +1111,7 @@ (define gradle-blob-gradle-filterjar-plugin-0-1-0-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.module")
     (sha256 (base32 "13vabxd5qdvif3iincikizdmg5bniy9g0z7x95x37qlmy7jc8z4x"))
     (file-name "gradle-blob-gradle-filterjar-plugin-0-1-0-module")))
 
@@ -1121,7 +1119,7 @@ (define gradle-blob-gradle-filterjar-plugin-0-1-0-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.pom")
     (sha256 (base32 "0pkjc06cbhlm5ayjg1fq9m9l3ldbdn1gvv56wscc3nkq1k3ha8nk"))
     (file-name "gradle-blob-gradle-filterjar-plugin-0-1-0-pom")))
 
@@ -1306,7 +1304,7 @@ (define gradle-blob-io-matthewnelson-kmp-tor-resource-filterjar-gradle-plugin-40
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp/tor/resource-filterjar/io.matthewnelson.kmp.tor.resource-filterjar.gradle.plugin/408.16.3/io.matthewnelson.kmp.tor.resource-filterjar.gradle.plugin-408.16.3.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp/tor/resource-filterjar/io.matthewnelson.kmp.tor.resource-filterjar.gradle.plugin/408.16.3/io.matthewnelson.kmp.tor.resource-filterjar.gradle.plugin-408.16.3.pom")
     (sha256 (base32 "1wxv4rvxyfxr7as4bcsdkzfaz3qrf7ah2r3rh5xrb61kz339m0x8"))
     (file-name
      "gradle-blob-io-matthewnelson-kmp-tor-resource-filterjar-gradle-plugin-408-16-3-pom")))
@@ -2219,7 +2217,7 @@ (define gradle-blob-kotlin-stdlib-2-1-10-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.jar")
+     "https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.jar")
     (sha256 (base32 "088wbdj8y2lxd4r1s63mg8ig1sv9d79idrql8czpmcy8ip5c2ajz"))
     (file-name "gradle-blob-kotlin-stdlib-2-1-10-jar")))
 
@@ -2227,7 +2225,7 @@ (define gradle-blob-kotlin-stdlib-2-1-10-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.module")
+     "https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.module")
     (sha256 (base32 "1384rd2cwjlk30w2cwh1jicp36mma236q4rd71b6sm3kgiqisb4d"))
     (file-name "gradle-blob-kotlin-stdlib-2-1-10-module")))
 
@@ -2235,7 +2233,7 @@ (define gradle-blob-kotlin-stdlib-2-1-10-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.pom")
+     "https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.pom")
     (sha256 (base32 "1vs9y8hmg0xn10aks32xwya7w2ras11dwwpk0zj0rihb7wfi48j9"))
     (file-name "gradle-blob-kotlin-stdlib-2-1-10-pom")))
 
@@ -2605,8 +2603,7 @@ (define gradle-blob-oss-parent-9-pom
 (define gradle-blob-ow2-1-5-1-pom
   (origin
     (method url-fetch)
-    (uri
-     "https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom")
+    (uri "https://plugins.gradle.org/m2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom")
     (sha256 (base32 "01fgb949y6rn7dv1y71r8bx6nk8mfkdxck3bx8yzbr3gxsvxn79j"))
     (file-name "gradle-blob-ow2-1-5-1-pom")))
 
@@ -2774,7 +2771,7 @@ (define gradle-blob-resource-filterjar-gradle-plugin-408-16-3-jar
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.jar")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.jar")
     (sha256 (base32 "15wr12f95p5ha91cb81rpvx2a9j26npy6r4zyymdip3z23xi9mzi"))
     (file-name "gradle-blob-resource-filterjar-gradle-plugin-408-16-3-jar")))
 
@@ -2782,7 +2779,7 @@ (define gradle-blob-resource-filterjar-gradle-plugin-408-16-3-module
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.module")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.module")
     (sha256 (base32 "1qv32366r7rxa9jll5wgaknzgakk44bl1xkawmnxljx7z70ppcmc"))
     (file-name "gradle-blob-resource-filterjar-gradle-plugin-408-16-3-module")))
 
@@ -2790,7 +2787,7 @@ (define gradle-blob-resource-filterjar-gradle-plugin-408-16-3-pom
   (origin
     (method url-fetch)
     (uri
-     "https://repo.maven.apache.org/maven2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.pom")
+     "https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.pom")
     (sha256 (base32 "181fz837l9y06xvdszm0q49s940qnskh30q1x1axkigyy1vr1y19"))
     (file-name "gradle-blob-resource-filterjar-gradle-plugin-408-16-3-pom")))
 
@@ -3414,8 +3411,49 @@ (define-public sparrow
        ("https://plugins-artifacts.gradle.org/org.gradlex/extra-java-module-info/1.13/108a87b127d3a1a99e59d1e6104a3e91d0b1ff969618cfb5b39e3e27f1feaf6d/extra-java-module-info-1.13.jar" ,gradle-blob-extra-java-module-info-1-13-jar)
        ("https://plugins-artifacts.gradle.org/org.gradlex/extra-java-module-info/1.13/b1832e7b7eb23f8d5adf62c791772e3e9fc88483149ca8dde5021bb103d4425a/extra-java-module-info-1.13.pom" ,gradle-blob-extra-java-module-info-1-13-pom)
        ("https://plugins-artifacts.gradle.org/org.gradlex/extra-java-module-info/1.13/d644f45cde68374d37fa93618495992ba6411f2245864964e745651e97df2611/extra-java-module-info-1.13.module" ,gradle-blob-extra-java-module-info-1-13-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.jar" ,gradle-blob-gradle-filterjar-plugin-0-1-0-jar)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.module" ,gradle-blob-gradle-filterjar-plugin-0-1-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/gradle-filterjar-plugin/0.1.0/gradle-filterjar-plugin-0.1.0.pom" ,gradle-blob-gradle-filterjar-plugin-0-1-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.jar" ,gradle-blob-collections-jvm-0-2-0-jar)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.module" ,gradle-blob-collections-jvm-0-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections-jvm/0.2.0/collections-jvm-0.2.0.pom" ,gradle-blob-collections-jvm-0-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections/0.2.0/collections-0.2.0.module" ,gradle-blob-collections-0-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/immutable/collections/0.2.0/collections-0.2.0.pom" ,gradle-blob-collections-0-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.jar" ,gradle-blob-file-jvm-0-2-0-jar)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.module" ,gradle-blob-file-jvm-0-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file-jvm/0.2.0/file-jvm-0.2.0.pom" ,gradle-blob-file-jvm-0-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file/0.2.0/file-0.2.0.module" ,gradle-blob-file-0-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-file/file/0.2.0/file-0.2.0.pom" ,gradle-blob-file-0-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.jar" ,gradle-blob-common-api-jvm-2-2-0-jar)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.module" ,gradle-blob-common-api-jvm-2-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api-jvm/2.2.0/common-api-jvm-2.2.0.pom" ,gradle-blob-common-api-jvm-2-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api/2.2.0/common-api-2.2.0.module" ,gradle-blob-common-api-2-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-api/2.2.0/common-api-2.2.0.pom" ,gradle-blob-common-api-2-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.jar" ,gradle-blob-common-core-jvm-2-2-0-jar)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.module" ,gradle-blob-common-core-jvm-2-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core-jvm/2.2.0/common-core-jvm-2.2.0.pom" ,gradle-blob-common-core-jvm-2-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core/2.2.0/common-core-2.2.0.module" ,gradle-blob-common-core-2-2-0-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/common-core/2.2.0/common-core-2.2.0.pom" ,gradle-blob-common-core-2-2-0-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.jar" ,gradle-blob-resource-filterjar-gradle-plugin-408-16-3-jar)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.module" ,gradle-blob-resource-filterjar-gradle-plugin-408-16-3-module)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp-tor/resource-filterjar-gradle-plugin/408.16.3/resource-filterjar-gradle-plugin-408.16.3.pom" ,gradle-blob-resource-filterjar-gradle-plugin-408-16-3-pom)
+       ("https://plugins.gradle.org/m2/io/matthewnelson/kmp/tor/resource-filterjar/io.matthewnelson.kmp.tor.resource-filterjar.gradle.plugin/408.16.3/io.matthewnelson.kmp.tor.resource-filterjar.gradle.plugin-408.16.3.pom" ,gradle-blob-io-matthewnelson-kmp-tor-resource-filterjar-gradle-plugin-408-16-3-pom)
+       ("https://plugins.gradle.org/m2/org/beryx/badass-jlink-plugin/3.1.3/badass-jlink-plugin-3.1.3.jar" ,gradle-blob-badass-jlink-plugin-3-1-3-jar)
+       ("https://plugins.gradle.org/m2/org/beryx/badass-jlink-plugin/3.1.3/badass-jlink-plugin-3.1.3.module" ,gradle-blob-badass-jlink-plugin-3-1-3-module)
+       ("https://plugins.gradle.org/m2/org/beryx/badass-jlink-plugin/3.1.3/badass-jlink-plugin-3.1.3.pom" ,gradle-blob-badass-jlink-plugin-3-1-3-pom)
        ("https://plugins.gradle.org/m2/org/beryx/jlink/org.beryx.jlink.gradle.plugin/3.1.3/org.beryx.jlink.gradle.plugin-3.1.3.pom" ,gradle-blob-org-beryx-jlink-gradle-plugin-3-1-3-pom)
+       ("https://plugins.gradle.org/m2/org/gradlex/extra-java-module-info/1.13/extra-java-module-info-1.13.jar" ,gradle-blob-extra-java-module-info-1-13-jar)
+       ("https://plugins.gradle.org/m2/org/gradlex/extra-java-module-info/1.13/extra-java-module-info-1.13.module" ,gradle-blob-extra-java-module-info-1-13-module)
+       ("https://plugins.gradle.org/m2/org/gradlex/extra-java-module-info/1.13/extra-java-module-info-1.13.pom" ,gradle-blob-extra-java-module-info-1-13-pom)
        ("https://plugins.gradle.org/m2/org/gradlex/extra-java-module-info/org.gradlex.extra-java-module-info.gradle.plugin/1.13/org.gradlex.extra-java-module-info.gradle.plugin-1.13.pom" ,gradle-blob-org-gradlex-extra-java-module-info-gradle-plugin-1-13-pom)
+       ("https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13.0.jar" ,gradle-blob-annotations-13-0-jar)
+       ("https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13.0.pom" ,gradle-blob-annotations-13-0-pom)
+       ("https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.jar" ,gradle-blob-kotlin-stdlib-2-1-10-jar)
+       ("https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.module" ,gradle-blob-kotlin-stdlib-2-1-10-module)
+       ("https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/2.1.10/kotlin-stdlib-2.1.10.pom" ,gradle-blob-kotlin-stdlib-2-1-10-pom)
+       ("https://plugins.gradle.org/m2/org/ow2/asm/asm/9.8/asm-9.8.jar" ,gradle-blob-asm-9-8-jar)
+       ("https://plugins.gradle.org/m2/org/ow2/asm/asm/9.8/asm-9.8.pom" ,gradle-blob-asm-9-8-pom)
+       ("https://plugins.gradle.org/m2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom" ,gradle-blob-ow2-1-5-1-pom)
        ("https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.5.18/logback-classic-1.5.18.jar" ,gradle-blob-logback-classic-1-5-18-jar)
        ("https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.5.18/logback-classic-1.5.18.pom" ,gradle-blob-logback-classic-1-5-18-pom)
        ("https://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.5.18/logback-core-1.5.18.jar" ,gradle-blob-logback-core-1-5-18-jar)
modified   guix/import/gradle.scm
@@ -38,6 +38,7 @@ (define-module (guix import gradle)
   #:use-module ((nongnu packages gradle) #:select (gradle))
   #:use-module (rnrs bytevectors)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-71)
   #:export (cache.json->entries
@@ -177,7 +178,9 @@ (define (cache.json->entries file)
        (cons url (sha256->nix-base32-hash hash)))
       (((? string? url) ("redirect" . (? string? redirect-url)))
        ;; Recurse to resolve redirect entries, if they exist.
-       (and=> (assoc redirect-url cache) parse-item))
+       (and-let* ((resolved-entry (and=> (assoc redirect-url cache)
+                                         parse-item)))
+         (cons url (cdr resolved-entry))))
       (other (error "unexpected entry" other))))
 
   (sort (delete-duplicates (filter-map parse-item cache)
modified   tests/import/gradle.scm
@@ -63,7 +63,7 @@ (define cache-entries '())
 (test-begin "gradle")
 
 (test-equal "cache.json is parsed correctly"
-  4
+  5                                     ;unresolved redirects are dropped
   (begin
     (set! cache-entries (call-with-input-string cache.json
                           cache.json->entries))
@@ -80,9 +80,8 @@ (define cache-entries '())
   (sha256->nix-base32-hash
    "sha256-EIqHsSfToameWdHmEEo+kdCx/5aWGM+1s54+J/H+r20=")
   (assoc-ref cache-entries
-             "https://plugins-artifacts.gradle.org/org.gradlex/\
-extra-java-module-info/1.13/108a87b127d3a1a99e59d1e6104a3e91d0b1f\
-f969618cfb5b39e3e27f1feaf6d/extra-java-module-info-1.13.jar"))
+             "https://plugins.gradle.org/m2/org/gradlex/extra-java-module-info/\
+1.13/extra-java-module-info-1.13.jar"))
 
 (test-assert "gradle-project-url->sexps"
   (mock* (((guix import utils) download-git-repository

[back]