New release 1.1.0. Specify Java 8 as explicit build requirement.

2 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ddf54e6eaad..b96946affdee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = mapton
 	pkgdesc = Some kind of map application
-	pkgver = 0.8.0
-	pkgrel = 4
+	pkgver = 1.1.0
+	pkgrel = 1
 	url = https://mapton.org
 	arch = any
 	license = Apache
 	makedepends = git
+	makedepends = jre8-openjdk
 	makedepends = jdk8-openjdk
+	makedepends = java-openjfx
 	makedepends = maven
-	depends = java-runtime>=8
-	depends = java-openjfx
-	source = git+https://github.com/trixon/mapton.git#commit=2091754f0454155d72a32d3004e4789ed5f1f3ad
+	source = git+https://github.com/trixon/mapton.git#commit=1cb5a943593498ca92544b097a60e05351430487
 	source = mapton.desktop
-	source = git+https://github.com/trixon/almond3.git#commit=3f16b553bb4dad3ecf72508e5d9e5cee17da934a
+	source = git+https://github.com/trixon/almond3.git#commit=2019f5ca723e4a7372fdf81ee9e0199c32da1204
 	source = git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f
 	sha256sums = SKIP
 	sha256sums = 303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7
@@ -20,4 +20,6 @@ pkgbase = mapton
 	sha256sums = SKIP
 
 pkgname = mapton
+	depends = java-runtime>=8
+	depends = java-openjfx
 
diff --git a/PKGBUILD b/PKGBUILD
index 14c00b4ef1cf..56f82c4df393 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
 # Maintainer: Jonathon Fernyhough <jonathon_at_manjaro dot+org>
 
 pkgname=mapton
-pkgver=0.8.0
-pkgrel=4
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Some kind of map application"
 arch=(any)
 url="https://mapton.org"
 license=('Apache')
-depends=('java-runtime>=8' 'java-openjfx')
-makedepends=('git' 'jdk8-openjdk' 'maven')
+makedepends=('git' 'jre8-openjdk' 'jdk8-openjdk' 'java-openjfx' 'maven')
 
-_commit=2091754f0454155d72a32d3004e4789ed5f1f3ad
+_commit=1cb5a943593498ca92544b097a60e05351430487
 source=(git+https://github.com/trixon/mapton.git#commit=$_commit
         mapton.desktop
-        git+https://github.com/trixon/almond3.git#commit=3f16b553bb4dad3ecf72508e5d9e5cee17da934a
+        git+https://github.com/trixon/almond3.git#commit=2019f5ca723e4a7372fdf81ee9e0199c32da1204
         git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f)
 sha256sums=('SKIP'
             '303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7'
@@ -43,6 +42,7 @@ build() {
 }
 
 package() {
+	depends=('java-runtime>=8' 'java-openjfx')
 	cd mapton/application/target/mapton
 
 	# Initial target directories