Update to version 3.6.0

3 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eeca7d884c40..da0dfbdf3c61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = greenfoot
 	pkgdesc = Allows easy development of two-dimensional graphical applications, such as simulations and interactive games.
-	pkgver = 3.5.3
+	pkgver = 3.6.0
 	pkgrel = 1
 	url = https://www.greenfoot.org
 	arch = any
@@ -12,15 +12,16 @@ pkgbase = greenfoot
 	license = LGPL2.1
 	license = MIT
 	license = custom
-	depends = java-runtime
-	depends = java-environment
-	depends = java-openjfx
-	noextract = Greenfoot-linux-353.deb
-	source = https://www.greenfoot.org/download/files/Greenfoot-linux-353.deb
+	depends = archlinux-java-run
+	depends = java-runtime=11
+	depends = java-environment=11
+	depends = java11-openjfx
+	noextract = Greenfoot-linux-360.deb
+	source = https://www.greenfoot.org/download/files/Greenfoot-linux-360.deb
 	source = greenfoot
 	source = greenfoot.desktop
-	sha256sums = c72dbaf65053d0f2c3bf4d76f9293964b9042d7eb0695ef1e96e5d432433efa5
-	sha256sums = 9709e4c1f1f0a65897b79db5ecc5cf2ac91420f7576ce8e3ed3fb4fe8537452e
+	sha256sums = 398f20e46bb90dba554ebb243f1c3beda0c3a436cfcd08c9deee34db24702a2b
+	sha256sums = d643bbcca722f81e6479fa47b57dddfa64933c1b3b3731ac504b6192e0d81c41
 	sha256sums = 853d6f283623f1de1f1e353abaf90afb345580b0e67f57b6245ea2e2ad6850f3
 
 pkgname = greenfoot
diff --git a/PKGBUILD b/PKGBUILD
index 23105c08b8b5..0ae67dc59aa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,19 @@
 # Contributor: even <kessiapinheiro @ gmail . com>
 
 pkgname=greenfoot
-pkgver=3.5.3
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Allows easy development of two-dimensional graphical applications, such as simulations and interactive games."
 arch=('any')
 url="https://www.${pkgname}.org"
 license=('GPL2' 'Apache' 'BSD' 'CPL' 'LGPL2' 'LGPL2.1' 'MIT' 'custom')
-depends=('java-runtime' 'java-environment' 'java-openjfx')
+depends=('archlinux-java-run' 'java-runtime=11' 'java-environment=11' 'java11-openjfx')
 source=("https://www.${pkgname}.org/download/files/Greenfoot-linux-${pkgver//.}.deb"
         "${pkgname}"
         "${pkgname}.desktop")
 noextract=("Greenfoot-linux-${pkgver//.}.deb")
-sha256sums=('a41059cfc6d3403869fb85b38533df716432e83ccffdfd9011abadbfc12a4b8f'
-            '9709e4c1f1f0a65897b79db5ecc5cf2ac91420f7576ce8e3ed3fb4fe8537452e'
+sha256sums=('398f20e46bb90dba554ebb243f1c3beda0c3a436cfcd08c9deee34db24702a2b'
+            'd643bbcca722f81e6479fa47b57dddfa64933c1b3b3731ac504b6192e0d81c41'
             '853d6f283623f1de1f1e353abaf90afb345580b0e67f57b6245ea2e2ad6850f3')
 
 package() {
diff --git a/greenfoot b/greenfoot
index 2b957514d319..b057b1a31c63 100755
--- a/greenfoot
+++ b/greenfoot
@@ -1,6 +1,9 @@
 #!/bin/sh
-java -Dawt.useSystemAAFontSettings=on \
-        -cp /opt/greenfoot/bluej.jar:/usr/lib/jvm/default/lib/tools.jar bluej.Boot \
+JAVAFX_HOME=/usr/lib/jvm/java-11-openjfx/lib
+JAVAFX_CP="$JAVAFX_HOME/javafx.base.jar:$JAVAFX_HOME/javafx.controls.jar:$JAVAFX_HOME/javafx.fxml.jar:$JAVAFX_HOME/javafx.graphics.jar:$JAVAFX_HOME/javafx.media.jar:$JAVAFX_HOME/javafx.swing.jar:$JAVAFX_HOME/javafx-swt.jar:$JAVAFX_HOME/javafx.web.jar"
+
+archlinux-java-run -a 11 -b 11 -- -Dawt.useSystemAAFontSettings=on \
+        -cp /opt/greenfoot/bluej.jar:/usr/lib/jvm/default/lib/tools.jar:$JAVAFX_CP bluej.Boot \
         -greenfoot=true \
         -bluej.compiler.showunchecked=false \
         -greenfoot.url.javadoc=file:///usr/share/doc/greenfoot/API \