[lilac] updated to 4.0.2.REL-2

3 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10ff85c9dc7b..6e4a7336aea7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = unciv
 	pkgdesc = Open-source remake of Civilization V
-	pkgver = 3.19.18.REL
-	pkgrel = 1
+	pkgver = 4.0.2.REL
+	pkgrel = 2
 	url = https://github.com/yairm210/Unciv
 	arch = any
 	license = MPL-2.0
-	makedepends = jdk8-openjdk
-	depends = jre8-openjdk
+	depends = jdk11-openjdk
 	depends = bash
 	depends = xorg-xrandr
-	noextract = gradle-7.0.2-bin.zip
-	source = https://github.com/yairm210/Unciv/archive/3.19.18.zip
-	source = https://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+	noextract = gradle-7.2-bin.zip
+	source = https://github.com/yairm210/Unciv/archive/4.0.2.zip
+	source = https://services.gradle.org/distributions/gradle-7.2-bin.zip
 	source = Unciv.sh
 	source = unciv.desktop
-	md5sums = c4c23d5b0f2e2476156c740ae583da3c
-	md5sums = 5adba5193c50500de0e54eaddbdec506
-	md5sums = f8eab098f20681b8db232cc5709713d3
+	md5sums = 0fae3c629edd699ff755d9234b79cb64
+	md5sums = b5fb25beea6f974e2a5198e079174cd6
+	md5sums = e6d812078de30b33ab4698a53118b773
 	md5sums = 42d5f7ea8ee48d2d643d070786f039ba
 
 pkgname = unciv
diff --git a/PKGBUILD b/PKGBUILD
index 3409e428002e..6134360c9748 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,17 @@
 
 pkgname=unciv
 _pkgname=Unciv
-_gradle_ver=7.0.2 # This package does not work with system gradle
-pkgver=3.19.18.REL
+_gradle_ver=7.2 # This package does not work with system gradle
+pkgver=4.0.2.REL
 _pkgver=${pkgver%.*}-${pkgver##*.}
 _pkgver=$(echo $_pkgver | sed -r 's/-([0-9]+)/-patch\1/g')
 _pkgver=${_pkgver/-REL/}
-pkgrel=1
+pkgrel=2
 _srcdir=$_pkgname-$_pkgver
 pkgdesc="Open-source remake of Civilization V"
 url="https://github.com/yairm210/Unciv"
 license=('MPL-2.0')
-depends=('jre8-openjdk' 'bash' 'xorg-xrandr')
-makedepends=('jdk8-openjdk')
+depends=('jdk11-openjdk' 'bash' 'xorg-xrandr')
 arch=('any')
 source=(
   "https://github.com/yairm210/Unciv/archive/$_pkgver.zip"
@@ -22,9 +21,9 @@ source=(
   "$pkgname.desktop"
 )
 noextract=("gradle-$_gradle_ver-bin.zip")
-md5sums=('c4c23d5b0f2e2476156c740ae583da3c'
-         '5adba5193c50500de0e54eaddbdec506'
-         'f8eab098f20681b8db232cc5709713d3'
+md5sums=('0fae3c629edd699ff755d9234b79cb64'
+         'b5fb25beea6f974e2a5198e079174cd6'
+         'e6d812078de30b33ab4698a53118b773'
          '42d5f7ea8ee48d2d643d070786f039ba')
 
 prepare() {
@@ -39,7 +38,7 @@ prepare() {
 build() {
   cd $_srcdir
   unset _JAVA_OPTIONS
-  export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
+  export PATH=/usr/lib/jvm/java-11-openjdk/bin/:$PATH
   GRADLE_USER_HOME="$srcdir" ./gradlew desktop:dist
 }
 
diff --git a/Unciv.sh b/Unciv.sh
index 22e51b2b99bb..dabc2636aec8 100644
--- a/Unciv.sh
+++ b/Unciv.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
+export PATH=/usr/lib/jvm/java-11-openjdk/bin/:$PATH
 CONFIG_DIR="$HOME/.local/share/Unciv"
 
 USAGE="Unciv [--help | -h | --config-dir PATH]