Fix build with java 25

This commit is contained in:
Fridrich Štrba
2025-10-23 17:53:34 +02:00
parent 17a1b8ad13
commit ca40ff5232
3 changed files with 29 additions and 0 deletions

View File

@@ -0,0 +1,20 @@
--- functionaljava-5.0/core/src/main/java/fj/Monoid.java 2025-10-23 17:44:13.280474920 +0200
+++ functionaljava-5.0/core/src/main/java/fj/Monoid.java 2025-10-23 17:50:46.140970970 +0200
@@ -1,6 +1,7 @@
package fj;
import fj.data.*;
+import fj.data.IO;
import static fj.Function.*;
import static fj.Semigroup.semigroupDef;
--- functionaljava-5.0/core/src/main/java/fj/P2.java 2025-10-23 17:44:13.280694593 +0200
+++ functionaljava-5.0/core/src/main/java/fj/P2.java 2025-10-23 17:48:14.924033452 +0200
@@ -3,6 +3,7 @@
import static fj.Function.*;
import static fj.P.weakMemo;
import static fj.data.optic.PLens.pLens;
+import fj.data.IO;
import fj.data.*;
import fj.data.optic.Lens;
import fj.data.optic.PLens;

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 23 15:52:09 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* functionaljava-java25.patch
+ disambiguate name class with the new java.lang.IO (Java 25)
-------------------------------------------------------------------
Tue Dec 13 12:33:31 UTC 2022 - Anton Shvetz <shvetz.anton@gmail.com>

View File

@@ -26,6 +26,7 @@ URL: http://www.functionaljava.org/
Source0: https://github.com/functionaljava/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: https://repo1.maven.org/maven2/org/%{name}/%{name}/%{version}/%{name}-%{version}.pom
Source2: https://repo1.maven.org/maven2/org/%{name}/%{name}-java-core/%{version}/%{name}-java-core-%{version}.pom
Patch0: %{name}-java25.patch
BuildRequires: maven-local
BuildArch: noarch
@@ -59,6 +60,7 @@ API documentation for %{name}.
%prep
%setup -q
%patch -P 0 -p1
cp %{SOURCE1} core/pom.xml
cp %{SOURCE2} java-core/pom.xml