Support newer JDK

Update Gradle to 8.10 to allow compiling with JDK 23. While I haven't
tested and won't test 22, it should work, so accept it too.
This commit is contained in:
Duje Mihanović 2024-11-16 13:53:54 +01:00
parent e5db9d7dea
commit 4e40a82763
No known key found for this signature in database
GPG key ID: AD319352458FAD03
2 changed files with 11 additions and 7 deletions

View file

@ -1,12 +1,12 @@
pkgbase = haveno-reto
pkgdesc = Decentralised P2P exchange built on Monero and Tor - unofficial Reto network
pkgver = 1.0.14
pkgrel = 1
pkgrel = 2
url = https://github.com/retoaccess1/haveno-reto
install = haveno-reto.install
arch = any
license = AGPL-3.0-or-later
makedepends = java-environment=21
makedepends = java-environment>=21
depends = bash
depends = java-runtime>=21
conflicts = haveno

View file

@ -8,13 +8,13 @@
pkgname=haveno-reto
pkgver=1.0.14
pkgrel=1
pkgrel=2
pkgdesc='Decentralised P2P exchange built on Monero and Tor - unofficial Reto network'
arch=('any')
url="https://github.com/retoaccess1/${pkgname}"
license=('AGPL-3.0-or-later')
depends=('bash' 'java-runtime>=21')
makedepends=('java-environment=21')
makedepends=('java-environment>=21')
conflicts=('haveno')
source=("${pkgname}-v${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
"${pkgname}.desktop")
@ -22,11 +22,15 @@ sha512sums=(bfee08a8162f693975d51d54770d3f00582507b74d8260f9808adf0f5b225f89cea1
90103d36dfbc4d5da1c16774a9474c5e4b9bcc9d9354d35060187aa89176989119a7ec83bd36beca9e79103aae5329db72bf981a622be1daf248bb6dffceae5c)
install="${pkgname}.install"
prepare() {
sed -i 's/8.6/8.10/' $pkgname-$pkgver/gradle/wrapper/gradle-wrapper.properties
}
build() {
local jdkver=$(archlinux-java get)
if [[ ! $jdkver = java-21* ]]; then
echo Haveno can currently only be built with JDK 21.
echo Please select a JDK with version 21 using archlinux-java.
if [[ ! $jdkver = java-2[1-3]* ]]; then
echo Haveno requires JDK 21-23.
echo Please select a JDK with version 21-23 using archlinux-java.
exit 1
fi