[ERROR] Using gradle to BUILD Xperia (S1) Flashtool causes ERROR during the build process:

3 files changed, 45 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ade67b1eb57..c90248a728dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 pkgbase = xperia-flashtool-git
 	pkgdesc = A S1 protocol flashing software for Sony Xperia phones
-	pkgver = master
+	pkgver = 0.9.24.2.r151.g7529dce
 	pkgrel = 1
 	url = http://www.flashtool.net/
 	arch = x86_64
 	license = GPL3+
-	makedepends = p7zip
-	makedepends = ant
-	makedepends = gcc
-	makedepends = expat
-	makedepends = zlib
-	makedepends = make
+	makedepends = git
+	makedepends = base-devel
+	makedepends = gradle
 	makedepends = java-environment-common
-	depends = libselinux
-	depends = libsystemd
+	makedepends = mono-tools
+	depends = systemd-libs
 	depends = glib2
 	depends = mono
-	depends = java-environment
-	source = git://github.com/Androxyde/Flashtool
-	source = Flashtool.desktop
+	depends = java-environment-common
+	options = !strip
+	source = Flashtool::git+https://github.com/Androxyde/Flashtool#branch=master
+	source = xperia-flashtool.desktop
 	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = xperia-flashtool-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4d7a4227552f..81aa1cb9ede9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,43 @@
-# Maintainer: Pavel Horniak <gouster4@gmail.com>
+# Maintainer: Martin Stibor <martin.von.reichenberg@proton.me>
 pkgname=xperia-flashtool-git
-pkgver=master
+_pkgname=Flashtool
+__pkgname=xperia-flashtool
+pkgver=0.9.24.2.r151.g7529dce
 pkgrel=1
 pkgdesc='A S1 protocol flashing software for Sony Xperia phones'
 arch=('x86_64')
 license=('GPL3+')
 url="http://www.flashtool.net/"
-depends=('libselinux' 'libsystemd' 'glib2' 'mono' 'java-environment')
-makedepends=('p7zip' 'ant' 'gcc' 'expat' 'zlib' 'make' 'java-environment-common')
-source=("git://github.com/Androxyde/Flashtool"
-"Flashtool.desktop")
+depends=('systemd-libs' 'glib2' 'mono' 'java-environment-common')
+makedepends=('git' 'base-devel' 'gradle' 'java-environment-common' 'mono-tools')
+source=('Flashtool::git+https://github.com/Androxyde/Flashtool#branch=master' 'xperia-flashtool.desktop')
 md5sums=('SKIP' 'SKIP')
+options=('!strip')
 
 pkgver() {
-  cd ${srcdir}/${_pkgname}
-  git rev-list --count HEAD
+  cd "${_pkgname}"
+  ( set -o pipefail
+    git describe --long --abbrev=7 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+  )
 }
 
-
 build() {
-   cd "$srcdir"/Flashtool
-   mkdir ./bin
+   cd "${srcdir}"/Flashtool
    export JAVA_HOME=$(find /usr/lib/jvm -name 'javac' | sed "s:/bin/javac::")
-   ant -buildfile ant/deploy-release.xml
+   export JAVA_HOME=/usr/lib/jvm/$(archlinux-java get)
+   gradle
 }
 
-package(){
-  # Moving everything to pkg/.
-  mkdir "$pkgdir"/usr "$pkgdir"/usr/lib "$pkgdir"/usr/bin "$pkgdir"/usr/share "$pkgdir"/usr/share/applications "$pkgdir"/usr/share/icons
-  mv "${srcdir}/Deploy/FlashTool" "${pkgdir}/usr/lib/FlashTool"
-  ln -s $JAVA_HOME "$pkgdir"/usr/lib/FlashTool/x10flasher_native/jre
-  ln -s /usr/lib/FlashTool/FlashTool "$pkgdir"/usr/bin/flashtool
-  install "Flashtool.desktop" "${pkgdir}/usr/share/applications/Flashtool.desktop"
-  install "Flashtool/src/gui/ressources/icons/flash_512.png" "${pkgdir}/usr/share/icons/Flashtool.png"
+package() {
+  # Install program files
+  install -m 755 -d "${pkgdir}"/usr/bin
+  install -m 755 -d "${pkgdir}"/usr/lib
+  install -m 755 -d "${pkgdir}"/usr/share
+  install -m 755 -d "${pkgdir}"/usr/share/applications
+  mv "${srcdir}"/Deploy/"${_pkgname}" "${pkgdir}"/usr/lib/"${__pkgname}"
+  ln -s "${JAVA_HOME}" "${pkgdir}"/usr/lib/${_pkgname}/x10flasher_native/jre
+  ln -s /usr/lib/"${_pkgname}"/"${_pkgname}" "${pkgdir}"/usr/bin/"${__pkgname}"
+  install -Dm644 "${_pkgname}"/src/gui/ressources/icons/flash_512.png "${pkgdir}"/usr/share/icons/"${__pkgname}".png
+  install -Dm644 "${__pkgname}".desktop "${pkgdir}"/usr/share/applications/"${__pkgname}".desktop
 }
-
diff --git a/xperia-flashtool.desktop b/xperia-flashtool.desktop
new file mode 100755
index 000000000000..5b74959fe135
--- /dev/null
+++ b/xperia-flashtool.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Xperia Flashtool
+Comment=A S1 protocol flashing software for Sony Xperia phones
+Icon=/usr/share/icons/Flashtool.png
+Exec=pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY /usr/bin/xperia-flashtool
+Categories=Utility