proper handling of java17-environment/runtime

2 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed0178e3454c..ba6e7037dce7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = briar-desktop-git
 	pkgdesc = Prototyping the next generation for Briar on desktop devices
-	pkgver = r385.22ef2f3
-	pkgrel = 2
+	pkgver = r389.d48afe8
+	pkgrel = 1
 	url = https://code.briarproject.org/briar/briar-desktop
 	arch = x86_64
 	arch = aarch64
 	arch = armv7h
 	license = GPL
 	makedepends = git
-	makedepends = jdk-openjdk>=17
-	makedepends = jdk-openjdk<18
-	depends = java-runtime>=17
-	depends = java-runtime<18
+	makedepends = java-environment=17
+	depends = java-runtime=17
 	depends = bash
 	conflicts = briar-desktop
 	source = briar-desktop::git+https://code.briarproject.org/briar/briar-desktop.git
diff --git a/PKGBUILD b/PKGBUILD
index 4bb7329850a9..41683e7dd873 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
 pkgname=briar-desktop-git
 _pkgname=briar-desktop
-pkgver=r385.22ef2f3
-pkgrel=2
+pkgver=r389.d48afe8
+pkgrel=1
 _build_type=nightly
 pkgdesc='Prototyping the next generation for Briar on desktop devices'
 arch=('x86_64' 'aarch64' 'armv7h')
 url="https://code.briarproject.org/briar/briar-desktop"
 license=('GPL')
-# let's limit it to <18 just in case 18 comes out sooner than expected (causing our hard java-17-path to cause trouble):
-depends=('java-runtime>=17' 'java-runtime<18' 'bash')
-makedepends=('git' 'jdk-openjdk>=17' 'jdk-openjdk<18')
+depends=('java-runtime=17' 'bash')
+makedepends=('git' 'java-environment=17')
 conflicts=('briar-desktop')
 source=("${_pkgname}::git+https://code.briarproject.org/briar/${_pkgname}.git"
         "briar::git+https://code.briarproject.org/briar/briar"