Use JDK17

2 files changed, 3 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f32eadb7c4a..db503deca31a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,7 @@ pkgbase = libsignal-client
 	makedepends = protobuf
 	makedepends = cmake
 	makedepends = clang
-	makedepends = jdk11-openjdk
+	makedepends = jdk17-openjdk
 	depends = gcc-libs
 	options = !lto
 	source = libsignal-0.21.1.tar.gz::https://github.com/signalapp/libsignal/archive/refs/tags/v0.21.1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 056e9c2cc343..d197314cc43c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='Library for the Signal Protocol.'
 url="https://github.com/signalapp/${_pkgname}"
 depends=('gcc-libs')
-makedepends=('cargo' 'gradle' 'git' 'zip' 'protobuf' 'cmake' 'clang' 'jdk11-openjdk')
+makedepends=('cargo' 'gradle' 'git' 'zip' 'protobuf' 'cmake' 'clang' 'jdk17-openjdk')
 options=(!lto)
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 license=('GPL3')
@@ -29,7 +29,7 @@ prepare() {
   sed -i "s/include ':android'//" java/settings.gradle
   sed -i "s/cargo build/cargo build --frozen/" java/build_jni.sh
 
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cargo fetch --locked --target "$(rustc -vV | awk '/^host: / {print $2}')"
 }
 
 build() {