pool/guava
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/guava?expand=0&rev=42

Browse Source
This commit is contained in:
Fridrich Strba
2025-05-01 12:06:38 +00:00
committed by Git OBS Bridge
parent c65f5dcea1
commit 86f6811f26
2 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
guava-modules-fix.patch
View File

@@ -1,26 +1,11 @@
--- guava-33.4.8/guava/src/module-info.java 2025-05-01 08:51:02.371894486 +0200
+++ guava-33.4.8/guava/src/module-info.java 2025-05-01 08:51:18.114471477 +0200
@@ -17,11 +17,7 @@
+++ guava-33.4.8/guava/src/module-info.java 2025-05-01 14:03:49.986207132 +0200
@@ -17,7 +17,7 @@
/** Google Guava */
module com.google.common {
requires java.logging;
- requires transitive com.google.common.util.concurrent.internal;
+ // requires transitive com.google.common.util.concurrent.internal;
requires static jdk.unsupported;
- requires static com.google.errorprone.annotations;
- requires static com.google.j2objc.annotations;
- requires static org.jspecify;
exports com.google.common.annotations;
exports com.google.common.base;
--- guava-33.4.8/guava-testlib/src/module-info.java 2025-05-01 08:51:02.332510826 +0200
+++ guava-33.4.8/guava-testlib/src/module-info.java 2025-05-01 09:05:46.257675378 +0200
@@ -17,9 +17,6 @@
requires java.logging;
requires transitive com.google.common;
requires transitive junit;
- requires static com.google.errorprone.annotations;
- requires static com.google.j2objc.annotations;
- requires static org.jspecify;
exports com.google.common.collect.testing;
exports com.google.common.collect.testing.features;
requires static com.google.errorprone.annotations;
requires static com.google.j2objc.annotations;

19
guava.spec
View File

@@ -25,11 +25,13 @@ Group: Development/Libraries/Java
URL: https://github.com/google/guava
Source0: https://github.com/google/guava/archive/v%{version}.tar.gz
Source1: %{name}-build.tar.xz
Patch0: guava-no-jspecify.patch
Patch1: guava-modules-fix.patch
Patch0: guava-modules-fix.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: google-errorprone-annotations >= 2.21.0
BuildRequires: j2objc-annotations
BuildRequires: javapackages-local >= 6
BuildRequires: jspecify
BuildRequires: jsr-305
BuildRequires: junit
BuildRequires: jurand
@@ -60,7 +62,6 @@ guava-testlib provides additional functionality for conveninent unit testing
%prep
%setup -q -a1
%patch -P 0 -p1
%patch -P 1 -p1
find . -name '*.jar' -delete
@@ -74,19 +75,9 @@ find . -name '*.jar' -delete
%pom_remove_dep -r :listenablefuture
%pom_remove_dep -r :failureaccess
%{java_remove_annotations} guava -p "com.google.errorprone.annotations"
%{java_remove_annotations} guava-testlib -p "com.google.errorprone.annotations"
%pom_remove_dep -r com.google.errorprone:error_prone_annotations
%{java_remove_annotations} guava -p "com.google.j2objc.annotations"
%{java_remove_annotations} guava-testlib -p "com.google.j2objc.annotations"
%pom_remove_dep -r com.google.j2objc:j2objc-annotations
%{java_remove_annotations} guava -p "org.jspecify.annotations"
%{java_remove_annotations} guava-testlib -p "org.jspecify.annotations"
%pom_remove_dep -r org.jspecify:jspecify
%build
mkdir -p lib
build-jar-repository -s lib junit jsr-305
build-jar-repository -s lib junit jsr-305 google-errorprone/annotations j2objc-annotations jspecify
%{ant} -Dproject.version=%{version} -Dtest.skip=true package javadoc
%install