amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java-guava: Update to 31.1.

Browse source 
* gnu/packages/patches/java-guava-remove-annotation-deps.patch: New
  file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/java.scm (java-guava): Update to 31.1.
[source]: Use patch.
(java-guava-futures-failureaccess): New variable.
* gnu/packages/bioinformatics.scm (java-picard, java-picard-2.10.3): Fix for
  newer guava.
* gnu/packages/maven.scm (maven): Add java-guava-futures-failureaccess.

Change-Id: Id2553c48e11c6001fb45a0589720cef1551804d9
This commit is contained in:
Julien Lepiller 2023-02-25 21:30:29 +01:00
parent f1ed3d4699
commit 7ce7464934
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
5 changed files with 78 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/java.scm
View file

@ -6249,8 +6249,7 @@ used by programmers to guide the static analysis.")
(define-public java-guava
(package
(name "java-guava")
;; This is the last release of Guava that can be built with Java 7.
(version "20.0")
(version "31.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6259,7 +6258,9 @@ used by programmers to guide the static analysis.")
(file-name (git-file-name name version))
(sha256
(base32
"00h5cawdjic1vind3yivzh1f58flvm1yfmhsyqwyvmbvj1vakysp"))))
"0sv1w5cnids9ad3l7qhrh3dh1wdqwc946iinsxryafr25wg5z1lp"))
(patches
(search-patches "java-guava-remove-annotation-deps.patch"))))
(build-system ant-build-system)
(arguments
`(#:tests? #f ; no tests included
@ -6273,27 +6274,26 @@ used by programmers to guide the static analysis.")
;; Remove annotations to avoid extra dependencies:
;; * "j2objc" annotations are used when converting Java to
;; Objective C;
;; * "errorprone" annotations catch common Java mistakes at
;; compile time;
;; * "IgnoreJRERequirement" is used for Android.
;; * "Nullable" is used to catch NPE at build time.
(substitute* (find-files "." "\\.java$")
(("import com.google.j2objc.*") "")
(("import com.google.errorprone.annotation.*") "")
(("import org.codehaus.mojo.animal_sniffer.*") "")
(("@CanIgnoreReturnValue") "")
(("@LazyInit") "")
(("import org.checkerframework.checker.*") "")
(("@ReflectionSupport.*") "")
(("@WeakOuter") "")
(("@RetainedWith") "")
(("@Weak") "")
(("@ForOverride") "")
(("@J2ObjCIncompatible") "")
(("@IgnoreJRERequirement") "")))
#t))
(("@IgnoreJRERequirement") "")
(("@Nullable") "")))))
;; This is required by guava, but this is just an empty stub
(add-before 'install 'install-listenablefuture-stub
(install-pom-file "futures/listenablefuture9999/pom.xml"))
(replace 'install (install-from-pom "guava/pom.xml")))))
(inputs
(list java-jsr305))
(list java-error-prone-annotations java-jsr305))
(propagated-inputs
(list java-guava-parent-pom))
(list java-guava-futures-failureaccess java-guava-parent-pom))
(home-page "https://github.com/google/guava")
(synopsis "Google core libraries for Java")
(description "Guava is a set of core libraries that includes new
@ -6303,6 +6303,21 @@ concurrency, I/O, hashing, primitives, reflection, string processing, and much
more!")
(license license:asl2.0)))
(define-public java-guava-futures-failureaccess
(package
(inherit java-guava)
(name "java-guava-futures-failureaccess")
(arguments
`(#:tests? #f; no tests
#:jar-name "guava-futures-failureaccess.jar"
#:source-dir "futures/failureaccess/src"
#:phases
(modify-phases %standard-phases
(replace 'install
(install-from-pom "futures/failureaccess/pom.xml")))))
(propagated-inputs
`(("java-sonatype-oss-parent-pom" ,java-sonatype-oss-parent-pom-7)))))
(define java-guava-parent-pom
(package
(inherit java-guava)